From 830f9ea3fdf023cc3423ada341b1e2720fcdf81f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 23:36:45 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241017.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24468.28 -> To Version 6.0.428-servicing.24517.40 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,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.35 -> To Version 6.0.36 (parent: Microsoft.NET.Sdk --- NuGet.config | 19 +++++---- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++--------- 3 files changed, 77 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2dc7a26febb8..63f896782b29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,25 @@ - + + + + - + - + - + @@ -43,16 +46,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index daac6465d0ec..d08bbbad1821 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7de8a2867cf734967eef78d8e82902f3e84650b7 + 7a8644f1b5d6b38aeb1bf53310d06885428e49e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d404f562916f5be62c6661e4f7033f26859ce939 + ed841ed8b247de62fc0da644e53d70a54cb78cad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d404f562916f5be62c6661e4f7033f26859ce939 + ed841ed8b247de62fc0da644e53d70a54cb78cad - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9b5f402943986a66dfca2b6f4312cfca19d75c17 + e0de28a9ae13d9444c39fbad560ebec71854e11e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c9e44425226553e639116ff82698cfd2808f7769 + a7dff252f2a6b0ff48ffe946a20584f61282aa13 https://github.com/dotnet/fsharp @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 0991fcde3933eecc12f53472a3347a94e2d1fdd5 + a044d2e0fc5c991d33da88ccedf96903837c2342 linker diff --git a/eng/Versions.props b/eng/Versions.props index fc4ce81a5431..43d773b93fa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.35-servicing.24462.9 + 6.0.36-servicing.24515.13 - 6.0.35-servicing.24462.14 + 6.0.36-servicing.24516.3 @@ -43,20 +43,20 @@ - 6.0.35 - 6.0.35 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 + 6.0.36 + 6.0.36 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 0.2.0 - 6.0.427-servicing.24468.28 - 6.0.427-servicing.24468.28 + 6.0.428-servicing.24517.40 + 6.0.428-servicing.24517.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,21 +67,21 @@ - 6.0.35-servicing.24459.18 - 6.0.35-servicing.24459.18 - 6.0.35 - 6.0.35 - 6.0.35 - 6.0.35 + 6.0.36-servicing.24514.21 + 6.0.36-servicing.24514.21 + 6.0.36 + 6.0.36 + 6.0.36 + 6.0.36 2.1.0 6.0.1 - 6.0.35-servicing.24463.5 - 6.0.35-servicing.24463.5 - 6.0.35 - 6.0.35 + 6.0.36-servicing.24517.2 + 6.0.36-servicing.24517.2 + 6.0.36 + 6.0.36 From ef6f5ce48ccbafbe7b1bf3d3adae147c9e04956c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 24 Oct 2024 17:45:57 +0000 Subject: [PATCH 2/2] Merged PR 44319: Update to the 6.0.36 emsdk build - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update to the 6.0.36 emsdk build ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the Emscripten SDK to version 6.0.36 and modifies related package configurations. - `NuGet.config`: Updated package sources for `dotnet-emsdk` and added new sources for `dotnet-windowsdesktop`. - `eng/Version.Details.xml`: Updated the version and SHA for `Microsoft.NET.Workload.Emscripten.Manifest-6.0.400`. - `eng/Versions.props`: Updated the `MicrosoftNETWorkloadEmscriptenManifest60400Version` to 6.0.36. --- NuGet.config | 13 +++++++------ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63f896782b29..5fcd1653434f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,10 +10,7 @@ - - - - + @@ -22,10 +19,12 @@ - + + + @@ -52,9 +51,11 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d08bbbad1821..baf05811959c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - c68eace1f3c11ab25cdf30a425ab3792773bb2cc + d440134ad1037c7a3c91c78fff964078f240e08c https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 43d773b93fa4..62e7901f4a01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.35 + 6.0.36 $(MicrosoftNETWorkloadEmscriptenManifest60400Version)