Skip to content
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.

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

updating System package versions due to security vulnerabilities #1781

Merged
merged 5 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@

<PropertyGroup Label="Package and Assembly Metadata">
<Product>Microsoft ASP.NET Core</Product>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
</PropertyGroup>
<PropertyGroup>
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
</PropertyGroup>
<!-- Package versions for MSIdentity projects-->
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"tools": {
"dotnet": "6.0.100"
"dotnet": "6.0.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22054.5"
},
"sdk": {
"version": "6.0.100",
"version": "6.0.101",
"allowPrerelease": true
}
}
1 change: 1 addition & 0 deletions test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<PackageReference Include="xunit.extensibility.execution" Version="$(XunitExtensibilityExecutionPackageVersion)" />
<PackageReference Include="xunit.skippablefact" Version="$(XunitSkippableFactPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions test/Scaffolding/Shared/MSBuildProjectStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ public static IWebHost BuildWebHost(string[] args) =>
</Project>
";

public const string SimpleNet50ProjectText = @"
public const string SimpleNet60ProjectText = @"
<Project Sdk=""Microsoft.NET.Sdk.Web"">
<Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
<PropertyGroup>
Expand All @@ -818,7 +818,7 @@ public static IWebHost BuildWebHost(string[] args) =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""5.0.0-preview.6.20323.1"" />
<PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""6.0.0-rc.2.21511.1"" />
</ItemGroup>
</Project>
";
Expand Down
2 changes: 1 addition & 1 deletion test/Scaffolding/Shared/MsBuildProjectSetupHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal void SetupEmptyCodeGenerationProject(TemporaryFileProvider fileProvider
var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/net6.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");

var rootProjectTxt = MsBuildProjectStrings.SimpleNet50ProjectText;
var rootProjectTxt = MsBuildProjectStrings.SimpleNet60ProjectText;
fileProvider.Add(MsBuildProjectStrings.RootProjectName, rootProjectTxt);
fileProvider.Add("Startup.cs", MsBuildProjectStrings.EmptyTestStartupText);
fileProvider.Add(MsBuildProjectStrings.DbContextInheritanceProgramName, MsBuildProjectStrings.DbContextInheritanceProjectProgramText);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0-preview.6.21362.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0-rc.2.21511.1"/>
</ItemGroup>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0-preview.6.21362.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0-rc.2.21511.1" />
</ItemGroup>

</Project>