[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#20180)

dotnet · Oct 14, 2024 · 1872605 · 1872605
2 parents dd54f04 + 2449eec
commit 1872605
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -145,7 +145,7 @@
       or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
       necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltArtifactsPackageVersion>6.0.133</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>6.0.135</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>

diff --git a/...ll/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/...ll/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
@@ -119,10 +119,9 @@ index ------------
 +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
 +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll
 +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
  ./sdk/x.y.z/DotnetTools/dotnet-watch/
  ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/
 @@ ------------ @@
  ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll
  ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll
@@ -220,7 +219,7 @@ index ------------
 -./sdk/x.y.z/FSharp/System.CodeDom.dll
 -./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll
 -./sdk/x.y.z/FSharp/System.Drawing.Common.dll
-+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll
+ ./sdk/x.y.z/FSharp/System.Formats.Asn1.dll
  ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll
 +./sdk/x.y.z/FSharp/System.Security.AccessControl.dll
  ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll
@@ -436,7 +435,7 @@ index ------------
 +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll
  ./sdk/x.y.z/System.Diagnostics.EventLog.dll
 -./sdk/x.y.z/System.Drawing.Common.dll
-+./sdk/x.y.z/System.Formats.Asn1.dll
+ ./sdk/x.y.z/System.Formats.Asn1.dll
  ./sdk/x.y.z/System.Resources.Extensions.dll
 +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll
 +./sdk/x.y.z/System.Security.AccessControl.dll
@@ -445,10 +444,10 @@ index ------------
  ./sdk/x.y.z/System.Security.Cryptography.Xml.dll
 -./sdk/x.y.z/System.Security.Permissions.dll
  ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll
--./sdk/x.y.z/System.Windows.Extensions.dll
 +./sdk/x.y.z/System.Text.Encoding.CodePages.dll
 +./sdk/x.y.z/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/System.Text.Json.dll
+ ./sdk/x.y.z/System.Text.Json.dll
+-./sdk/x.y.z/System.Windows.Extensions.dll
 +./sdk/x.y.z/testhost.deps.json
 +./sdk/x.y.z/testhost.dll
 +./sdk/x.y.z/testhost.dll.config