From a90d18a7be597d25e0546f7b7dcb6b3de2f540b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 19:00:42 +0000 Subject: [PATCH 01/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241017.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.403 -> To Version 8.0.404 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 8.0.10-servicing.24466.10 -> To Version 8.0.10-servicing.24474.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3b36b9faec4..97d0bc00e4d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -48,15 +48,7 @@ - - - - - - - - - + @@ -88,15 +80,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfa8d9ebc3a..d3975c5d45dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,7 +21,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -30,7 +30,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -52,7 +52,7 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + d8babf8dc44b297cb9f5741e8e06ca33a87b8992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + d8babf8dc44b297cb9f5741e8e06ca33a87b8992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + d8babf8dc44b297cb9f5741e8e06ca33a87b8992 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aaee17ef7954216c7d62f9ec4b60d51f126f7306 + d8babf8dc44b297cb9f5741e8e06ca33a87b8992 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf e84ed744bb7989299c544f715056d05e220c7e00 - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - b4e5d1dde7212b8c1636632220682ca40bed90b7 + + https://github.com/dotnet/roslyn + cfe3bd0a653ebd218fec07ff4cce9a994715a473 diff --git a/eng/Versions.props b/eng/Versions.props index bfe213cdb1a4..277ad864bef2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,25 +77,25 @@ - 8.0.403 - 8.0.403-servicing.24469.19 - 8.0.403-servicing.24469.19 + 8.0.404 + 8.0.404-servicing.24517.20 + 8.0.404-servicing.24517.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24468.6 + 4.11.0-3.24510.3 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 - 8.0.10-servicing.24466.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 + 8.0.10-servicing.24474.4 8.0.10 8.0.10 8.0.10 From 45ee50904ed15e6e324cc1ad50ba246027b1f64d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 19:11:35 +0000 Subject: [PATCH 02/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.404 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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,Microsoft.NET.ILLink.Tasks From Version 8.0.10 -> To Version 8.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 52 ++++------------------ eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 79 insertions(+), 115 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97d0bc00e4d5..17e545f7c1ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,7 @@ - - - - - - - - - + @@ -27,17 +19,7 @@ - - - - - - - - - - - + @@ -45,10 +27,10 @@ - + - + @@ -67,33 +49,15 @@ - - - - - - - - - + - + - + - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3975c5d45dc..155a535d8351 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8babf8dc44b297cb9f5741e8e06ca33a87b8992 + ad6fe13fdf45085e3c088c4ea5b5ec031979d784 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8babf8dc44b297cb9f5741e8e06ca33a87b8992 + ad6fe13fdf45085e3c088c4ea5b5ec031979d784 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8babf8dc44b297cb9f5741e8e06ca33a87b8992 + ad6fe13fdf45085e3c088c4ea5b5ec031979d784 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d8babf8dc44b297cb9f5741e8e06ca33a87b8992 + ad6fe13fdf45085e3c088c4ea5b5ec031979d784 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4efded416f8216935683d9a12e2eb45df78a728 + a5159750d891acb077fdf5e028eb602bf450944a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e84ed744bb7989299c544f715056d05e220c7e00 + 2398667ad95d477c56d7530b619a0bb4d18e3c64 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 277ad864bef2..58f7b911aeea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.10-servicing.24468.3 + 8.0.11-servicing.24518.1 - 8.0.10-servicing.24468.10 + 8.0.11-servicing.24518.4 @@ -64,13 +64,13 @@ - 8.0.10 - 8.0.10 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 + 8.0.11 + 8.0.11 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 0.2.0 @@ -78,8 +78,8 @@ 8.0.404 - 8.0.404-servicing.24517.20 - 8.0.404-servicing.24517.20 + 8.0.404-servicing.24521.7 + 8.0.404-servicing.24521.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,26 +90,26 @@ - 8.0.10-servicing.24474.4 + 8.0.11-servicing.24517.7 - 8.0.10-servicing.24474.4 - 8.0.10-servicing.24474.4 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24517.7 + 8.0.11-servicing.24517.7 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 2.1.0 8.0.1 6.0.1 - 8.0.10-servicing.24468.5 - 8.0.10-servicing.24468.5 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24518.5 + 8.0.11-servicing.24518.5 + 8.0.11 + 8.0.11 From 7a9a7a81eab5dbb922608729479df43bd0f69424 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 05:28:36 +0000 Subject: [PATCH 03/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.404 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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 8.0.11 -> To Version 8.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17e545f7c1ed..955cd92d967e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -49,15 +49,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 155a535d8351..d613a8f8326a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad6fe13fdf45085e3c088c4ea5b5ec031979d784 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad6fe13fdf45085e3c088c4ea5b5ec031979d784 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad6fe13fdf45085e3c088c4ea5b5ec031979d784 + 5dd80ae4b107027f86bda68ce91542cad72b2868 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad6fe13fdf45085e3c088c4ea5b5ec031979d784 + 5dd80ae4b107027f86bda68ce91542cad72b2868 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a5159750d891acb077fdf5e028eb602bf450944a + 3069afa2664d12f5290b7002c5a9eb110e4ea844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2398667ad95d477c56d7530b619a0bb4d18e3c64 + 42a83a56d421ac71312453e53dbacc3d2ae6d432 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 58f7b911aeea..8837b8041be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.11-servicing.24518.1 + 8.0.11-servicing.24521.3 - 8.0.11-servicing.24518.4 + 8.0.11-servicing.24521.7 @@ -66,11 +66,11 @@ 8.0.11 8.0.11 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 0.2.0 @@ -78,8 +78,8 @@ 8.0.404 - 8.0.404-servicing.24521.7 - 8.0.404-servicing.24521.7 + 8.0.404-servicing.24521.39 + 8.0.404-servicing.24521.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,8 +106,8 @@ - 8.0.11-servicing.24518.5 - 8.0.11-servicing.24518.5 + 8.0.11-servicing.24521.5 + 8.0.11-servicing.24521.5 8.0.11 8.0.11 From 7b190310f25ae8d6e735d9b31fb2dbb599e75803 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 23 Oct 2024 16:25:46 +0000 Subject: [PATCH 04/17] Merged PR 44216: Update emsdk to 8.0.11 and add back the coherency dependency - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update emsdk to 8.0.11 and add back the coherency dependency ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the Emscripten SDK to version 8.0.11 and reintroduces the coherency dependency. - Updated `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` and `Microsoft.SourceBuild.Intermediate.emsdk` dependencies in `/eng/Version.Details.xml`. - Updated Emscripten package source URLs in `/NuGet.config`. - Updated Emscripten workload manifest version in `/eng/Versions.props`. --- NuGet.config | 8 +------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 955cd92d967e..e91fe256ff02 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,7 @@ - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d613a8f8326a..7a50493ea7be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e diff --git a/eng/Versions.props b/eng/Versions.props index 8837b8041be6..204de0659983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 14.0.8478 17.0.8478 - 8.0.10 + 8.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From c980a5f656b29dafe9dcef208ec183babd88bc59 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Nov 2024 09:25:26 +0000 Subject: [PATCH 05/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241117.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.403-beta.24509.1 -> To Version 12.8.403-beta.24526.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index c3fbc44e188f..8542c3b1f813 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -41,6 +42,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7459253697b7..017ddf5f04aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dd80ae4b107027f86bda68ce91542cad72b2868 + 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 42a83a56d421ac71312453e53dbacc3d2ae6d432 - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 diff --git a/eng/Versions.props b/eng/Versions.props index 78ad4474710e..e819a7f7ec44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,16 +77,16 @@ - 8.0.404 - 8.0.404-servicing.24521.39 - 8.0.404-servicing.24521.39 + 8.0.405 + 8.0.405-servicing.24567.5 + 8.0.405-servicing.24567.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-3.24510.3 + 4.11.0-3.24554.2 From 841098e7176e97d0f6f1b8be9229391c3153a5e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Nov 2024 20:02:11 +0000 Subject: [PATCH 06/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241119.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8542c3b1f813..d069fd31023d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 017ddf5f04aa..7e49e0af93b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 + f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 + f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 + f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ef59b69ba15ee64a7acc09bcbf523f05ba19ad9 + f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e819a7f7ec44..fa3716efa749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24567.5 - 8.0.405-servicing.24567.5 + 8.0.405-servicing.24569.21 + 8.0.405-servicing.24569.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ceaec0b4de9abdce8698c926d17ef58e49ef653c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Nov 2024 23:33:18 +0000 Subject: [PATCH 07/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241120.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d069fd31023d..04bcbb906af6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e49e0af93b8..760ab586019a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 + d64a01ebd9b33184d3716d8ccbdebd9147414c92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 + d64a01ebd9b33184d3716d8ccbdebd9147414c92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 + d64a01ebd9b33184d3716d8ccbdebd9147414c92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f23b9a05d2aab631753abf1c9cb7c1c4ca4b1783 + d64a01ebd9b33184d3716d8ccbdebd9147414c92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fa3716efa749..4cede0bd6519 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24569.21 - 8.0.405-servicing.24569.21 + 8.0.405-servicing.24570.17 + 8.0.405-servicing.24570.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 165ff7419a0c4b39321555f575fcc626ec940afa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Nov 2024 03:24:42 +0000 Subject: [PATCH 08/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241124.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 04bcbb906af6..b191e24b9946 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 760ab586019a..1843c6a9f712 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d64a01ebd9b33184d3716d8ccbdebd9147414c92 + 2d71b0331fee4c8f9ac47e5fbad10223d934da1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d64a01ebd9b33184d3716d8ccbdebd9147414c92 + 2d71b0331fee4c8f9ac47e5fbad10223d934da1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d64a01ebd9b33184d3716d8ccbdebd9147414c92 + 2d71b0331fee4c8f9ac47e5fbad10223d934da1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d64a01ebd9b33184d3716d8ccbdebd9147414c92 + 2d71b0331fee4c8f9ac47e5fbad10223d934da1c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4cede0bd6519..476d13fd93ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24570.17 - 8.0.405-servicing.24570.17 + 8.0.405-servicing.24574.18 + 8.0.405-servicing.24574.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55d01e05c6bd00f27038f5a15980a60b6355a4f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Nov 2024 08:22:56 +0000 Subject: [PATCH 09/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241124.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b191e24b9946..8b809f4b0b29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1843c6a9f712..52dbc05ba58f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d71b0331fee4c8f9ac47e5fbad10223d934da1c + c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d71b0331fee4c8f9ac47e5fbad10223d934da1c + c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d71b0331fee4c8f9ac47e5fbad10223d934da1c + c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d71b0331fee4c8f9ac47e5fbad10223d934da1c + c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 476d13fd93ab..39698184195a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24574.18 - 8.0.405-servicing.24574.18 + 8.0.405-servicing.24574.25 + 8.0.405-servicing.24574.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9bd1f55975f2c4f32cadedf43343c7607ff616a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Nov 2024 11:01:18 +0000 Subject: [PATCH 10/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241125.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b809f4b0b29..ba59c38f7d3f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52dbc05ba58f..21999de481d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 + 414d493d692047a10124dfc88e6ffa6b4a8295c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 + 414d493d692047a10124dfc88e6ffa6b4a8295c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 + 414d493d692047a10124dfc88e6ffa6b4a8295c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5d24ec4c721f7f5eed027c569d0a7fc5e7d4844 + 414d493d692047a10124dfc88e6ffa6b4a8295c2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 39698184195a..d5bded972c11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24574.25 - 8.0.405-servicing.24574.25 + 8.0.405-servicing.24575.9 + 8.0.405-servicing.24575.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e14b8d7cec15448dd0419f70e8601141c9eca8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Nov 2024 20:23:35 +0000 Subject: [PATCH 11/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241125.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba59c38f7d3f..b5ee2c9cc33d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21999de481d2..37d50660b474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 414d493d692047a10124dfc88e6ffa6b4a8295c2 + 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 414d493d692047a10124dfc88e6ffa6b4a8295c2 + 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 414d493d692047a10124dfc88e6ffa6b4a8295c2 + 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 414d493d692047a10124dfc88e6ffa6b4a8295c2 + 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d5bded972c11..6846af177771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24575.9 - 8.0.405-servicing.24575.9 + 8.0.405-servicing.24575.21 + 8.0.405-servicing.24575.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1aae97f74e4e18f7cb31674fd2fd6cb5d3d8e346 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 26 Nov 2024 10:57:54 +0000 Subject: [PATCH 12/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241126.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5ee2c9cc33d..fe392180edbb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37d50660b474..5a95655cb61e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 + 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 + 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 + 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 13c1ed5b233bc6e588bc62b34ed11aa5f038c816 + 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6846af177771..b599fdb4753c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24575.21 - 8.0.405-servicing.24575.21 + 8.0.405-servicing.24576.3 + 8.0.405-servicing.24576.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 16162a519385e4cfeb417e9cf951c40a70c0a4c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 27 Nov 2024 03:27:42 +0000 Subject: [PATCH 13/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241126.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe392180edbb..419b8d9726fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a95655cb61e..7280af7f2fcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 + 1ba623839f23fe8857d2aa0dc23783692325deab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 + 1ba623839f23fe8857d2aa0dc23783692325deab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 + 1ba623839f23fe8857d2aa0dc23783692325deab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91c5fa1c2d7a7e0e91ed5f1530c5a521a8241a35 + 1ba623839f23fe8857d2aa0dc23783692325deab https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b599fdb4753c..a090fb130699 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24576.3 - 8.0.405-servicing.24576.3 + 8.0.405-servicing.24576.27 + 8.0.405-servicing.24576.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3685ef4355fe8c07cc1a2990b15af47e1f6007c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Nov 2024 06:28:20 +0000 Subject: [PATCH 14/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241127.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 419b8d9726fb..9d6072736162 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7280af7f2fcf..9a44b7750b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ba623839f23fe8857d2aa0dc23783692325deab + f1376cbbe129a7f86cf1441b527f87016cfc79e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ba623839f23fe8857d2aa0dc23783692325deab + f1376cbbe129a7f86cf1441b527f87016cfc79e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ba623839f23fe8857d2aa0dc23783692325deab + f1376cbbe129a7f86cf1441b527f87016cfc79e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ba623839f23fe8857d2aa0dc23783692325deab + f1376cbbe129a7f86cf1441b527f87016cfc79e9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a090fb130699..281bff5aab92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24576.27 - 8.0.405-servicing.24576.27 + 8.0.405-servicing.24577.18 + 8.0.405-servicing.24577.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b1ea2025612bee059cfa9e5b1f87577540e85956 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 2 Dec 2024 19:28:33 +0000 Subject: [PATCH 15/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241202.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d6072736162..23d86e4d8878 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a44b7750b86..4c75ad534bac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1376cbbe129a7f86cf1441b527f87016cfc79e9 + 0f9b25d0747be60998b3600f26c86b58ad6a189b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1376cbbe129a7f86cf1441b527f87016cfc79e9 + 0f9b25d0747be60998b3600f26c86b58ad6a189b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1376cbbe129a7f86cf1441b527f87016cfc79e9 + 0f9b25d0747be60998b3600f26c86b58ad6a189b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f1376cbbe129a7f86cf1441b527f87016cfc79e9 + 0f9b25d0747be60998b3600f26c86b58ad6a189b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 281bff5aab92..6f7147a13ccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24577.18 - 8.0.405-servicing.24577.18 + 8.0.405-servicing.24602.13 + 8.0.405-servicing.24602.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee0561f367afe87adacbfbb767a886c88143bab7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 4 Dec 2024 01:30:45 +0000 Subject: [PATCH 16/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241203.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.404 -> To Version 8.0.405 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.11-servicing.24517.7 -> To Version 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 7 ++++-- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23d86e4d8878..987b66123db1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + @@ -18,9 +19,10 @@ + - + @@ -41,8 +43,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c75ad534bac..41f2eaf44cfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f9b25d0747be60998b3600f26c86b58ad6a189b + 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f9b25d0747be60998b3600f26c86b58ad6a189b + 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f9b25d0747be60998b3600f26c86b58ad6a189b + 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f9b25d0747be60998b3600f26c86b58ad6a189b + 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff diff --git a/eng/Versions.props b/eng/Versions.props index 6f7147a13ccc..21d77fc56457 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24602.13 - 8.0.405-servicing.24602.13 + 8.0.405-servicing.24603.16 + 8.0.405-servicing.24603.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,16 +90,16 @@ - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 - 8.0.11-servicing.24517.7 - 8.0.11-servicing.24517.7 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24603.5 + 8.0.12-servicing.24603.5 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 2.1.0 8.0.1 6.0.1 @@ -182,7 +182,7 @@ 14.0.8478 17.0.8478 - 8.0.11 + 8.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 944ed09d4e4f8cd19dee885373fcecff28e44f82 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 4 Dec 2024 18:50:56 +0000 Subject: [PATCH 17/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241204.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.405 -> To Version 8.0.405 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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 8.0.11 -> To Version 8.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++-- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84d1dee1130c..4a605b7980fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,15 @@ + + - + @@ -26,7 +28,7 @@ - + @@ -45,13 +47,15 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0a005b9df1a..426dea352cfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 + f6ad34c0ba03ad79257a09903033493414af4ffa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e19f8997cea9f3bc0349c1964b6ed70a7ff5207 + f6ad34c0ba03ad79257a09903033493414af4ffa https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3069afa2664d12f5290b7002c5a9eb110e4ea844 + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42a83a56d421ac71312453e53dbacc3d2ae6d432 + 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9317d43d8019..dc970c0911e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.11-servicing.24521.3 + 8.0.12-servicing.24603.6 - 8.0.11-servicing.24521.7 + 8.0.12-servicing.24603.5 @@ -64,13 +64,13 @@ - 8.0.11 - 8.0.11 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 + 8.0.12 + 8.0.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 0.2.0 @@ -78,8 +78,8 @@ 8.0.405 - 8.0.405-servicing.24603.16 - 8.0.405-servicing.24603.16 + 8.0.405-servicing.24604.17 + 8.0.405-servicing.24604.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,10 +106,10 @@ - 8.0.11-servicing.24521.5 - 8.0.11-servicing.24521.5 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24604.2 + 8.0.12-servicing.24604.2 + 8.0.12 + 8.0.12