Merged PR 29142: Update .NET SDK and dependencies for v7.4.1

PowerShell · Jan 9, 2024 · cfb762a · cfb762a
1 parent ea4d188
commit cfb762a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -49,6 +49,9 @@ indent_style = tab
 
 # Dotnet code style settings:
 [*.cs]
+# Ignore xUnit analyzer rule "Do not use blocking task operations in test method"
+dotnet_diagnostic.xUnit1031.severity = none
+
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = true
 

diff --git a/Analyzers.props b/Analyzers.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
@@ -4,12 +4,12 @@
     "quality": "daily",
     "qualityFallback": "preview",
     "packageVersionPattern": "8.0.0",
-    "sdkImageVersion": "8.0.100",
+    "sdkImageVersion": "8.0.101",
     "nextChannel": "8.0.1xx",
     "azureFeed": "",
-    "sdkImageOverride": "8.0.100-rtm.23551.15"
+    "sdkImageOverride": ""
   },
   "internalfeed": {
-    "url": "https://pkgs.dev.azure.com/powershell-rel/PowerShell/_packaging/powershell-7.4-ga/nuget/v2"
+    "url": ""
   }
 }
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.101"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,8 +34,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
     <PackageReference Include="JsonSchema.Net" Version="5.2.7" />
+    <!-- This section is to force the version of non-direct dependencies -->
+    <PackageReference Include="Json.More.Net" Version="1.9.3" />
+    <PackageReference Include="System.Text.Json" Version="6.0.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <!-- This section is to force the version of non-direct dependencies -->
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
     <PackageReference Include="System.IO.Packaging" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
@@ -33,8 +33,10 @@
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" />
     <PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
+    <PackageReference Include="System.Web.Services.Description" Version="4.10.3" />
     <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="5.0.17" />
   </ItemGroup>
 
 </Project>
diff --git a/...nagement.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/...nagement.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -15,5 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+    <!-- This section is to force the version of non-direct dependencies -->
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.2" />
   </ItemGroup>
 </Project>
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
@@ -23,11 +23,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.1.17" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <!-- This section is to force the version of non-direct dependencies -->
+    <PackageReference Include="Validation" Version="2.4.22" />
   </ItemGroup>
 
   <ItemGroup>