From 30ce1d005cd1827fc19963805475e6564db61d99 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 18:57:40 +0000 Subject: [PATCH 1/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241017.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.110 -> To Version 8.0.111 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.Platforms,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 | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b74f3927e08..17edee9df423 100644 --- a/NuGet.config +++ b/NuGet.config @@ -33,15 +33,7 @@ - - - - - - - - - + @@ -87,15 +79,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48bb1b699ba3..88ea982b9c52 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 - d90806d013db39755cda355f42015d6a248456f5 + d3aaf791c99e383d77b011cfb94089c3de0fb782 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d90806d013db39755cda355f42015d6a248456f5 + d3aaf791c99e383d77b011cfb94089c3de0fb782 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d90806d013db39755cda355f42015d6a248456f5 + d3aaf791c99e383d77b011cfb94089c3de0fb782 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d90806d013db39755cda355f42015d6a248456f5 + d3aaf791c99e383d77b011cfb94089c3de0fb782 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 4ff64493649bd045ced204661958393dc5575e96 diff --git a/eng/Versions.props b/eng/Versions.props index 19a3a138fc13..ea74c9bd4b14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,25 +77,25 @@ - 8.0.110 - 8.0.110-servicing.24469.18 - 8.0.110-servicing.24469.18 + 8.0.111 + 8.0.111-servicing.24517.19 + 8.0.111-servicing.24517.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24468.9 + 4.8.0-7.24514.16 - 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 14e137ff33360411f1492535b493b6745c3d55f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 19:09:37 +0000 Subject: [PATCH 2/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.111 -> To Version 8.0.111 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 17edee9df423..141114fba915 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,37 +16,19 @@ - - - - - - - - - + - + - + - - - - - - - - - - - + @@ -66,33 +48,15 @@ - - - - - - - - - + - + - + - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88ea982b9c52..384bfd9a8669 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 - d3aaf791c99e383d77b011cfb94089c3de0fb782 + 4f203daf7190965f627f57e44f89c90694b5da82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3aaf791c99e383d77b011cfb94089c3de0fb782 + 4f203daf7190965f627f57e44f89c90694b5da82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3aaf791c99e383d77b011cfb94089c3de0fb782 + 4f203daf7190965f627f57e44f89c90694b5da82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3aaf791c99e383d77b011cfb94089c3de0fb782 + 4f203daf7190965f627f57e44f89c90694b5da82 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + 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 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + 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 ea74c9bd4b14..e8430cda7f44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,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.111 - 8.0.111-servicing.24517.19 - 8.0.111-servicing.24517.19 + 8.0.111-servicing.24521.9 + 8.0.111-servicing.24521.9 $(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 fc64231e602bff12b384c0fb91d7fd3edfd90f73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 16:48:29 +0000 Subject: [PATCH 3/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.111 -> To Version 8.0.111 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 141114fba915..a74e67647342 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -25,10 +25,10 @@ - + - + @@ -48,15 +48,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 384bfd9a8669..2c79e74f7cd6 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 - 4f203daf7190965f627f57e44f89c90694b5da82 + f3835a7fb45497f53fc92ca7dd4a06793884b1cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f203daf7190965f627f57e44f89c90694b5da82 + f3835a7fb45497f53fc92ca7dd4a06793884b1cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f203daf7190965f627f57e44f89c90694b5da82 + f3835a7fb45497f53fc92ca7dd4a06793884b1cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f203daf7190965f627f57e44f89c90694b5da82 + f3835a7fb45497f53fc92ca7dd4a06793884b1cd https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + 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 e8430cda7f44..2cc99c78d8f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,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.111 - 8.0.111-servicing.24521.9 - 8.0.111-servicing.24521.9 + 8.0.111-servicing.24521.41 + 8.0.111-servicing.24521.41 $(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 5484e027167c6fa2993f82a06b3a26bd4cd382e3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 23 Oct 2024 02:43:22 +0000 Subject: [PATCH 4/8] Update emsdk to 8.0.11 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 384bfd9a8669..54b0f4ffebfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e diff --git a/eng/Versions.props b/eng/Versions.props index e8430cda7f44..03571730ebf6 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 59c86e40a5693c30fc857031776e2bb16c02b4e1 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 23 Oct 2024 15:21:31 +0000 Subject: [PATCH 5/8] Update NuGet.config --- NuGet.config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 141114fba915..e78867d1f88d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,7 @@ - - - - - - - + From 86610a1e935c4629156cba906575e1acb00ab4e4 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 23 Oct 2024 15:49:12 +0000 Subject: [PATCH 6/8] Add back the coherent dependency --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54b0f4ffebfa..9b7ca2e9725e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,7 +173,7 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk f6237140b33bf18c72dccfeda14be8d103c3b93e @@ -182,7 +182,7 @@ 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk f6237140b33bf18c72dccfeda14be8d103c3b93e From 0545dddd4ca7b3eea09ab1c20c2ce81f9014e459 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:04:24 +0100 Subject: [PATCH 7/8] .NET Source-Build 8.0.111 November 2024 Updates (#20232) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index c6809928d082..d4ae30324171 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.110-centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.111-servicing.24523.1.centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.111-centos.9-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 9c9f81df396a..37826e27f6bd 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,12 +1,12 @@ { "tools": { - "dotnet": "8.0.110" + "dotnet": "8.0.111" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.Traversal": "2.0.2", "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", "Yarn.MSBuild": "1.15.2" } } From 209174e6b7ce47dd33e66bd5bf64ea58410c090f Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 14 Nov 2024 17:56:55 +0000 Subject: [PATCH 8/8] Add prebuilt exclusions for emsdk packages --- eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 8017b4c3ecfd..f2075af7425f 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -15,6 +15,11 @@ + + + + +