[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16914)

src/SourceBuild/tarball/content/build.proj

@@ -134,7 +134,7 @@
   <Target Name="CreateCreateSmokeTestPrereqsTarballIfPrereqsExist"
           Condition="'@(SmokeTestsPrereqs->Count())' != '0'">
     <PropertyGroup>
-      <SmokeTestPrereqsTarballName>$(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz</SmokeTestPrereqsTarballName>
+      <SmokeTestPrereqsTarballName>$(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz</SmokeTestPrereqsTarballName>
       <SmokeTestsPrereqPackagesDir>$(SmokeTestsArtifactsDir)prereq-packages/</SmokeTestsPrereqPackagesDir>
     </PropertyGroup>
 
@@ -190,7 +190,7 @@
   <Target Name="CreatePrebuiltsTarballIfPrebuiltsExist"
           Condition="'@(PrebuiltFile->Count())' != '0'">
     <PropertyGroup>
-      <TarballFilePath>$(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz</TarballFilePath>
+      <TarballFilePath>$(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz</TarballFilePath>
       <TarballWorkingDir>$(ResultingPrebuiltPackagesDir)</TarballWorkingDir>
     </PropertyGroup>
 

src/SourceBuild/tarball/content/repos/package-source-build.proj

@@ -47,7 +47,7 @@
       Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" />
 
     <PropertyGroup>
-      <SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz</SourceBuiltTarballName>
+      <SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz</SourceBuiltTarballName>
     </PropertyGroup>
 
     <Exec Command="tar --numeric-owner --exclude='$(SBRPIntermediateWildcard)' -czf $(SourceBuiltTarballName) *.nupkg *.props SourceBuildReferencePackages/" WorkingDirectory="$(SourceBuiltPackagesPath)" />

src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff

@@ -14,20 +14,7 @@ index ------------
  ./packs/Microsoft.AspNetCore.App.Ref/
  ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
 @@ ------------ @@
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
  ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml
  ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
  ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
 -./packs/Microsoft.NETCore.App.Host.portable-rid/
@@ -42,10 +29,6 @@ index ------------
 -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
 -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
 -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
 +./packs/Microsoft.NETCore.App.Host.banana-rid/
 +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
 +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/

src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Mon, 26 Jun 2023 23:46:46 +0000
+Subject: [PATCH] Add explicit System.Text.Json dependency
+
+Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up
+from PSB, via Microsoft.Build package.
+
+Backport: https://github.com/dotnet/format/pull/1887
+---
+ Directory.Packages.props | 1 +
+ eng/Version.Details.xml  | 4 ++++
+ eng/Versions.props       | 2 ++
+ src/dotnet-format.csproj | 6 ++++++
+ 4 files changed, 13 insertions(+)
+
+diff --git a/Directory.Packages.props b/Directory.Packages.props
+index 6b628c22..c9f86593 100644
+--- a/Directory.Packages.props
++++ b/Directory.Packages.props
+@@ -36,5 +36,6 @@
+     <PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersion)" />
+     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
+     <PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
++    <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+   </ItemGroup>
+ </Project>
+\ No newline at end of file
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index cdfa5f5e..86f02b44 100644
+--- a/eng/Version.Details.xml
++++ b/eng/Version.Details.xml
+@@ -13,6 +13,10 @@
+       <Uri>https://github.com/dotnet/command-line-api</Uri>
+       <Sha>c776cd4e906b669b9cce1017fee7d0ba9845d163</Sha>
+     </Dependency>
++    <Dependency Name="System.Text.Json" Version="6.0.8">
++      <Uri>https://github.com/dotnet/runtime</Uri>
++      <Sha>3241df7f2b0f3e2dada8d07229723c79fdbe4991</Sha>
++    </Dependency>
+   </ProductDependencies>
+   <ToolsetDependencies>
+     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22517.1">
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 27582078..bccaf176 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -20,6 +20,8 @@
+     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
+     <SystemCommandLineVersion>2.0.0-beta4.22504.1</SystemCommandLineVersion>
+     <SystemCommandLineRenderingVersion>0.4.0-alpha.22504.1</SystemCommandLineRenderingVersion>
++    <!-- Dependencies from https://github.com/dotnet/runtime -->
++    <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
+   </PropertyGroup>
+   <!--
+     Other Dependency versions
+diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
+index 5f691e6e..d812f06b 100644
+--- a/src/dotnet-format.csproj
++++ b/src/dotnet-format.csproj
+@@ -54,6 +54,12 @@
+     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
+     <PackageReference Include="Microsoft.Extensions.Logging" />
++
++    <!--
++      Explicit System.Text.Json package reference is required for source-build to pick up the live package.
++      Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
++    -->
++    <PackageReference Include="System.Text.Json"  Condition=" '$(DotnetBuildFromSource)' == 'true'" />
+   </ItemGroup>
+ 
+   <ItemGroup>

src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Mon, 26 Jun 2023 23:02:20 +0000
+Subject: [PATCH] Add explicit System.Text.Json dependency
+
+Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up
+from PSB, via Microsoft.Build package.
+
+Backport: https://github.com/dotnet/sdk/pull/33618
+---
+ src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj
+index 065f750f72..13d2c1ed99 100644
+--- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj
++++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj
+@@ -23,6 +23,13 @@
+     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
+     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" />
+     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)" />
++
++    <!--
++      Explicit System.Text.Json package reference is required for source-build to pick up the live package.
++      Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
++    -->
++    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" Condition="'$(DotnetBuildFromSource)' == 'true'" />
++
+     <Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Common" />
+   </ItemGroup>
+