From b0dda375d13513f4b0db90517ff4408e05eb68a4 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 18 Jul 2023 20:37:24 +0000 Subject: [PATCH 01/40] 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 fd19247682774290394c6304e9a2b26a7ae7304d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:00:12 +0000 Subject: [PATCH 02/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23401.9 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index adbb45577..36c723357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5554bca6..bd159ad10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 diff --git a/eng/Versions.props b/eng/Versions.props index 97effa0a5..3d2372ddc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.414-servicing.23401.9 + 6.0.414-servicing.23401.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e403960548a2b1c58eede62f6f6e71693597a76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:01:13 +0000 Subject: [PATCH 03/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.7 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..f2ea52dee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124..eb0120592 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7..32aecf03a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe9469ff1c6d39f18ac2500d00a7c6aaecc3ab62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 23:37:34 +0000 Subject: [PATCH 04/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.20 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb0120592..90cb5129f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 diff --git a/eng/Versions.props b/eng/Versions.props index 32aecf03a..6224051b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.7 - 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.20 + 6.0.317-servicing.23401.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5368f4278f60e1e94d6f6576df8ec6d17eb22477 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 19:53:57 +0000 Subject: [PATCH 05/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23408.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90cb5129f..1d99db0eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a diff --git a/eng/Versions.props b/eng/Versions.props index 6224051b5..812bd6d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.20 - 6.0.317-servicing.23401.20 + 6.0.317-servicing.23408.8 + 6.0.317-servicing.23408.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10caa4a7f128d436eb91b5fa081787c36d6a8568 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 21:55:54 +0000 Subject: [PATCH 06/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23408.18 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd159ad10..26beb5cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb diff --git a/eng/Versions.props b/eng/Versions.props index 3d2372ddc..6e6c35af7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23401.9 - 6.0.414-servicing.23401.9 + 6.0.414-servicing.23408.18 + 6.0.414-servicing.23408.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67ece7f3cb341470c3236af917d4269291584e80 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 10:15:06 +0000 Subject: [PATCH 07/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.2 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c723357..f27f973a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26beb5cd6..606e014f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 diff --git a/eng/Versions.props b/eng/Versions.props index 6e6c35af7..bd4f80d85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23408.18 - 6.0.414-servicing.23408.18 + 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4cc5d8c18a541c28ad7d20e577f3a63582a19635 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 15:10:40 +0000 Subject: [PATCH 08/40] Update dependencies from https://github.com/dotnet/arcade build 20230808.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23361.3 -> To Version 6.0.0-beta.23408.5 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..a6c9c345e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,14 +46,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124..62db8623a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7..c9f660c5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 9ed07936ec7ad2454c6e99b2d4c8babe90b437a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 18:27:09 +0000 Subject: [PATCH 09/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 606e014f2..024d08ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 diff --git a/eng/Versions.props b/eng/Versions.props index bd4f80d85..93c78b957 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23409.2 - 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.9 + 6.0.414-servicing.23409.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e68b8872b07966792171f6a5d8d77facb8b42a65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Aug 2023 00:35:35 +0000 Subject: [PATCH 10/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23409.16 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f2ea52dee..a6c9c345e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d99db0eb..3cfee3060 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 diff --git a/eng/Versions.props b/eng/Versions.props index 812bd6d64..c4129850d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23408.8 - 6.0.317-servicing.23408.8 + 6.0.317-servicing.23409.16 + 6.0.317-servicing.23409.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e64c1a447c8957ad8662e9a17f950eec720299c1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 10 Aug 2023 15:12:34 +0000 Subject: [PATCH 11/40] 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 14f5e6b15b38d00384047f85bd4ac669457a1231 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 17:49:53 +0000 Subject: [PATCH 12/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 3 files changed, 66 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5..98c2f6245 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,19 @@ - - - + + - - - - - - + @@ -46,21 +40,15 @@ - - - + + - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a07d567..62d6bee3a 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 + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 76663d25f..a10ada7e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 @@ -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.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.414-servicing.23409.9 - 6.0.414-servicing.23409.9 + 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.27 $(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.23414.22 + 6.0.22-servicing.23414.22 + 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.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 From a54f92707fbea8a4ae52c3ed3263eb530248febf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Aug 2023 18:25:56 +0000 Subject: [PATCH 13/40] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.316-servicing.23363.10 to 6.0.317-servicing.23410.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.21-servicing.23364.6 to 6.0.22-servicing.23409.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.21-servicing.23364.5 to 6.0.22-servicing.23409.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 26 ++++-------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6c9c345e..41960ca45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,20 +41,15 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb5994d3b..7a429bf90 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 + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dab8cd878..d3e52d9a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 - 6.0.316 + 6.0.317 @@ -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.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.317-servicing.23409.16 - 6.0.317-servicing.23409.16 + 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.28 $(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.23414.22 + 6.0.22-servicing.23414.22 + 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.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.317 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9496edd76d185be0be2375b23c06a6d5bba008c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:17 +0000 Subject: [PATCH 14/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.43 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98c2f6245..770aaf731 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,9 +14,10 @@ - + + @@ -43,9 +44,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62d6bee3a..b2e17d560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 diff --git a/eng/Versions.props b/eng/Versions.props index a10ada7e5..0002da27c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.413 + 6.0.414 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23415.27 - 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.414 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 05e8f967633a5cb7292f4ca74e4798c076e0165d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:35 +0000 Subject: [PATCH 15/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.42 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41960ca45..98bb498d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,10 +14,10 @@ - + - + @@ -44,9 +44,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a429bf90..84c0190a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 diff --git a/eng/Versions.props b/eng/Versions.props index d3e52d9a6..60aa1eeac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23415.28 - 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 From 18862d431c696379569985e36be608b3b97f0b14 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:21 +0000 Subject: [PATCH 16/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.54 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770aaf731..c537de642 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,13 +41,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2e17d560..05893bc10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 diff --git a/eng/Versions.props b/eng/Versions.props index 0002da27c..362ce3c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.414-servicing.23415.43 - 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.54 + 6.0.414-servicing.23415.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4bc155f49ee15f38d88f8fbf85964c5c2681d0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:53 +0000 Subject: [PATCH 17/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.55 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98bb498d3..4138eba4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c0190a1..21c833ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 diff --git a/eng/Versions.props b/eng/Versions.props index 60aa1eeac..5bc002f36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.317-servicing.23415.42 - 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.55 + 6.0.317-servicing.23415.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59f938949d658dce176aa88d81c2482539ea43c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 18:51:57 +0000 Subject: [PATCH 18/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++-------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c537de642..61be111e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05893bc10..e3e33729b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 8e49f7f69149415593f0da365cae4ffdecb07c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 362ce3c9b..54b7f57fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23415.9 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23415.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 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.414-servicing.23415.54 - 6.0.414-servicing.23415.54 + 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23415.6 + 6.0.22-servicing.23415.6 6.0.22 6.0.22 From 72d2deba7eb1a864c64096b531804b3a5bb242cc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:27:38 +0000 Subject: [PATCH 19/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61be111e9..434639dcd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3e33729b..1da055bfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 diff --git a/eng/Versions.props b/eng/Versions.props index 54b7f57fb..6c627b3e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.21 - 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44c6374ceef623446e16cddad997a071b18a2eb0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 22:28:31 +0000 Subject: [PATCH 20/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.49 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 434639dcd..3a4103200 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1da055bfe..1c26110b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c627b3e6..27b45b91b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23415.9 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23415.8 + 6.0.22-servicing.23416.8 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.39 - 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.49 + 6.0.414-servicing.23416.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.22-servicing.23415.6 - 6.0.22-servicing.23415.6 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From 2cfcee6fcad216c8fbd654858b776c51dbbf07bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:23:22 +0000 Subject: [PATCH 21/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.55 -> To Version 6.0.317-servicing.23416.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4138eba4e..45ce906ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c833ce4..4cbf0f69c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5bc002f36..4f00b6c2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23416.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 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.317-servicing.23415.55 - 6.0.317-servicing.23415.55 + 6.0.317-servicing.23416.48 + 6.0.317-servicing.23416.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From ac49a5f38a5afb454a7f09203e7022e3a573437c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:25:43 +0000 Subject: [PATCH 22/40] 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 23/40] 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 24/40] 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 084700ab5c8cbe7e2a66cb328f14979e55bd1ac3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 15:53:19 +0000 Subject: [PATCH 25/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23416.48 -> To Version 6.0.317-servicing.23425.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45ce906ad..e250238a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cbf0f69c..1f5ca2132 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 - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 4f00b6c2c..107032483 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.317-servicing.23416.48 - 6.0.317-servicing.23416.48 + 6.0.317-servicing.23425.24 + 6.0.317-servicing.23425.24 $(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 7806d7511ad97589e42ad415e1d740131fc451a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 18:40:03 +0000 Subject: [PATCH 26/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23416.49 -> To Version 6.0.414-servicing.23425.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a4103200..19715c85a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c26110b6..2dbb1a3e0 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 - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 27b45b91b..4ff72a28c 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.414-servicing.23416.49 - 6.0.414-servicing.23416.49 + 6.0.414-servicing.23425.32 + 6.0.414-servicing.23425.32 $(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 27/40] 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) From 47d41a3d1a0b6e4fe7c5573749a3d7738c1f537c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:54 -0700 Subject: [PATCH 28/40] Update branding to 6.0.318 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index acfa240d8..e74a2d23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0954c6acae2cc7ef58ad877382e593deaf1659f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:58 -0700 Subject: [PATCH 29/40] Update branding to 6.0.415 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 10e567eb8..583c355f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 71749d33834dfec4f6e03fa5c4deeec8c3fe49be Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 27 Sep 2023 16:48:21 -0500 Subject: [PATCH 30/40] Handle variations in branch names for triggering SB tarball build (#17434) --- eng/source-build-tarball-build-official.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 7164fafb7..eb47706f8 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -9,8 +9,10 @@ resources: include: - release/6.0.1xx - internal/release/6.0.1xx* + - internal/release/*/6.0.1xx* - release/7.0.1xx - internal/release/7.0.1xx* + - internal/release/*/7.0.1xx* stages: - build From 2f011300bfe17207409c41f17c50202c19483849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 15:01:07 +0000 Subject: [PATCH 31/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 40 ++++------------------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..f49350550 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,16 @@ - - - - + - - - - - - - - - - - - + - - - - @@ -59,27 +41,13 @@ - - - - + - - - - - - - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..c0a143f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker diff --git a/eng/Versions.props b/eng/Versions.props index e9798b657..b0877ffc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.309 + 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce6ed2d04a386b89e0bde38b81837f0003e1b8d6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 16:10:16 +0000 Subject: [PATCH 32/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index f49350550..6cdf5e76c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a143f4e..95e85fa0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index b0877ffc7..920605f6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.8 - 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.17 + 7.0.309-servicing.23478.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 8b85dc17dd4d337d38e34e7e0231b4c53f76f47d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:46:28 +0000 Subject: [PATCH 33/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cdf5e76c..d94f950be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95e85fa0c..ad565cffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 920605f6f..699696ef5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.17 - 7.0.309-servicing.23478.17 + 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From f10d699fa9bccaf7eb3a962b98718f7b4129541c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 29 Sep 2023 17:27:12 +0000 Subject: [PATCH 34/40] Deleted 0002-Add-explicit-System.Text.Json-dependency.patch The patch is unable to be applied. --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch 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 deleted file mode 100644 index ced7ca579..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ 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-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From e610891a41947d5e7d937dfc2e58db65b3439b69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:02:58 +0000 Subject: [PATCH 35/40] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.68 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index d94f950be..ed994c9ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ - + + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad565cffe..63e35eae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 diff --git a/eng/Versions.props b/eng/Versions.props index 699696ef5..70971a8cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.6 - 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.68 + 7.0.309-servicing.23479.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 552bd6c89b07627bc57be1c07b59e0e2c8934207 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:24:36 +0000 Subject: [PATCH 36/40] Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774 - **Build**: 20230930.36 - **Date Produced**: October 1, 2023 2:06:09 AM UTC - **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - **Branch**: refs/heads/internal/release/frameshift/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a48ee0826&targetVersion=GCf44358c3c9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed994c9ec..618382a29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,19 +11,25 @@ + + + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63e35eae3..871ca7086 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a diff --git a/eng/Versions.props b/eng/Versions.props index 70971a8cd..65750b4b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.68 - 7.0.309-servicing.23479.68 + 7.0.309-servicing.23480.36 + 7.0.309-servicing.23480.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b29045dcd48dbbf1944d5de492a12245900ea5f1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:44 -0700 Subject: [PATCH 37/40] Update branding to 6.0.416 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589ee..865235900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e30e5b6c742b0d03ce03240701066920bc617415 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:48 -0700 Subject: [PATCH 38/40] Update branding to 7.0.113 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 12b8f2cd7..8b8c44e4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 010d736face78c6a2cba5b00baa7732b385974e7 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 10 Oct 2023 15:41:29 -0700 Subject: [PATCH 39/40] .NET Source-Build 7.0.112 October 2023 Updates (#17495) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b8c44e4a..22763d0dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.111 - 7.0.111 + 7.0.112 + 7.0.112 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 654f89210..ffceab958 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111" + "dotnet": "7.0.112" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 8cf3bdf83c89c4764544f627f0e3501455046d8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 00:04:46 +0000 Subject: [PATCH 40/40] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++++++++---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 618382a29..dfcd372fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,23 +11,27 @@ + + + - - - - - + + + + + + @@ -55,15 +59,16 @@ + + + - - - - - + + + @@ -71,6 +76,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e553d283e..c36de20dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 02f83148d..adb213dc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23478.1 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index 4a49aa951..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } }