From b0dda375d13513f4b0db90517ff4408e05eb68a4 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 18 Jul 2023 20:37:24 +0000 Subject: [PATCH 1/6] Merged PR 32726: Update SB test baselines This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo. --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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/ From e64c1a447c8957ad8662e9a17f950eec720299c1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 10 Aug 2023 15:12:34 +0000 Subject: [PATCH 2/6] Merged PR 33069: Update 6.0 SDK diff Update MSFT to SB SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 1b86a0d2e..4e98d267b 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,7 +14,20 @@ 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/ @@ -29,6 +42,10 @@ 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/ From ac49a5f38a5afb454a7f09203e7022e3a573437c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:25:43 +0000 Subject: [PATCH 3/6] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.122-servicing.23416.47 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++--------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..362628a5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,21 @@ - - - + - - - + + - - - + - - - + @@ -49,22 +42,17 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..1d976fb5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 98528e76f..f39d309eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23416.4 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23416.8 - 6.0.121 + 6.0.122 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.122-servicing.23416.47 + 6.0.122-servicing.23416.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.122 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 0e0a2063a030f688cb35de079ff316dee98d2b7d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 17 Aug 2023 18:59:45 +0000 Subject: [PATCH 4/6] Merged PR 33234: Update 6.0 source-build SDK diff baseline --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 22 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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..71ae3f0b9 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/ @@ -348,13 +331,13 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ./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.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 +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll @@ -431,9 +414,10 @@ 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.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.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.Permissions.dll From 9ef79ca49edb0fc3db1748e1fc69bb7b536af9da Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 15:51:22 +0000 Subject: [PATCH 5/6] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.122-servicing.23416.47 -> To Version 6.0.122-servicing.23425.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 362628a5b..115bd3427 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d976fb5b..61a6f0917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 + 851641e40c1191f339933987d6c1aac3837ce7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 + 851641e40c1191f339933987d6c1aac3837ce7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f39d309eb..4d23cd2d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.122-servicing.23416.47 - 6.0.122-servicing.23416.47 + 6.0.122-servicing.23425.21 + 6.0.122-servicing.23425.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From c8aec3e808e27bafe27cca880fda564ab72938b5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:49 -0700 Subject: [PATCH 6/6] Update branding to 6.0.123 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98528e76f..3535ea913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 22 + 23 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor)