From 0f24e7dc08c183a4b18e8884ce6c2c7c7b9a96b5 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:21:26 -0800 Subject: [PATCH 1/4] Merging internal commits for release/8.0.1xx (#20287) Co-authored-by: maestro-prod-Primary Co-authored-by: Mirroring --- NuGet.config | 9 ++++ eng/Version.Details.xml | 110 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++--------- 3 files changed, 89 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8bd4d7c78fe..ba8e571ddcb4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ + + + + + @@ -37,11 +42,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54caf0cf3ec7..bc43d164000d 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 - 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 - 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,55 +52,55 @@ 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 - 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 - f3835a7fb45497f53fc92ca7dd4a06793884b1cd + f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3835a7fb45497f53fc92ca7dd4a06793884b1cd + f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3835a7fb45497f53fc92ca7dd4a06793884b1cd + f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3835a7fb45497f53fc92ca7dd4a06793884b1cd + f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + 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 @@ -146,11 +146,11 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff diff --git a/eng/Versions.props b/eng/Versions.props index 6ba17cef2a70..aa752b006315 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,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,42 +64,42 @@ - 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 - 8.0.111 - 8.0.111-servicing.24521.41 - 8.0.111-servicing.24521.41 + 8.0.112 + 8.0.112-servicing.24604.14 + 8.0.112-servicing.24604.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24514.16 + 4.8.0-7.24574.2 - 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 @@ -107,10 +107,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 @@ -183,7 +183,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 6086c4b52c144d650d63333710b27072725589a7 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:47:08 -0800 Subject: [PATCH 2/4] Update OmniSharp version used by source build tests (#20296) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index a16be098b0b2..ff57040c5b37 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public class OmniSharpTests : SdkTests { // Update version as new releases become available: https://github.com/OmniSharp/omnisharp-roslyn/releases - private const string OmniSharpReleaseVersion = "1.39.12"; + private const string OmniSharpReleaseVersion = "1.39.13"; private string OmniSharpDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), nameof(OmniSharpTests)); From 535b34f9b0f3418afffc339434cab8df959d10c2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 15 Jan 2025 14:32:11 -0600 Subject: [PATCH 3/4] Upgrade Fedora CI legs to 41 (#20216) --- eng/pipelines/templates/variables/vmr-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 500d8edd7abf..3ae0405c0a47 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -6,7 +6,7 @@ variables: - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41 - name: ubuntuContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - name: ubuntuArmContainer @@ -19,7 +19,7 @@ variables: - name: centOSStreamName value: CentOSStream9 - name: fedoraName - value: Fedora40 + value: Fedora41 - name: ubuntuName value: Ubuntu2204 @@ -30,7 +30,7 @@ variables: - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid - value: fedora.40-x64 + value: fedora.41-x64 - name: ubuntux64Rid value: ubuntu.22.04-x64 - name: ubuntuArm64Rid From 95930ebc426d578cb800f9eb5800fbbb0a2329fc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 15 Jan 2025 18:38:56 -0800 Subject: [PATCH 4/4] Fix Duplicate and Incorrect Package Source Entries --- NuGet.config | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2a732710398..5e7a3f55ba00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,11 +12,6 @@ - - - - - @@ -25,8 +20,6 @@ - - @@ -52,6 +45,7 @@ + @@ -59,7 +53,6 @@ -