From b5d843cbe08a3f43abb23c61f62ffe868dc636c0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Mar 2025 16:38:39 +0000 Subject: [PATCH 01/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250312.16 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.14 -> To Version 8.0.15 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 12 +++-------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e56a0403b75..617d3f551af1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -24,9 +22,7 @@ - - - + @@ -68,9 +64,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d9828fadd70..d17528754544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 1ff28f1565cfae871464dab8bf46eb90d56f4b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://github.com/dotnet/emsdk - ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 + 6afd7b9f34943078f2e3b747f33350e5fe114269 https://github.com/dotnet/msbuild @@ -200,21 +200,21 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -408,7 +408,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 diff --git a/eng/Versions.props b/eng/Versions.props index dc8be6e7226d..9eee0af178d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.14 - 8.0.14-servicing.25111.18 - 8.0.14 + 8.0.15 + 8.0.15-servicing.25162.16 + 8.0.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.14 - 8.0.14-servicing.25111.18 + 8.0.15 + 8.0.15-servicing.25162.16 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.14 + 8.0.15 8.0.0 8.0.0 8.0.14 @@ -73,7 +73,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.1 + 8.0.2 8.0.1 8.0.7 8.0.1 @@ -229,7 +229,7 @@ - 8.0.14 + 8.0.15 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 405df0fc53be14f5c0ee1d0bc88d5255f4e653a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 17:50:46 +0000 Subject: [PATCH 02/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250314.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.14 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.14-servicing.25113.2 -> To Version 8.0.15-servicing.25163.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 8 ++------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef4c83ee1391..904b8a9b97d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,9 +28,7 @@ - - - + @@ -67,9 +65,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64f3ff10ed53..9f66f3609d51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,25 +228,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8506c0d82a3737ab3e7edce3976f11065bb57fd2 + f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8506c0d82a3737ab3e7edce3976f11065bb57fd2 + f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8506c0d82a3737ab3e7edce3976f11065bb57fd2 + f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8506c0d82a3737ab3e7edce3976f11065bb57fd2 + f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - af059f93ea0cd5b695d098162f0d9b1651adb6a3 + b96de9c3900a80c97119788a4bde7c34dd5ebac0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 514d833ba12e..a87bb9676c63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.14-servicing.25113.2 + 8.0.15-servicing.25163.3 From 737ca6b12cd265e303eb6320eb9ccd559b2257d7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 23:06:49 +0000 Subject: [PATCH 03/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.9 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 904b8a9b97d0..76cae39444c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f66f3609d51..50babd68c5db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://github.com/dotnet/emsdk @@ -202,11 +202,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -214,7 +214,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -408,7 +408,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 diff --git a/eng/Versions.props b/eng/Versions.props index a87bb9676c63..04a6dab0f8db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.15 - 8.0.15-servicing.25162.16 + 8.0.15-servicing.25164.9 8.0.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.15 - 8.0.15-servicing.25162.16 + 8.0.15-servicing.25164.9 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From dfcd41418876e90083ebd1d18af3d54f6cb1ba4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Mar 2025 07:25:34 +0000 Subject: [PATCH 04/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.13 Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.3 -> To Version 8.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76cae39444c1..ac260c3f4669 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50babd68c5db..c8a0db34d554 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://github.com/dotnet/emsdk @@ -202,11 +202,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -214,7 +214,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -408,7 +408,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 diff --git a/eng/Versions.props b/eng/Versions.props index 04a6dab0f8db..edef5b52bc73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.15 - 8.0.15-servicing.25164.9 + 8.0.15-servicing.25164.13 8.0.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.15 - 8.0.15-servicing.25164.9 + 8.0.15-servicing.25164.13 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From bffd8112f7ef07cf11f8865fb05f89fa6109e5b2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Mar 2025 19:21:02 +0000 Subject: [PATCH 05/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250315.2 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.14-servicing.25112.21 -> To Version 8.0.15-servicing.25165.2 --- NuGet.config | 8 ++--- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac260c3f4669..0488f28ed6a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,7 @@ - - - + @@ -55,9 +53,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8a0db34d554..e81c715df0e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b96de9c3900a80c97119788a4bde7c34dd5ebac0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25ef4aa38b77974263cb10f6e9cbd10135f17b59 + d6c6665f772165b3ac034420397184dabf993fdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index edef5b52bc73..171956f4fc29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.15 8.0.0 8.0.0 - 8.0.14 + 8.0.15 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.14 - 8.0.14-servicing.25112.21 - 8.0.14-servicing.25112.21 - 8.0.14-servicing.25112.21 - 8.0.14-servicing.25112.21 - 8.0.14-servicing.25112.21 - 8.0.14 + 8.0.15 + 8.0.15-servicing.25165.2 + 8.0.15-servicing.25165.2 + 8.0.15-servicing.25165.2 + 8.0.15-servicing.25165.2 + 8.0.15-servicing.25165.2 + 8.0.15 From 08fa2ab2f5ae3446b687503386ffdf632f021a96 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 16 Mar 2025 01:53:43 +0000 Subject: [PATCH 06/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250315.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25165.5 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0488f28ed6a9..08a326850014 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e81c715df0e2..08e5411d6813 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6c6665f772165b3ac034420397184dabf993fdc + 8899cb30120d41413065f1b1465cdabefe0a1f9c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 171956f4fc29..848500decc61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.15 - 8.0.15-servicing.25165.2 - 8.0.15-servicing.25165.2 - 8.0.15-servicing.25165.2 - 8.0.15-servicing.25165.2 - 8.0.15-servicing.25165.2 + 8.0.15-servicing.25165.5 + 8.0.15-servicing.25165.5 + 8.0.15-servicing.25165.5 + 8.0.15-servicing.25165.5 + 8.0.15-servicing.25165.5 8.0.15 From 96fbe88e62387e622d8a755ed7f2181d371944a0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 16 Mar 2025 19:19:52 +0000 Subject: [PATCH 07/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250316.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25163.3 -> To Version 8.0.15-servicing.25165.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 08a326850014..93d97a6520fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08e5411d6813..7b8c0686f0e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 + 2705463579d6d3d8436301f02213ce4987669c80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 + 2705463579d6d3d8436301f02213ce4987669c80 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 + 2705463579d6d3d8436301f02213ce4987669c80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f53fd07b3c1508214c05fbd2ee4d2a9bad3f02d3 + 2705463579d6d3d8436301f02213ce4987669c80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b96de9c3900a80c97119788a4bde7c34dd5ebac0 + 9d1a7bbd03007c329391026b1abf1ca404b3b90d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 848500decc61..6a9dee69d378 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.15-servicing.25163.3 + 8.0.15-servicing.25165.2 From 0d1feb7cace0c3364c89652d98bd627c44f2ad20 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Mar 2025 19:52:12 +0000 Subject: [PATCH 08/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250317.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25167.5 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93d97a6520fc..e4b78b34df6b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27d4637f5fe1..c1e1b603e8ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2705463579d6d3d8436301f02213ce4987669c80 + d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2705463579d6d3d8436301f02213ce4987669c80 + d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2705463579d6d3d8436301f02213ce4987669c80 + d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2705463579d6d3d8436301f02213ce4987669c80 + d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9d1a7bbd03007c329391026b1abf1ca404b3b90d + b929fc7b324b21fe74f2d1d4fe52b534046152b0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6d38785597e7..1a989c8a8d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.15-servicing.25165.2 + 8.0.15-servicing.25167.5 From 93e203359bd309d0251d26d21f000d578db89e70 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 18 Mar 2025 17:56:25 +0000 Subject: [PATCH 09/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250318.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.15 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25167.9 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4b78b34df6b..d980df3d28bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1e1b603e8ac..1fbc8c22abe9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 + 83fc500260851a71b62ed3e92e672021624c28da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 + 83fc500260851a71b62ed3e92e672021624c28da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 + 83fc500260851a71b62ed3e92e672021624c28da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d4f37f88111ecbae7d1a1f8c4bc69fa96b578626 + 83fc500260851a71b62ed3e92e672021624c28da - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b929fc7b324b21fe74f2d1d4fe52b534046152b0 + 4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1a989c8a8d7b..092dc2bc57b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.15-servicing.25167.5 + 8.0.15-servicing.25167.9 From 28d560cd9be7268202dbf01d100aeea0c64f82f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 05:02:09 +0000 Subject: [PATCH 10/27] Update dependencies from https://github.com/dotnet/arcade build 20250408.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..7835b4715019 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..2d466fe6d0bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 570ed21c0599..1918bc6863ac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.114", + "dotnet": "8.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" } } From 4ff970545f6ed6472f107f102e1135e3af077fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:15 +0000 Subject: [PATCH 11/27] Update dependencies from https://github.com/dotnet/templating build 20250409.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25207.1 -> To Version 8.0.312-servicing.25209.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36a4c9f42d8f..87bf0ce05c19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..c47b4567ef0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 - + https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 - + https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..e04220c9713f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.312-servicing.25207.1 + 8.0.312-servicing.25209.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From d2881a6427af42ab8dbb7498380be4150609b6e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:15 +0000 Subject: [PATCH 12/27] Update dependencies from https://github.com/dotnet/msbuild build 20250410.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.25-preview-25207-05 -> To Version 17.10.26-servicing-25210-02 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36a4c9f42d8f..b412f6da2db4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..f234e1ed0f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..eae34cd96781 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.25 + 17.10.26 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e2e12f1a2f2..8b535d7729ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 029cb834bc42a5f6091cb6e8937b14b6da02d29c + 6e7275412c921599a753c88b33fe0c5ce75e50da - + https://github.com/dotnet/templating - 029cb834bc42a5f6091cb6e8937b14b6da02d29c + 6e7275412c921599a753c88b33fe0c5ce75e50da diff --git a/eng/Versions.props b/eng/Versions.props index 46de742d0964..c2062b8d0a94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.204-servicing.25209.4 + 9.0.204-servicing.25210.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c17a6f188558fffb27f5247db144a6bf8f3a2471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Apr 2025 05:02:30 +0000 Subject: [PATCH 15/27] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250410.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25163.2 -> To Version 8.0.0-alpha.1.25210.2 --- 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 6e933536bcc8..310a9de598aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - b09e26d761555d806f31af68d6fe5dfdeebf6e38 + 6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c From 1cc00f1578ad6883eaf90e5f12f81b8ec71e7972 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Apr 2025 13:25:12 -0700 Subject: [PATCH 16/27] Remove the TestSdkRpm --- .../targets/GenerateRPMs.targets | 61 +------------------ 1 file changed, 2 insertions(+), 59 deletions(-) diff --git a/src/Installer/redist-installer/targets/GenerateRPMs.targets b/src/Installer/redist-installer/targets/GenerateRPMs.targets index 454a5758c287..9c8d23807c41 100644 --- a/src/Installer/redist-installer/targets/GenerateRPMs.targets +++ b/src/Installer/redist-installer/targets/GenerateRPMs.targets @@ -12,7 +12,7 @@ GenerateRpmsInner" /> @@ -150,16 +150,6 @@ - - - - - - - - - - @@ -310,53 +300,6 @@ Importance="High" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From 0de985dc8ab127439eae09952e73f732ca53fc44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 05:01:52 +0000 Subject: [PATCH 17/27] Update dependencies from https://github.com/dotnet/msbuild build 20250415.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.30-servicing-25210-03 -> To Version 17.11.31-servicing-25215-01 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 141c70d2c35c..b02836bc40ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,27 +4,23 @@ - - - + - - @@ -51,15 +47,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 562708fab39b..0b8c792e79a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6afd7b9f34943078f2e3b747f33350e5fe114269 - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc diff --git a/eng/Versions.props b/eng/Versions.props index bca3bc9c9f28..2f8a2eca5ee1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.30 + 17.11.31 $(MicrosoftBuildPackageVersion) - - - + - - - @@ -69,13 +64,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b116e9f586f4..b71d7bace6e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 78be8cdf4f0bfd93018fd7a87f8282a41d041298 - + https://github.com/dotnet/msbuild - 762d7c2e9441e84a22b0dea75418c40c9cd397b3 + ced361277f33b9eb9312d927869a77b6d9108876 - + https://github.com/dotnet/msbuild - 762d7c2e9441e84a22b0dea75418c40c9cd397b3 + ced361277f33b9eb9312d927869a77b6d9108876 - + https://github.com/dotnet/msbuild - 762d7c2e9441e84a22b0dea75418c40c9cd397b3 + ced361277f33b9eb9312d927869a77b6d9108876 diff --git a/eng/Versions.props b/eng/Versions.props index a8a4f5256eb4..f7619394fa7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.34 - 17.12.34-preview-25210-04 + 17.12.35 + 17.12.35-preview-25214-08 17.11.4 17.12 From 285ed0af349b87af296bfa130fb80d4f41183893 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 05:01:58 +0000 Subject: [PATCH 19/27] Update dependencies from https://github.com/dotnet/arcade build 20250414.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7 --- NuGet.config | 7 ------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdl/packages.config | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 141c70d2c35c..98bde053f429 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,13 +4,11 @@ - - @@ -18,13 +16,11 @@ - - @@ -51,15 +47,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 562708fab39b..2373771360ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bca3bc9c9f28..22197a51213b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25208.7 + 8.0.0-beta.25214.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25208.7 + 8.0.0-beta.25214.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba1..e5f543ea68c2 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/global.json b/global.json index 1918bc6863ac..5208b63f114e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7" } } From 44344468cdc1a636480d9e84b9227d43a5d9c3ed Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 15 Apr 2025 12:55:22 -0700 Subject: [PATCH 20/27] Update to the stable nuget version --- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 24 ++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b535d7729ce..675a9762bb7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,72 +139,72 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce diff --git a/eng/Versions.props b/eng/Versions.props index c2062b8d0a94..d2d7810c0547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,18 +135,18 @@ - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 - 6.13.2-rc.1 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 + 6.13.2 From 9fe45ce28b3214d62884d1ed241078fff7c91223 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 20:22:53 +0000 Subject: [PATCH 21/27] Update dependencies from https://github.com/dotnet/templating build 20250415.4 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.204 -> To Version 9.0.204 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 352fbee14e2e..951309eb26b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 675a9762bb7e..8c8e9f332e7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 6e7275412c921599a753c88b33fe0c5ce75e50da + ad75e8e2fb4f2897d5884b60f10ad2e9a59d0554 - + https://github.com/dotnet/templating - 6e7275412c921599a753c88b33fe0c5ce75e50da + ad75e8e2fb4f2897d5884b60f10ad2e9a59d0554 diff --git a/eng/Versions.props b/eng/Versions.props index d2d7810c0547..415190abd0d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.204-servicing.25210.4 + 9.0.204-servicing.25215.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7dec919078141d050c994992907ba754f2b38b8e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 15 Apr 2025 13:56:47 -0700 Subject: [PATCH 22/27] revert nugetsdkresolver back to the unstable version --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c8e9f332e7e..f65f15c65d35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,7 +139,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://github.com/nuget/nuget.client 5d81cb8da82eda8a6b47aae92d1e6f888de982ce diff --git a/eng/Versions.props b/eng/Versions.props index 415190abd0d6..6c7d340e02f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,7 +141,7 @@ 6.13.2 6.13.2 6.13.2 - 6.13.2 + 6.13.2-rc.1 6.13.2 6.13.2 6.13.2 From 8c3b7d4ad49309f6b65a8d3eadc8b700bd1266f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Apr 2025 05:02:14 +0000 Subject: [PATCH 23/27] Update dependencies from https://github.com/dotnet/roslyn build 20250416.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25214.4 -> To Version 4.14.0-3.25216.9 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f6698c64a23..4805068848b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e165bbea9e27ceb4c8b91c22bd0c564ff1dc8b25 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - c2274abeea89c24a4e763da5ec002d9251a347c5 + 48a14b1906eadee0cb909a2686623d88cb6c20b8 diff --git a/eng/Versions.props b/eng/Versions.props index d5ebc06d70bd..98228682cfc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25202.1 - 3.12.0-beta1.25214.4 + 3.12.0-beta1.25216.9 @@ -206,14 +206,14 @@ - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 - 4.14.0-3.25214.4 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 + 4.14.0-3.25216.9 From 1254e7cd52ac02f2a620fe252ba1d2cd582c5a15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Apr 2025 23:10:15 +0000 Subject: [PATCH 24/27] Update dependencies from https://github.com/dotnet/templating build 20250417.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.300 -> To Version 9.0.300 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4038d6ff517d..e17eddc6709d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4805068848b8..64bd3d78da99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 71d6ad51ee3371153bc7f825bdf6cc26cef7619b + bb7417805da3d5db9401ab37362bd39575e1459f - + https://github.com/dotnet/templating - 71d6ad51ee3371153bc7f825bdf6cc26cef7619b + bb7417805da3d5db9401ab37362bd39575e1459f diff --git a/eng/Versions.props b/eng/Versions.props index 98228682cfc1..58eccaa54eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.300-rtm.25215.5 + 9.0.300-rtm.25217.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f94556bcdc961510bf4a2d4ff2d55cb13cbe5676 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Apr 2025 05:02:22 +0000 Subject: [PATCH 25/27] Update dependencies from https://github.com/dotnet/roslyn build 20250417.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25216.9 -> To Version 4.14.0-3.25217.4 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd3d78da99..6fe955615206 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e165bbea9e27ceb4c8b91c22bd0c564ff1dc8b25 - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 48a14b1906eadee0cb909a2686623d88cb6c20b8 + cb32ed920951c00c108c20ed850a27e4ac83572f diff --git a/eng/Versions.props b/eng/Versions.props index 58eccaa54eba..affbf5fe63e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25202.1 - 3.12.0-beta1.25216.9 + 3.12.0-beta1.25217.4 @@ -206,14 +206,14 @@ - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 - 4.14.0-3.25216.9 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 + 4.14.0-3.25217.4 From 693a64bacd5b4fe9887154d65a0fb70a098955de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Apr 2025 05:02:25 +0000 Subject: [PATCH 26/27] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.116 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.102 -> To Version 6.14.0-rc.116 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd3d78da99..a52feba0e32b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + 0da03caba83448ee887f0f1846dd05e1f1705d45 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 58eccaa54eba..d0c9f4fd0fcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,18 +139,18 @@ - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 From 5f32ae2439db56b36548861c02e17b6af8d54785 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:18:17 +0000 Subject: [PATCH 27/27] [release/9.0.3xx] light up container publish for all Exe/WinExe projects by default (#47691) Co-authored-by: Chet Husk --- .../Microsoft.NET.Build.Containers.targets | 6 +- .../EndToEndTests.cs | 66 ++++++++----------- 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index 132c82f0fd38..f11f57c3e989 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -15,6 +15,8 @@ <_ContainerIsTargetingNet8TFM Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '8.0'))">true <_ContainerIsSelfContained>false <_ContainerIsSelfContained Condition="'$(SelfContained)' == 'true' or '$(PublishSelfContained)' == 'true'">true + + true @@ -235,10 +237,6 @@ )" Code="CONTAINER005" Text="The $(_ContainersPackageIdentity) NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to $(_ContainersPackageIdentity) because it is no longer needed." /> - - - true - e.Name.LocalName == "PropertyGroup")? - .Add(new XElement("EnableSdkContainerSupport", "true")); document .Descendants() .First(e => e.Name.LocalName == "TargetFramework") @@ -512,6 +508,8 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() [InlineData("webapi", true)] [InlineData("worker", false)] [InlineData("worker", true)] + [InlineData("console", true)] + [InlineData("console", false)] public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackageReference) { DirectoryInfo newProjectDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_{projectType}_{addPackageReference}")); @@ -564,7 +562,6 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage var project = XDocument.Load(projectPath); var ns = project.Root?.Name.Namespace ?? throw new InvalidOperationException("Project file is empty"); - project.Root?.Add(new XElement("PropertyGroup", new XElement("EnableSDKContainerSupport", "true"))); project.Save(projectPath); } @@ -575,7 +572,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage CommandResult commandResult = new DotnetCommand( _testOutput, "publish", - "/p:PublishProfile=DefaultContainer", + "/t:PublishContainer", "/p:RuntimeIdentifier=linux-x64", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}", @@ -604,12 +601,14 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage var containerName = $"test-container-1-{projectType}-{addPackageReference}"; CommandResult processResult = ContainerCli.RunCommand( _testOutput, - "--rm", - "--name", - containerName, - "-P", - "--detach", - $"{DockerRegistryManager.LocalRegistry}/{imageName}:{imageTag}") + [ + "--rm", + "--name", + containerName, + "-P", + ..projectType != "console" ? ["--detach"] : new string[]{}, + $"{DockerRegistryManager.LocalRegistry}/{imageName}:{imageTag}" + ]) .Execute(); processResult.Should().Pass(); Assert.NotNull(processResult.StdOut); @@ -617,8 +616,6 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage bool everSucceeded = false; - - if (projectType == "webapi") { var portCommand = @@ -657,14 +654,13 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage Assert.True(everSucceeded, $"{appUri}weatherforecast never responded."); ContainerCli.StopCommand(_testOutput, appContainerId) - .Execute() - .Should().Pass(); + .Execute() + .Should().Pass(); } else if (projectType == "worker") { // the worker template needs a second to start up and emit the logs we are looking for await Task.Delay(TimeSpan.FromSeconds(5)).ConfigureAwait(false); - var containerLogs = ContainerCli.LogsCommand(_testOutput, appContainerId) .Execute() .Should().Pass() @@ -673,10 +669,11 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage ContainerCli.StopCommand(_testOutput, appContainerId) .Execute() .Should().Pass(); + } - else + else if (projectType == "console") { - throw new NotImplementedException("Unknown project type"); + processResult.Should().Pass().And.HaveStdOutContaining("Hello, World!"); } newProjectDir.Delete(true); @@ -741,8 +738,7 @@ public void EndToEnd_NoAPI_Console(string baseImage) $"/p:ContainerBaseImage={baseImage}", $"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={imageTag}") .WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName) .WithWorkingDirectory(newProjectDir.FullName) .Execute() @@ -782,8 +778,7 @@ public void EndToEnd_SingleArch_NoRid() "/t:PublishContainer", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={imageTag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); commandResult.Should().Pass(); @@ -818,8 +813,7 @@ public void EndToEndMultiArch_LocalRegistry(string imageName) "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={tag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={tag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -882,7 +876,6 @@ public void MultiArchStillAllowsSingleRID() $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true", "/bl") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -932,7 +925,6 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties() $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true", "/bl") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -1005,8 +997,7 @@ public void EndToEndMultiArch_ArchivePublishing(string imageName) $"/p:ContainerArchiveOutputPath={archiveOutput}", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={tag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={tag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -1076,8 +1067,7 @@ public void EndToEndMultiArch_RemoteRegistry() $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRegistry={registry}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={imageTag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -1150,8 +1140,7 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif "/p:ContainerRuntimeIdentifiers=linux-arm64", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={imageTag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={imageTag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute(); @@ -1201,8 +1190,7 @@ public void EndToEndMultiArch_EnvVariables() "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={tag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={tag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute() .Should().Pass(); @@ -1266,8 +1254,7 @@ public void EndToEndMultiArch_Ports() "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={tag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={tag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute() .Should().Pass(); @@ -1353,8 +1340,7 @@ public void EndToEndMultiArch_Labels() "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"", $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", $"/p:ContainerRepository={imageName}", - $"/p:ContainerImageTag={tag}", - "/p:EnableSdkContainerSupport=true") + $"/p:ContainerImageTag={tag}") .WithWorkingDirectory(newProjectDir.FullName) .Execute() .Should().Pass();