Skip to content

removed unnecessary assemblies #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepchoudhery merged 2 commits into from
May 12, 2023
Merged

removed unnecessary assemblies #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db17e83
removed unneccessary assemblies
deepchoudhery May 11, 2023
91369c8
minor fix with test projects.
deepchoudhery May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,4 @@
<Product>Microsoft ASP.NET Core</Product>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="$(SystemSecurityCryptographyX509CertificatesVersion)"/>
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
</ItemGroup>

</Project>
8 changes: 1 addition & 7 deletions src/Shared/Microsoft.DotNet.Scaffolding.Shared/Microsoft.DotNet.Scaffolding.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@
<!-- Packages for CodeAnalysis code changes-->
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Humanizer" Version="$(HumanizerPackageVersion)"/>
<PackageReference Include="Humanizer" Version="$(HumanizerPackageVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
</ItemGroup>

Expand Down
18 changes: 9 additions & 9 deletions test/Scaffolding/Shared/MSBuildProjectStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ public static IWebHost BuildWebHost(string[] args) =>
<Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
<PropertyGroup>
<RestoreSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -900,13 +900,13 @@ public static IWebHost BuildWebHost(string[] args) =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
<PackageReference Include=""Microsoft.EntityFrameworkCore.Design"" Version=""7.0.0-preview.1.22076.6"">
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6""/>
<PackageReference Include=""Microsoft.EntityFrameworkCore.Design"" Version=""7.0.5""/>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include = ""Microsoft.EntityFrameworkCore.SqlServer"" Version=""7.0.0-preview.1.22076.6"" />
<PackageReference Include = ""Microsoft.EntityFrameworkCore.Tools"" Version=""7.0.0-preview.1.22076.6"">
<PackageReference Include = ""Microsoft.EntityFrameworkCore.SqlServer"" Version=""7.0.5""/>
<PackageReference Include = ""Microsoft.EntityFrameworkCore.Tools"" Version=""7.0.5"">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -918,7 +918,7 @@ public static IWebHost BuildWebHost(string[] args) =>
<Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
<PropertyGroup>
<RestoreSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Microsoft.Test</RootNamespace>
Expand All @@ -927,7 +927,7 @@ public static IWebHost BuildWebHost(string[] args) =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6"" />
</ItemGroup>
</Project>
";
Expand All @@ -937,15 +937,15 @@ public static IWebHost BuildWebHost(string[] args) =>
<Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
<PropertyGroup>
<RestoreSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6"" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include=""..\Library\Library.csproj"" />
Expand Down
5 changes: 3 additions & 2 deletions test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />

<PropertyGroup>
Expand All @@ -24,9 +24,10 @@
<Link>MsBuildSources\%(RecursiveDir)%(FileName)</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion tools/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
</ItemGroup>

Expand Down