updating System package versions due to security vulnerabilities (#1781)

* updating System package versions due to security vulnerabilities * revert package version for test. * potential fix? * fixed all compliance issues. * clean up
dotnet · Feb 4, 2022 · e99c315 · e99c315
1 parent 16b049a
commit e99c315
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -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>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -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>

diff --git a/global.json b/global.json
@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "6.0.100-rc.1.21430.12"
+    "dotnet": "6.0.101"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1"
   },
   "sdk": {
-    "version": "6.0.100-rc.1.21430.12",
+    "version": "6.0.101",
     "allowPrerelease": true
   }
 }
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -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>
diff --git a/test/Scaffolding/Shared/MSBuildProjectStrings.cs b/test/Scaffolding/Shared/MSBuildProjectStrings.cs
@@ -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>
@@ -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>
 ";

diff --git a/test/Scaffolding/Shared/MsBuildProjectSetupHelper.cs b/test/Scaffolding/Shared/MsBuildProjectSetupHelper.cs
@@ -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);

diff --git a/test/Scaffolding/TestApps/PreviousPackage/PreviousPackage.csproj b/test/Scaffolding/TestApps/PreviousPackage/PreviousPackage.csproj
@@ -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>
 
 

diff --git a/test/Scaffolding/TestApps/StablePackage/StablePackage.csproj b/test/Scaffolding/TestApps/StablePackage/StablePackage.csproj
@@ -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>