From 201e451886ae891a5b6761604cbda15d032fbb80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:48:05 -0700 Subject: [PATCH 1/3] [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19556) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a0008b0b..be419d191 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 2cd14a0da237e9ae169f76fefa5cdaa04ee0e3d7 + 86390422715f8f11400ff7fca9c2449888e47b6e From 6b41ecb70a934505f8ea251b25b189eff7de742a Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:25:10 -0700 Subject: [PATCH 2/3] Update MsftToSbSdk.diff (#19569) --- .../assets/baselines/MsftToSbSdk.diff | 41 +++++++------------ 1 file changed, 15 insertions(+), 26 deletions(-) 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 dfeb1a2f8..537b03e4f 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/ @@ -199,30 +182,33 @@ index ------------ ./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll ./sdk/x.y.z/FSharp/pl/FSharp.Compiler.Interactive.Settings.resources.dll @@ ------------ @@ - ./sdk/x.y.z/FSharp/ru/FSharp.Compiler.Service.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll --./sdk/x.y.z/FSharp/runtimes/ + ./sdk/x.y.z/FSharp/runtimes/ -./sdk/x.y.z/FSharp/runtimes/unix/ -./sdk/x.y.z/FSharp/runtimes/unix/lib/ -./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/ -./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/ --./sdk/x.y.z/FSharp/runtimes/win/lib/ + ./sdk/x.y.z/FSharp/runtimes/win/ + ./sdk/x.y.z/FSharp/runtimes/win/lib/ -./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.AccessControl.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll -./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.Resources.Extensions.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll ++./sdk/x.y.z/FSharp/System.Security.AccessControl.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/FSharp/System.Security.Permissions.dll -./sdk/x.y.z/FSharp/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/tr/ @@ -304,9 +290,10 @@ index ------------ ./sdk/x.y.z/ref/ +./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll +./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ./sdk/x.y.z/ref/MSBuild.dll ++./sdk/x.y.z/ref/MSBuild.dll ./sdk/x.y.z/ref/mscorlib.dll ./sdk/x.y.z/ref/netstandard.dll + ./sdk/x.y.z/Roslyn/ @@ ------------ @@ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll @@ -354,6 +341,7 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/ ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.AccessControl.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll @@ -434,9 +422,10 @@ index ------------ +./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 ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/System.Security.Cryptography.Xml.dll + ./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 From e0f3d157d24d60ad22ba38d25097a9b57aeee818 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:46:16 -0700 Subject: [PATCH 3/3] Update branding to 6.0.131 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6f3d9ebd3..4bff8379d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 30 + 31 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor)