From fd5696554aeafb907663ed0fed8bcc875123a9db Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 7 Jul 2023 13:07:58 -0700 Subject: [PATCH] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898) Co-authored-by: Nikola Milosavljevic Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Thalman --- src/SourceBuild/tarball/content/build.proj | 4 +- .../content/repos/package-source-build.proj | 2 +- .../assets/baselines/MsftToSbSdk.diff | 17 ----- ...explicit-System.Text.Json-dependency.patch | 73 +++++++++++++++++++ ...explicit-System.Text.Json-dependency.patch | 31 ++++++++ 5 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 3cef840dc..523128954 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -134,7 +134,7 @@ - $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz $(SmokeTestsArtifactsDir)prereq-packages/ @@ -190,7 +190,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj index 0101374dc..44c8e5cf5 100644 --- a/src/SourceBuild/tarball/content/repos/package-source-build.proj +++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj @@ -47,7 +47,7 @@ Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" /> - $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4e98d267b..1b86a0d2e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/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/ diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000..b82faadcd --- /dev/null +++ b/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 +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 @@ + + + ++ + + +\ 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 @@ + https://github.com/dotnet/command-line-api + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + ++ ++ https://github.com/dotnet/runtime ++ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 ++ + + + +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 @@ + + 2.0.0-beta1.21473.1 + 0.3.0-alpha.21473.1 ++ ++ 6.0.8 + + ++ + + + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000..74e217fbe --- /dev/null +++ b/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 +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 @@ + + + ++ ++ ++ ++ + + +