From b54bb92b10758a74865409c43e9b54768562f5e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 16:37:17 +0000 Subject: [PATCH 01/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250812.10 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 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.19-servicing.25365.14 -> To Version 8.0.20-servicing.25412.10 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 643ead4f2e22..0472807c3582 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -15,7 +13,6 @@ - @@ -23,13 +20,12 @@ - + - @@ -56,7 +52,6 @@ - @@ -66,10 +61,9 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc7fba57aa04..252afe3b548b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,42 +14,42 @@ 6c7fa94364cae917ec8ce37e65e442cea2258041 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f https://github.com/dotnet/emsdk @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fce8ed90dc43047eabec2b32c04ee46b789ad5d1 + 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 729b444287a3..7e5c2a068415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.19 - 8.0.19-servicing.25365.14 - 8.0.19 + 8.0.20 + 8.0.20-servicing.25412.10 + 8.0.20 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.19 - 8.0.19-servicing.25365.14 + 8.0.20 + 8.0.20-servicing.25412.10 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.19 + 8.0.20 8.0.0 8.0.0 8.0.19 From d2a4b290f34cb5e3d8c2922e127bf33921c5af69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 18:50:13 +0000 Subject: [PATCH 02/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250813.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.19 -> To Version 8.0.20 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.19-servicing.25368.11 -> To Version 8.0.20-servicing.25413.5 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0472807c3582..181314f5d5b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,6 +26,7 @@ + @@ -64,6 +65,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252afe3b548b..25d4044365fb 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 - 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c + c0b240c049009c7056ade8a451821fbb9bfe3cd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c + c0b240c049009c7056ade8a451821fbb9bfe3cd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c + c0b240c049009c7056ade8a451821fbb9bfe3cd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c + c0b240c049009c7056ade8a451821fbb9bfe3cd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43d1a9a5f6207405244e36ac6a2950c8050442f8 + 2d7eca6fab93a8568ab489034f975d937502322a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7e5c2a068415..f8599684318b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.19-servicing.25368.11 + 8.0.20-servicing.25413.5 From 6916ef76eca6d5e5d2de446559e5d164dc04ade3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 19:13:30 +0000 Subject: [PATCH 03/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250813.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.19-servicing.25372.4 -> To Version 8.0.20-servicing.25413.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 181314f5d5b8..e0ee5001d9a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25d4044365fb..b46e99adfa62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 2d7eca6fab93a8568ab489034f975d937502322a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c 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 - 277e317dd5cab9859ceea4c8ebae218522c2c173 + f654ff210c47a5b2288916c219c21fde07661c8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f8599684318b..0904a869a39a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.20 8.0.0 8.0.0 - 8.0.19 + 8.0.20 8.0.0 8.0.0 8.0.0 @@ -171,13 +171,13 @@ - 8.0.19 - 8.0.19-servicing.25372.4 - 8.0.19-servicing.25372.4 - 8.0.19-servicing.25372.4 - 8.0.19-servicing.25372.4 - 8.0.19-servicing.25372.4 - 8.0.19 + 8.0.20 + 8.0.20-servicing.25413.2 + 8.0.20-servicing.25413.2 + 8.0.20-servicing.25413.2 + 8.0.20-servicing.25413.2 + 8.0.20-servicing.25413.2 + 8.0.20 From f1d870c50de97f33f5ebf4449846b1cd9c0e8097 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Aug 2025 23:05:13 +0000 Subject: [PATCH 04/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250815.11 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 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25412.10 -> To Version 8.0.20-servicing.25415.11 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0ee5001d9a0..ac984018cb34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b46e99adfa62..85a05a2e65bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6b12df1a810008460d16ef9bfd2cecb1a9a8c29f + dd6010a8a425962e7793cc741e1f79f8681e4882 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0904a869a39a..8cf184ed52bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.20 - 8.0.20-servicing.25412.10 + 8.0.20-servicing.25415.11 8.0.20 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.20 - 8.0.20-servicing.25412.10 + 8.0.20-servicing.25415.11 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From a42e2ebbd4b3bd1586bd30626ab40b86fd39ee2b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 01:53:51 +0000 Subject: [PATCH 05/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250815.15 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.20-servicing.25413.2 -> To Version 8.0.20-servicing.25415.15 --- 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 ac984018cb34..cccc84f23eed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85a05a2e65bd..07f54385a353 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f654ff210c47a5b2288916c219c21fde07661c8c + cea0b1a66f968b2ab1c992ad86376fe74b82a566 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8cf184ed52bd..53fd22f54946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.20 - 8.0.20-servicing.25413.2 - 8.0.20-servicing.25413.2 - 8.0.20-servicing.25413.2 - 8.0.20-servicing.25413.2 - 8.0.20-servicing.25413.2 + 8.0.20-servicing.25415.15 + 8.0.20-servicing.25415.15 + 8.0.20-servicing.25415.15 + 8.0.20-servicing.25415.15 + 8.0.20-servicing.25415.15 8.0.20 From 70b22bdec99f47313125c926921a0bc579e40766 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 02:03:12 +0000 Subject: [PATCH 06/68] Update dependencies from https://github.com/dotnet/templating build 20250814.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.317-servicing.25407.9 -> To Version 8.0.317-servicing.25414.3 --- 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 0693a09bd3fd..f439ff9d8a61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cce44fb81dbb..b7391521eb5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 6c7fa94364cae917ec8ce37e65e442cea2258041 + 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a - + https://github.com/dotnet/templating - 6c7fa94364cae917ec8ce37e65e442cea2258041 + 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a - + https://github.com/dotnet/templating - 6c7fa94364cae917ec8ce37e65e442cea2258041 + 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a diff --git a/eng/Versions.props b/eng/Versions.props index 729b444287a3..d927878cb97b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.317-servicing.25407.9 + 8.0.317-servicing.25414.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 767b41e7e2ecfd7bb1b1b4595fb46b757795403e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 02:03:34 +0000 Subject: [PATCH 07/68] Update dependencies from https://github.com/dotnet/arcade build 20250815.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25407.1 -> To Version 8.0.0-beta.25415.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/SetupNugetSources.ps1 | 4 ++-- eng/common/SetupNugetSources.sh | 4 ++-- eng/common/templates-official/job/job.yml | 12 ++++++------ .../templates-official/job/onelocbuild.yml | 6 +++--- .../job/publish-build-assets.yml | 13 +++++++++---- .../job/source-index-stage1.yml | 2 +- .../templates-official/jobs/codeql-build.yml | 2 +- eng/common/templates-official/jobs/jobs.yml | 2 ++ .../templates-official/post-build/post-build.yml | 8 ++++---- .../post-build/trigger-subscription.yml | 2 +- .../steps/add-build-to-channel.yml | 2 +- .../templates-official/steps/execute-sdl.yml | 14 +++++++------- .../templates-official/steps/generate-sbom.yml | 2 +- .../templates-official/steps/publish-logs.yml | 6 +++--- .../templates-official/steps/source-build.yml | 8 ++++---- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 12 ++++++------ eng/common/templates/job/onelocbuild.yml | 6 +++--- .../templates/job/publish-build-assets.yml | 13 +++++++++---- eng/common/templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/jobs/jobs.yml | 2 ++ eng/common/templates/post-build/post-build.yml | 8 ++++---- .../templates/post-build/setup-maestro-vars.yml | 2 +- .../post-build/trigger-subscription.yml | 2 +- .../templates/steps/add-build-to-channel.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 14 +++++++------- eng/common/templates/steps/generate-sbom.yml | 2 +- eng/common/templates/steps/publish-logs.yml | 6 +++--- eng/common/templates/steps/source-build.yml | 8 ++++---- eng/common/templates/variables/sdl-variables.yml | 2 +- global.json | 4 ++-- 34 files changed, 105 insertions(+), 91 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cce44fb81dbb..fddad87e1a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 729b444287a3..06325f9a6663 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.25407.1 + 8.0.0-beta.25415.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25407.1 + 8.0.0-beta.25415.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index efa2fd72bfaa..59b2d55e1a33 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -17,8 +17,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index d387c7eac95e..c0e7bbef21c4 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -18,8 +18,8 @@ # - task: Bash@3 # displayName: Setup Private Feeds Credentials # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config $Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index b98f6a6505d3..4cca1114fcca 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -38,7 +38,7 @@ parameters: # Sbom related params enableSbom: true PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: @@ -167,7 +167,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -226,7 +226,7 @@ jobs: - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' PublishLocation: Container ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} continueOnError: true @@ -238,7 +238,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -249,7 +249,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -265,7 +265,7 @@ jobs: - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - task: 1ES.PublishPipelineArtifact@1 inputs: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8d..68e7a65605c5 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -63,7 +63,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -106,7 +106,7 @@ jobs: - task: 1ES.PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index b2ccd9df6801..7a320e9bab20 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -30,6 +30,8 @@ parameters: signingValidationAdditionalParameters: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -65,6 +67,9 @@ jobs: os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: ${{ parameters.repositoryAlias }} + fetchDepth: 3 + clean: true - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: @@ -82,7 +87,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' @@ -115,7 +120,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -130,7 +135,7 @@ jobs: displayName: Publish SymbolPublishingExclusionsFile Artifact condition: eq(variables['SymbolExclusionFile'], 'true') inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs @@ -146,7 +151,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index fb632b71a250..0579e692fc81 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -59,7 +59,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml index b68d3c2f3199..f6476912a861 100644 --- a/eng/common/templates-official/jobs/codeql-build.yml +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -23,7 +23,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 857a0f8ba43e..803a95aacf4e 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -40,6 +40,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -95,3 +96,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index b81b8770b346..9fef8103991c 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -133,7 +133,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ @@ -186,7 +186,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: ../steps/publish-logs.yml @@ -230,7 +230,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -278,7 +278,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml index da669030daf6..52df70774828 100644 --- a/eng/common/templates-official/post-build/trigger-subscription.yml +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Triggering subscriptions inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroAccessToken) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml index f67a210d62f3..5b6fec257ea7 100644 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Add Build to Channel inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/add-build-to-channel.ps1 arguments: -BuildId $(BARBuildId) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroApiAccessToken) diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 301d5c591ebd..d9dcd1e1cdeb 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -15,17 +15,17 @@ steps: - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian (Overridden) - ${{ if eq(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian @@ -38,7 +38,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -NugetPackageDirectory $(System.DefaultWorkingDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL @@ -73,7 +73,7 @@ steps: flattenFolders: true sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + targetFolder: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs condition: succeededOrFailed() # Use PublishBuildArtifacts because the SARIF extension only checks this case @@ -81,6 +81,6 @@ steps: - task: PublishBuildArtifacts@1 displayName: Publish SARIF files to CodeAnalysisLogs container inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + pathToPublish: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index daf0957b68d7..1536353566c7 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 8.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml index 04012fed182a..af5a40b64c4b 100644 --- a/eng/common/templates-official/steps/publish-logs.yml +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -8,15 +8,15 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' PublishLocation: Container ArtifactName: PostBuildLogs continueOnError: true diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 829f17c34d11..a69631446da2 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -26,8 +26,8 @@ steps: internalRestoreArgs= if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. @@ -101,7 +101,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,4 +126,4 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 2856f7de1061..80454d5a5587 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -37,7 +37,7 @@ parameters: # Sbom related params enableSbom: true PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -163,7 +163,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -220,7 +220,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' PublishLocation: Container ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} continueOnError: true @@ -232,7 +232,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -243,7 +243,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -257,7 +257,7 @@ jobs: IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration + - publish: $(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration artifact: BuildConfiguration displayName: Publish build retry configuration continueOnError: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 60ab00c4de3a..2cd3840c9927 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -60,7 +60,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index cc2b346ba8ba..2956d8117f73 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -30,6 +30,8 @@ parameters: signingValidationAdditionalParameters: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -63,6 +65,9 @@ jobs: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: ${{ parameters.repositoryAlias }} + fetchDepth: 3 + clean: true - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: @@ -80,7 +85,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' @@ -111,7 +116,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -126,7 +131,7 @@ jobs: displayName: Publish SymbolPublishingExclusionsFile Artifact condition: eq(variables['SymbolExclusionFile'], 'true') inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs @@ -142,7 +147,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 8538f44bab28..81606fd9a541 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -58,7 +58,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4aaa6..e8b43e3b4cba 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -23,7 +23,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 289bb2396ce8..34387a8c7acd 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -40,6 +40,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -95,3 +96,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c3b6a3012fee..6e5722dc2e17 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -130,7 +130,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ @@ -180,7 +180,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: ../steps/publish-logs.yml @@ -220,7 +220,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -274,7 +274,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 64b9abc68504..4347fa80b684 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -32,7 +32,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml index da669030daf6..52df70774828 100644 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Triggering subscriptions inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroAccessToken) diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml index f67a210d62f3..5b6fec257ea7 100644 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ b/eng/common/templates/steps/add-build-to-channel.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Add Build to Channel inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/add-build-to-channel.ps1 arguments: -BuildId $(BARBuildId) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroApiAccessToken) diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index fe0ebf8c904e..047e8281ebc0 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -15,17 +15,17 @@ steps: - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian (Overridden) - ${{ if eq(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian @@ -40,7 +40,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -NugetPackageDirectory $(System.DefaultWorkingDirectory)\.packages ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} @@ -76,7 +76,7 @@ steps: flattenFolders: true sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + targetFolder: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs condition: succeededOrFailed() # Use PublishBuildArtifacts because the SARIF extension only checks this case @@ -84,6 +84,6 @@ steps: - task: PublishBuildArtifacts@1 displayName: Publish SARIF files to CodeAnalysisLogs container inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + pathToPublish: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 2b21eae42732..b1fe8b3944b3 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 8.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 88f238f36bfd..e2f8413d8e19 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -8,15 +8,15 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' PublishLocation: Container ArtifactName: PostBuildLogs continueOnError: true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 41bbb915736a..4fb5643e5ded 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -26,8 +26,8 @@ steps: internalRestoreArgs= if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. @@ -101,7 +101,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,4 +126,4 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates/variables/sdl-variables.yml +++ b/eng/common/templates/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 24482931e6f1..35c55ef5902d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25415.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25415.2" } } From 0ca3888de950c4a00b1302a2d5e1b187e712a48c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 05:41:48 +0000 Subject: [PATCH 08/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250815.21 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.20-servicing.25413.2 -> To Version 8.0.20-servicing.25415.21 --- 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 cccc84f23eed..ee7eb908a8d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07f54385a353..b70b660189be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea0b1a66f968b2ab1c992ad86376fe74b82a566 + a963a15a6fe69263d5381a6d0fb98f6fff0003f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 53fd22f54946..ccdf5e44e387 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.20 - 8.0.20-servicing.25415.15 - 8.0.20-servicing.25415.15 - 8.0.20-servicing.25415.15 - 8.0.20-servicing.25415.15 - 8.0.20-servicing.25415.15 + 8.0.20-servicing.25415.21 + 8.0.20-servicing.25415.21 + 8.0.20-servicing.25415.21 + 8.0.20-servicing.25415.21 + 8.0.20-servicing.25415.21 8.0.20 From 5d9ac7bb9912bd3587f75b1b3e2c59e43e1e14c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 21:37:01 +0000 Subject: [PATCH 09/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250816.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.20 -> To Version 8.0.20 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.20-servicing.25413.5 -> To Version 8.0.20-servicing.25415.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 ee7eb908a8d2..a6ae5a3f0380 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b70b660189be..f73a35efab0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0b240c049009c7056ade8a451821fbb9bfe3cd9 + 5389367cfc96b37742df969ee8be968e8b3cadaa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0b240c049009c7056ade8a451821fbb9bfe3cd9 + 5389367cfc96b37742df969ee8be968e8b3cadaa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0b240c049009c7056ade8a451821fbb9bfe3cd9 + 5389367cfc96b37742df969ee8be968e8b3cadaa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0b240c049009c7056ade8a451821fbb9bfe3cd9 + 5389367cfc96b37742df969ee8be968e8b3cadaa - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2d7eca6fab93a8568ab489034f975d937502322a + 6d0860a9836d13b717b2bf679798d6de0cd15129 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ccdf5e44e387..52dd201e3984 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.20-servicing.25413.5 + 8.0.20-servicing.25415.2 From 00d23902d8cd29a71abb327b6b6a288841224d16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 02:03:08 +0000 Subject: [PATCH 10/68] Update dependencies from https://github.com/dotnet/msbuild build 20250818.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.38-servicing-25411-06 -> To Version 17.10.39-servicing-25418-06 --- 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 f439ff9d8a61..c265bc87de65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0de7c940f38a..de4a781d8cfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 02960019913e12a2a104a41249c9f8df2c2aa20d + c765bdccd66f924b3244a57ec0df32abe3a11ef0 - + https://github.com/dotnet/msbuild - 02960019913e12a2a104a41249c9f8df2c2aa20d + c765bdccd66f924b3244a57ec0df32abe3a11ef0 - + https://github.com/dotnet/msbuild - 02960019913e12a2a104a41249c9f8df2c2aa20d + c765bdccd66f924b3244a57ec0df32abe3a11ef0 diff --git a/eng/Versions.props b/eng/Versions.props index 7e50e8d3a2f3..2886673a8e57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.38 + 17.10.39 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0de7c940f38a..7aa5635beb99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a + 3c231d88e02bd0e405eddec6ac636b130e73dc30 - + https://github.com/dotnet/templating - 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a + 3c231d88e02bd0e405eddec6ac636b130e73dc30 - + https://github.com/dotnet/templating - 093bc2e56c96ea2bee0ec193f80fdeeda3c77d7a + 3c231d88e02bd0e405eddec6ac636b130e73dc30 diff --git a/eng/Versions.props b/eng/Versions.props index 7e50e8d3a2f3..1a2ff12714cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.317-servicing.25414.3 + 8.0.317-servicing.25417.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1c6690529f4682092dc7358ed042a8bad2ee4968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Aug 2025 02:03:41 +0000 Subject: [PATCH 12/68] Update dependencies from https://github.com/dotnet/msbuild build 20250819.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.39-servicing-25418-06 -> To Version 17.10.40-servicing-25419-02 --- NuGet.config | 3 ++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index c265bc87de65..b97eb80e560d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -23,6 +23,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de4a781d8cfc..6f3c65938ccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - c765bdccd66f924b3244a57ec0df32abe3a11ef0 + 77bc77a53cffc208304e422a3e9bd612177ea9d1 - + https://github.com/dotnet/msbuild - c765bdccd66f924b3244a57ec0df32abe3a11ef0 + 77bc77a53cffc208304e422a3e9bd612177ea9d1 - + https://github.com/dotnet/msbuild - c765bdccd66f924b3244a57ec0df32abe3a11ef0 + 77bc77a53cffc208304e422a3e9bd612177ea9d1 diff --git a/eng/Versions.props b/eng/Versions.props index 2886673a8e57..57123bc51be0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.39 + 17.10.40 $(MicrosoftBuildPackageVersion) + @@ -14,6 +15,7 @@ + @@ -21,13 +23,15 @@ - + + + @@ -54,6 +58,7 @@ + @@ -64,9 +69,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc69af33c6dd..ac64927b96b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,11 +49,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 - + https://github.com/dotnet/emsdk - 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b + 222749b48ecb0fe78f236ca9c61f6ff3b09cdc99 https://github.com/dotnet/msbuild @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd6010a8a425962e7793cc741e1f79f8681e4882 + 574100b692e71fa3426931adf4c1ba42e4ee5213 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 637495bb6f7e..d30234317228 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.20 - 8.0.20-servicing.25415.11 + 8.0.20-servicing.25419.14 8.0.20 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.20 - 8.0.20-servicing.25415.11 + 8.0.20-servicing.25419.14 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 @@ -231,7 +231,7 @@ - 8.0.19 + 8.0.20 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From c9e7dbaf059f87184479924ce7d0fbdae50002f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 08:10:32 +0000 Subject: [PATCH 14/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250819.13 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.20-servicing.25415.21 -> To Version 8.0.20-servicing.25419.13 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 57853ab571f2..7b6595a6180f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,7 @@ - - + @@ -58,8 +57,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac64927b96b8..53715cefd070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a963a15a6fe69263d5381a6d0fb98f6fff0003f8 + 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d30234317228..e68e6db969d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.20 - 8.0.20-servicing.25415.21 - 8.0.20-servicing.25415.21 - 8.0.20-servicing.25415.21 - 8.0.20-servicing.25415.21 - 8.0.20-servicing.25415.21 + 8.0.20-servicing.25419.13 + 8.0.20-servicing.25419.13 + 8.0.20-servicing.25419.13 + 8.0.20-servicing.25419.13 + 8.0.20-servicing.25419.13 8.0.20 From 2b4a97e088816afe0368439396a8603d390ac4b3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 11:08:26 +0000 Subject: [PATCH 15/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250820.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.20-servicing.25415.21 -> To Version 8.0.20-servicing.25420.2 --- 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 7b6595a6180f..6c0981ea1d04 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53715cefd070..a1b76b488221 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9edd81d64f41d79c618e2fb3bb8ee9485d9114e1 + c78f4a816c0c6a978a801a05a31dce9013e099e2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e68e6db969d0..0404d8006262 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.20 - 8.0.20-servicing.25419.13 - 8.0.20-servicing.25419.13 - 8.0.20-servicing.25419.13 - 8.0.20-servicing.25419.13 - 8.0.20-servicing.25419.13 + 8.0.20-servicing.25420.2 + 8.0.20-servicing.25420.2 + 8.0.20-servicing.25420.2 + 8.0.20-servicing.25420.2 + 8.0.20-servicing.25420.2 8.0.20 From aee0708630bfe2a59c84ad70179e9402ba106b57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Aug 2025 19:00:38 +0000 Subject: [PATCH 16/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250821.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.20 -> To Version 8.0.20 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.20-servicing.25415.2 -> To Version 8.0.20-servicing.25420.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c0981ea1d04..79372e60ab03 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,8 +29,7 @@ - - + @@ -70,8 +69,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1b76b488221..e32a52c6e63d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5389367cfc96b37742df969ee8be968e8b3cadaa + 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5389367cfc96b37742df969ee8be968e8b3cadaa + 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5389367cfc96b37742df969ee8be968e8b3cadaa + 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5389367cfc96b37742df969ee8be968e8b3cadaa + 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6d0860a9836d13b717b2bf679798d6de0cd15129 + 7b95ca673ef08b7325429a3b675184b815482564 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0404d8006262..bd6a74415a38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.20-servicing.25415.2 + 8.0.20-servicing.25420.2 From 9cb96fc2b1039b112f825b74c5e91c2a627676a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Aug 2025 02:04:00 +0000 Subject: [PATCH 17/68] Update dependencies from https://github.com/dotnet/arcade build 20250822.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25422.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c265bc87de65..2c2fdde2a463 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de4a781d8cfc..aecfe6029620 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2886673a8e57..e526e6f3208d 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.25415.2 + 8.0.0-beta.25422.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25415.2 + 8.0.0-beta.25422.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 35c55ef5902d..1ee151ac29b8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25415.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25415.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25422.2" } } From 51f21307cb0e5db6382efaac869fc854464645fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Aug 2025 02:02:58 +0000 Subject: [PATCH 18/68] Update dependencies from https://github.com/dotnet/razor build 20250824.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25377.7 -> To Version 7.0.0-preview.25424.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index c265bc87de65..2c2fdde2a463 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de4a781d8cfc..cd68a36daa73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 diff --git a/eng/Versions.props b/eng/Versions.props index 2886673a8e57..ffe7151826c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,9 +181,9 @@ - 7.0.0-preview.25377.7 - 7.0.0-preview.25377.7 - 7.0.0-preview.25377.7 + 7.0.0-preview.25424.2 + 7.0.0-preview.25424.2 + 7.0.0-preview.25424.2 From be7dda4ee263257683da680152740657c6b640d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Aug 2025 02:03:19 +0000 Subject: [PATCH 19/68] Update dependencies from https://github.com/dotnet/msbuild build 20250826.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.39-servicing-25418-06 -> To Version 17.10.41-servicing-25426-05 --- NuGet.config | 5 ++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b97eb80e560d..f7a057f31193 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -23,6 +23,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f3c65938ccc..b9eb100750ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 77bc77a53cffc208304e422a3e9bd612177ea9d1 + 2560456f67197dad40c67f712d7d959ecfd61779 - + https://github.com/dotnet/msbuild - 77bc77a53cffc208304e422a3e9bd612177ea9d1 + 2560456f67197dad40c67f712d7d959ecfd61779 - + https://github.com/dotnet/msbuild - 77bc77a53cffc208304e422a3e9bd612177ea9d1 + 2560456f67197dad40c67f712d7d959ecfd61779 diff --git a/eng/Versions.props b/eng/Versions.props index 57123bc51be0..58b7d7916099 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.40 + 17.10.41 $(MicrosoftBuildPackageVersion) - + @@ -23,6 +23,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9eb100750ac..18a4aa991bd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 2560456f67197dad40c67f712d7d959ecfd61779 + 550b208c728df58f2259c554f05d6f1ab59ef7ee - + https://github.com/dotnet/msbuild - 2560456f67197dad40c67f712d7d959ecfd61779 + 550b208c728df58f2259c554f05d6f1ab59ef7ee - + https://github.com/dotnet/msbuild - 2560456f67197dad40c67f712d7d959ecfd61779 + 550b208c728df58f2259c554f05d6f1ab59ef7ee diff --git a/eng/Versions.props b/eng/Versions.props index 58b7d7916099..532719f4887a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.41 + 17.10.42 $(MicrosoftBuildPackageVersion) + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aecfe6029620..4934af72886d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e526e6f3208d..ecb4ea7ed906 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.25422.2 + 8.0.0-beta.25427.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25422.2 + 8.0.0-beta.25427.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 4217d6d8b148..7b9c58a90c5e 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -73,3 +76,4 @@ jobs: - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index b9247be1547b..21a346fbd6c7 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index a69631446da2..b63043da4b9f 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c48f95d93d91..97021335cfc4 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -72,3 +75,4 @@ jobs: - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 3ec997108107..4dde599add97 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4fb5643e5ded..ae06b26ea373 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/global.json b/global.json index 1ee151ac29b8..79de562355a1 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25422.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25427.4" } } From 1c879c3095ff71d1ad576b6657d5d8a34a45e969 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Aug 2025 02:02:52 +0000 Subject: [PATCH 22/68] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250828.6 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25414.2 -> To Version 8.0.0-alpha.1.25428.6 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index c265bc87de65..8bcdfecf1ead 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de4a781d8cfc..2e1a8365dc97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 4f43a405d713b6e9b2963ebbac4850eae1804982 + 0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f From bf39ec7b0d13384e68452a0cdf235cae35531317 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Sep 2025 09:37:23 -0700 Subject: [PATCH 23/68] Update branding to 8.0.318 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2886673a8e57..8adbe9ea6f25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.317 + 8.0.318 8.0.300 true From 6be7d7d7ae7e8b5df900cc8e8f53e5b80f4aa4a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Sep 2025 02:03:00 +0000 Subject: [PATCH 24/68] Update dependencies from https://github.com/dotnet/msbuild build 20250902.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.39-servicing-25418-06 -> To Version 17.10.43-servicing-25452-03 --- 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 cbb5988c3962..1014eb925795 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18a4aa991bd3..02c6ae9cafd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - 550b208c728df58f2259c554f05d6f1ab59ef7ee + e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 - + https://github.com/dotnet/msbuild - 550b208c728df58f2259c554f05d6f1ab59ef7ee + e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 - + https://github.com/dotnet/msbuild - 550b208c728df58f2259c554f05d6f1ab59ef7ee + e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 diff --git a/eng/Versions.props b/eng/Versions.props index 532719f4887a..c08844b52eee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.42 + 17.10.43 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba7a0f7ccb9..4db2f8ee7ec4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 3c231d88e02bd0e405eddec6ac636b130e73dc30 + c8db004daf42efc0c777899f7486b348314014ed - + https://github.com/dotnet/templating - 3c231d88e02bd0e405eddec6ac636b130e73dc30 + c8db004daf42efc0c777899f7486b348314014ed - + https://github.com/dotnet/templating - 3c231d88e02bd0e405eddec6ac636b130e73dc30 + c8db004daf42efc0c777899f7486b348314014ed diff --git a/eng/Versions.props b/eng/Versions.props index c6d20f76edce..c2fa5fb8a7d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.317 + 8.0.318 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.317-servicing.25417.8 + 8.0.318-servicing.25452.12 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 9b5fbf2c08ba616657ee89395462699fc90cdbf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Sep 2025 02:03:13 +0000 Subject: [PATCH 26/68] Update dependencies from https://github.com/dotnet/arcade build 20250905.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25455.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4934af72886d..aded8e29a8ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ecb4ea7ed906..fd77b62f0155 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.25427.4 + 8.0.0-beta.25455.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25427.4 + 8.0.0-beta.25455.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 79de562355a1..08607d5d0dc2 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25427.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25455.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25455.3" } } From 4ef9a22572cc3fae4da8df8fbbb967c7039574ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Sep 2025 02:03:32 +0000 Subject: [PATCH 27/68] Update dependencies from https://github.com/dotnet/templating build 20250907.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.317-servicing.25414.3 -> To Version 8.0.318-servicing.25457.6 --- 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 79c2534b2e12..4c9b46d198a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4db2f8ee7ec4..d0be82ebd6e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - c8db004daf42efc0c777899f7486b348314014ed + f00904569b801dfadb41e24ad5ea2ea1760ac1e4 - + https://github.com/dotnet/templating - c8db004daf42efc0c777899f7486b348314014ed + f00904569b801dfadb41e24ad5ea2ea1760ac1e4 - + https://github.com/dotnet/templating - c8db004daf42efc0c777899f7486b348314014ed + f00904569b801dfadb41e24ad5ea2ea1760ac1e4 diff --git a/eng/Versions.props b/eng/Versions.props index 38d1e2006fdf..b58153eac001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.318-servicing.25452.12 + 8.0.318-servicing.25457.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8305590575d8221091cfae9babeeed8b07e5a21a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Sep 2025 02:03:07 +0000 Subject: [PATCH 28/68] Update dependencies from https://github.com/dotnet/msbuild build 20250908.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.39-servicing-25418-06 -> To Version 17.10.45-servicing-25458-05 --- 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 1014eb925795..40ae5b9d7a46 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02c6ae9cafd8..6c52aa30e2f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b - + https://github.com/dotnet/msbuild - e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 + e71ee2d1051ea6c9c254d4be138fbb36be653fd8 - + https://github.com/dotnet/msbuild - e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 + e71ee2d1051ea6c9c254d4be138fbb36be653fd8 - + https://github.com/dotnet/msbuild - e6e7d624e9d89bb93b55ad0d373a4bb3981b9132 + e71ee2d1051ea6c9c254d4be138fbb36be653fd8 diff --git a/eng/Versions.props b/eng/Versions.props index 424d3f56a048..c84db7bdc672 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.43 + 17.10.45 $(MicrosoftBuildPackageVersion) - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6628e4583742..b34607b84776 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f + 55cc6bb942c12203e42ddb58f72cf5dbf1173eac From e9588300fabc9d2ff30c34dc6d1db87594704132 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 15 Sep 2025 10:08:53 -0700 Subject: [PATCH 30/68] Add back templating nuget feeds removed in the merge --- NuGet.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NuGet.config b/NuGet.config index 0c73df09f83a..4a43b58018e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,12 @@ + + + + + From ec678d0ced20a96f1b23ac8a51f0e51e1be8a15f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 15 Sep 2025 16:23:08 -0500 Subject: [PATCH 31/68] [8.0.3xx] detect .NET 10 RID-specific tools and provide a more actionable error (#50412) --- .../ToolConfigurationDeserializer.cs | 21 +++++++++++++------ .../CreateNewImageTests.cs | 8 +++---- .../DockerRegistryTests.cs | 4 ++-- .../DockerTestsCollection.cs | 4 +++- .../EndToEndTests.cs | 12 +++++------ 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs b/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs index 6f6b0274a4ac..acf397e6b5ed 100644 --- a/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs +++ b/src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs @@ -52,15 +52,24 @@ public static ToolConfiguration Deserialize(string pathToXml) throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand); } - if (dotNetCliTool.Commands[0].Runner != "dotnet") + // if there is no runner, this could be an entirely different _kind_ of tool. + if (string.IsNullOrWhiteSpace(dotNetCliTool.Commands[0].Runner)) { - throw new ToolConfigurationException( - string.Format( - CommonLocalizableStrings.ToolSettingsUnsupportedRunner, - dotNetCliTool.Commands[0].Name, - dotNetCliTool.Commands[0].Runner)); + if (warnings.Count != 0) + { + throw new ToolConfigurationException(warnings[0]); + } } + if (dotNetCliTool.Commands[0].Runner != "dotnet") + { + throw new ToolConfigurationException( + string.Format( + CommonLocalizableStrings.ToolSettingsUnsupportedRunner, + dotNetCliTool.Commands[0].Name, + dotNetCliTool.Commands[0].Runner)); + } + return new ToolConfiguration( dotNetCliTool.Commands[0].Name, dotNetCliTool.Commands[0].EntryPoint, diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index cf25db4b0309..66cdbdec9373 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput) _testOutput = testOutput; } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void CreateNewImage_Baseline() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -69,7 +69,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task) { return new(task.GeneratedContainerConfiguration); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void ParseContainerProperties_EndToEnd() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -132,7 +132,7 @@ public void ParseContainerProperties_EndToEnd() /// /// Creates a console app that outputs the environment variable added to the image. /// - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -215,7 +215,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() .And.HaveStdOut("Foo"); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage() { const string RootlessBase ="dotnet/rootlessbase"; diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index 2066e986a2b5..fad1e78587ff 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput) _loggerFactory = new TestLoggerFactory(testOutput); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task GetFromRegistry() { var loggerFactory = new TestLoggerFactory(_testOutput); @@ -37,7 +37,7 @@ public async Task GetFromRegistry() Assert.NotNull(downloadedImage); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task WriteToPrivateBasicRegistry() { ILogger logger = _loggerFactory.CreateLogger(nameof(WriteToPrivateBasicRegistry)); diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs index 9b3a6e25327c..90d188183a78 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs @@ -5,7 +5,9 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests; [CollectionDefinition("Docker tests")] #pragma warning disable CA1711 // Identifiers should not have incorrect suffix -public class DockerTestsCollection : ICollectionFixture +// TODO: skipped due to docker infra instability - need to use new ACR. +// See https://github.com/dotnet/sdk/issues/49300 +public class DockerTestsCollection // : ICollectionFixture #pragma warning restore CA1711 // Identifiers should not have incorrect suffix { // This class has no code, and is never created. Its purpose is simply diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index d78b88cc211b..aa31a4208d35 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -38,7 +38,7 @@ public void Dispose() _loggerFactory.Dispose(); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task ApiEndToEndWithRegistryPushAndPull() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull)); @@ -85,7 +85,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task ApiEndToEndWithLocalLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad)); @@ -126,7 +126,7 @@ public async Task ApiEndToEndWithLocalLoad() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task ApiEndToEndWithArchiveWritingAndLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad)); @@ -286,7 +286,7 @@ public async Task EndToEnd_MultiProjectSolution() commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'"); } - [DockerAvailableTheory()] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")] [InlineData("webapi", false)] [InlineData("webapi", true)] [InlineData("worker", false)] @@ -462,7 +462,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage privateNuGetAssets.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void EndToEnd_NoAPI_Console() { DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, "CreateNewImageTest")); @@ -548,7 +548,7 @@ public void EndToEnd_NoAPI_Console() [DockerSupportsArchInlineData("linux/386", "linux-x86", "/app", Skip = "There's no apphost for linux-x86 so we can't execute self-contained, and there's no .NET runtime base image for linux-x86 so we can't execute framework-dependent.")] [DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")] [DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")] - [DockerAvailableTheory] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir) { ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs)); From 18de2beb1da4476bd8c8af3c7cd8175e1983fdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Provazn=C3=ADk?= Date: Wed, 17 Sep 2025 14:57:42 +0200 Subject: [PATCH 32/68] update msbuild --- NuGet.config | 16 ++-------------- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06c093eb27f8..22a9b5652afd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,27 +13,18 @@ - - + - - - - - - - - @@ -45,6 +35,7 @@ + @@ -61,17 +52,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a67a46182aea..2946d3d49800 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 222749b48ecb0fe78f236ca9c61f6ff3b09cdc99 - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d diff --git a/eng/Versions.props b/eng/Versions.props index dd5592fb851e..7817e35a4027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.11.45 + 17.11.48 $(MicrosoftBuildPackageVersion) + + From e25c1b08f21fc767e1776e8947c03cc34d005f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Provazn=C3=ADk?= Date: Thu, 18 Sep 2025 18:12:21 +0200 Subject: [PATCH 34/68] readd to disabledPackageSources --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 22a9b5652afd..a9c0d9948e47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -54,6 +54,7 @@ + From 9e279b8b893723f22921db71ffe0976023dceb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Provazn=C3=ADk?= Date: Thu, 18 Sep 2025 18:32:59 +0200 Subject: [PATCH 35/68] disablepackagesource internaltransport feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index a9c0d9948e47..edeb1cdf9052 100644 --- a/NuGet.config +++ b/NuGet.config @@ -55,6 +55,7 @@ + From 9592c7fb1af9d3d30d72ef1a4685feafafd68bc4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 05:37:27 +0000 Subject: [PATCH 36/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250918.19 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25419.14 -> To Version 8.0.21-servicing.25468.19 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.20 -> To Version 8.0.21 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.20 -> To Version 8.0.21 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 16 +++------------- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06c093eb27f8..caca20656da1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -14,7 +14,6 @@ - @@ -22,19 +21,12 @@ - + - - - - - - - @@ -61,17 +53,15 @@ - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a67a46182aea..c23ff018a927 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ a2c45457884ceb15ab6e368c87571ce1e480fc93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://github.com/dotnet/emsdk - 222749b48ecb0fe78f236ca9c61f6ff3b09cdc99 + ea366a7a40bc588c70ef59376040130baf864c85 https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd5592fb851e..87c3be5a877b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.20 - 8.0.20-servicing.25419.14 - 8.0.20 + 8.0.21 + 8.0.21-servicing.25468.19 + 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.20 - 8.0.20-servicing.25419.14 + 8.0.21 + 8.0.21-servicing.25468.19 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.20 + 8.0.21 8.0.0 8.0.0 8.0.20 @@ -231,7 +231,7 @@ - 8.0.20 + 8.0.21 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 8843dd86e3e5dba2b1156cc36eef40392b02eaea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 10:04:26 +0000 Subject: [PATCH 37/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250919.1 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.20-servicing.25420.2 -> To Version 8.0.21-servicing.25469.1 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 8.0.20 -> To Version 8.0.21 --- NuGet.config | 2 ++ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index caca20656da1..79f01fbbedee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c23ff018a927..276ecd249d18 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 - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7b95ca673ef08b7325429a3b675184b815482564 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce 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 - c78f4a816c0c6a978a801a05a31dce9013e099e2 + 6f477f8a100df7e94f98fb30b61f04648ab24bce https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 87c3be5a877b..c611f5d62c8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.21 8.0.0 8.0.0 - 8.0.20 + 8.0.21 8.0.0 8.0.0 8.0.0 @@ -171,13 +171,13 @@ - 8.0.20 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20-servicing.25420.2 - 8.0.20 + 8.0.21 + 8.0.21-servicing.25469.1 + 8.0.21-servicing.25469.1 + 8.0.21-servicing.25469.1 + 8.0.21-servicing.25469.1 + 8.0.21-servicing.25469.1 + 8.0.21 From b5bfe0c34f30766c56821fcacfa0c44a30861fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Provazn=C3=ADk?= Date: Fri, 19 Sep 2025 18:22:47 +0200 Subject: [PATCH 38/68] overlay format's msbuild --- .../redist/targets/GenerateLayout.targets | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index eab01ef1445f..461a9ef073af 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -117,10 +117,27 @@ + + + + + + + + + + + + + Date: Fri, 19 Sep 2025 18:53:34 +0200 Subject: [PATCH 39/68] remove internal transport from nuget.config it should be handled by scripts --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index edeb1cdf9052..463688617b1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,6 @@ - @@ -55,7 +54,6 @@ - From 63cd0406dd660da0b6f4eeba8a5b9d3ee7ebb627 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 19:10:17 +0000 Subject: [PATCH 40/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250919.8 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25468.19 -> To Version 8.0.21-servicing.25469.8 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79f01fbbedee..dbce64d0d8d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 276ecd249d18..42f2ead5c6f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c611f5d62c8d..98775730018d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From e95f55e28a4401a61e551cb3184a2339d479e1a3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 20:38:27 +0000 Subject: [PATCH 41/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250919.9 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.20-servicing.25420.2 -> To Version 8.0.21-servicing.25469.9 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 8.0.20 -> To Version 8.0.21 --- 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 dbce64d0d8d8..f970c50f2018 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42f2ead5c6f7..a5fda6122393 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 - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f477f8a100df7e94f98fb30b61f04648ab24bce + 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 98775730018d..a78e7dc02f22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.21 - 8.0.21-servicing.25469.1 - 8.0.21-servicing.25469.1 - 8.0.21-servicing.25469.1 - 8.0.21-servicing.25469.1 - 8.0.21-servicing.25469.1 + 8.0.21-servicing.25469.9 + 8.0.21-servicing.25469.9 + 8.0.21-servicing.25469.9 + 8.0.21-servicing.25469.9 + 8.0.21-servicing.25469.9 8.0.21 From 380c86331deac644ec953d74735f0b0cc02a8832 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 23:37:13 +0000 Subject: [PATCH 42/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250919.16 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.21-servicing.25469.9 -> To Version 8.0.21-servicing.25469.16 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 8.0.21 -> To Version 8.0.21 --- 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 97927ef0338f..bc4c076bd7b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4defcd6fb334..2ba6af85abbf 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 - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 22b4865a3edf5b3bc369507e39a72bae5c5e13f1 + 3aec0b0ecb12a837b3168130c7b9f00b7469d355 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 217f6c3b7512..d64c6d7bba01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.21 - 8.0.21-servicing.25469.9 - 8.0.21-servicing.25469.9 - 8.0.21-servicing.25469.9 - 8.0.21-servicing.25469.9 - 8.0.21-servicing.25469.9 + 8.0.21-servicing.25469.16 + 8.0.21-servicing.25469.16 + 8.0.21-servicing.25469.16 + 8.0.21-servicing.25469.16 + 8.0.21-servicing.25469.16 8.0.21 From 2519ae60ad689c7076a83d7cc959472812e487c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Sep 2025 23:52:03 +0000 Subject: [PATCH 43/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250920.2 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.20 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25421.3 -> To Version 8.0.21-servicing.25470.2 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.20-servicing.25420.2 -> To Version 8.0.21-servicing.25465.5 (parent: Microsoft.WindowsDesktop.App.Ref) --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc4c076bd7b7..f1287337011a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,6 +28,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ba6af85abbf..c394561cdffe 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 - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2540f0e77435ce41beaadc94cc0d10ac9981b5a7 + 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7b95ca673ef08b7325429a3b675184b815482564 + e912353a4ce429ff5800121e4726667b4748cdf8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d64c6d7bba01..22b7a486bbed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.20-servicing.25420.2 + 8.0.21-servicing.25465.5 From a5417383015c72f4387d6865e04e3fbde54b4375 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Sep 2025 00:11:36 +0000 Subject: [PATCH 44/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250920.4 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25470.4 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index f1287337011a..df87798c6da2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c394561cdffe..b6f00d3cf68f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 22b7a486bbed..2ce40a70e137 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From 51e6ba143f21014495977c0ddf35c52c26c0760e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 17:59:55 +0000 Subject: [PATCH 45/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250922.1 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.20 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25421.3 -> To Version 8.0.21-servicing.25472.1 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.20-servicing.25420.2 -> To Version 8.0.21-servicing.25471.1 (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 df87798c6da2..a5a18821f02c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f00d3cf68f..ea09483d571b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a + 38da98ceeb48f57da927e81e13bab6b385375fdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a + 38da98ceeb48f57da927e81e13bab6b385375fdf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a + 38da98ceeb48f57da927e81e13bab6b385375fdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20574c2d4e49f4d8663f0ea4adbe66d72b4afe8a + 38da98ceeb48f57da927e81e13bab6b385375fdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e912353a4ce429ff5800121e4726667b4748cdf8 + e36d1e0b8833843b1c266159e9d01f46b2406d1c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2ce40a70e137..7becfcd9789a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.21-servicing.25465.5 + 8.0.21-servicing.25471.1 From 162f03eb9f491c3955944bfb8f40df212ceb5698 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 21:07:50 +0000 Subject: [PATCH 46/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250922.10 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25472.10 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.21 -> To Version 8.0.21 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5a18821f02c..b37af3d731e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea09483d571b..b4ab0c2e900d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,11 +49,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://github.com/dotnet/emsdk - ea366a7a40bc588c70ef59376040130baf864c85 + 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7becfcd9789a..bf6d50c55207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From edcf647b009b43bc123e7d6ddde7dedc4480fc38 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 06:43:45 +0000 Subject: [PATCH 47/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250922.33 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25472.33 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index b37af3d731e4..985b42b65144 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4ab0c2e900d..18e46039d87b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bf6d50c55207..8428589041ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From 804762bfd17d1528e6fe280a4159f02857760307 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 19:44:24 +0000 Subject: [PATCH 48/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250923.1 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.20 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25421.3 -> To Version 8.0.21-servicing.25473.1 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.20-servicing.25420.2 -> To Version 8.0.21-servicing.25473.3 (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 985b42b65144..c8974560d7d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18e46039d87b..6932b6750542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 38da98ceeb48f57da927e81e13bab6b385375fdf + cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 38da98ceeb48f57da927e81e13bab6b385375fdf + cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 38da98ceeb48f57da927e81e13bab6b385375fdf + cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 38da98ceeb48f57da927e81e13bab6b385375fdf + cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e36d1e0b8833843b1c266159e9d01f46b2406d1c + 04fbc38459ad73f42483220a0d95443a52e6ccfa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8428589041ac..a3de7f108cbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.21-servicing.25471.1 + 8.0.21-servicing.25473.3 From 9b470c63cb804b9c6d82709a698cdef752c5b76d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 20:37:22 +0000 Subject: [PATCH 49/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250923.4 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.21-servicing.25469.9 -> To Version 8.0.21-servicing.25473.4 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 8.0.21 -> To Version 8.0.21 --- 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 c8974560d7d2..e3d697ad616a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6932b6750542..dee5f1ed8aac 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 - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3aec0b0ecb12a837b3168130c7b9f00b7469d355 + fb64877f32935198415507f4037f7e97891e46be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a3de7f108cbc..d7325b9c8259 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.21 - 8.0.21-servicing.25469.16 - 8.0.21-servicing.25469.16 - 8.0.21-servicing.25469.16 - 8.0.21-servicing.25469.16 - 8.0.21-servicing.25469.16 + 8.0.21-servicing.25473.4 + 8.0.21-servicing.25473.4 + 8.0.21-servicing.25473.4 + 8.0.21-servicing.25473.4 + 8.0.21-servicing.25473.4 8.0.21 From 4506fd65575527d5e0f1aa195c87c03cd1eb7804 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 00:59:33 +0000 Subject: [PATCH 50/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250923.5 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.20 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.20-servicing.25421.3 -> To Version 8.0.21-servicing.25473.5 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3d697ad616a..497fdc500680 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dee5f1ed8aac..f85faca884fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,19 +230,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 + bd7fc99e4d73323dfec23b76704de99b12561a2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 + bd7fc99e4d73323dfec23b76704de99b12561a2e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 + bd7fc99e4d73323dfec23b76704de99b12561a2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cccd18c19f042b7c2f0b88c215c82caee8e9cdc9 + bd7fc99e4d73323dfec23b76704de99b12561a2e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From b8e06d0a673e51db0b2f392f4fa60d863491e076 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 08:05:31 +0000 Subject: [PATCH 51/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250923.21 On relative base path root Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25473.21 Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 497fdc500680..35a4413ee854 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f85faca884fd..8e815b0d1d8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d7325b9c8259..803d2b91ca06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From 8310c7bba881870d1c3a7a4fb3bb95fece9f958c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 17:21:21 +0000 Subject: [PATCH 52/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250924.1 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25473.5 -> To Version 8.0.21-servicing.25474.1 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.21-servicing.25473.3 -> To Version 8.0.21-servicing.25473.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 35a4413ee854..08c1cc8b7aea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e815b0d1d8c..0dbdb3f73b0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd7fc99e4d73323dfec23b76704de99b12561a2e + a56d486fe71e972d6cd8ba47e4af98e3d0552669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd7fc99e4d73323dfec23b76704de99b12561a2e + a56d486fe71e972d6cd8ba47e4af98e3d0552669 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd7fc99e4d73323dfec23b76704de99b12561a2e + a56d486fe71e972d6cd8ba47e4af98e3d0552669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd7fc99e4d73323dfec23b76704de99b12561a2e + a56d486fe71e972d6cd8ba47e4af98e3d0552669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 04fbc38459ad73f42483220a0d95443a52e6ccfa + 2dfa32c347c5377e5599885701cffbb36e5df555 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 803d2b91ca06..e3083ccff229 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.21-servicing.25473.3 + 8.0.21-servicing.25473.9 From e073167cc4677e819b032213559f9a15911bed98 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 19:30:24 +0000 Subject: [PATCH 53/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250924.4 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.21-servicing.25473.5 -> To Version 8.0.21-servicing.25474.4 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.21-servicing.25473.3 -> To Version 8.0.21-servicing.25474.4 (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 08c1cc8b7aea..6500b101a8c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dbdb3f73b0f..580427041d55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a56d486fe71e972d6cd8ba47e4af98e3d0552669 + 0794008c14ec52875b3bfccce63de08893a58d4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a56d486fe71e972d6cd8ba47e4af98e3d0552669 + 0794008c14ec52875b3bfccce63de08893a58d4e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a56d486fe71e972d6cd8ba47e4af98e3d0552669 + 0794008c14ec52875b3bfccce63de08893a58d4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a56d486fe71e972d6cd8ba47e4af98e3d0552669 + 0794008c14ec52875b3bfccce63de08893a58d4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2dfa32c347c5377e5599885701cffbb36e5df555 + cd697274d6103a2e6a19ad9ed377b38cce321733 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e3083ccff229..9f2a6d387ddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.21-servicing.25473.9 + 8.0.21-servicing.25474.4 From ac31327ecd22cd3cc53a112aee87ae8d177cc5d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 25 Sep 2025 00:25:07 +0000 Subject: [PATCH 54/68] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250924.11 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.21-servicing.25473.4 -> To Version 8.0.21-servicing.25474.11 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 8.0.21 -> To Version 8.0.21 --- 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 6500b101a8c9..896918f8eef3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 580427041d55..5edeb6de5320 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 - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fb64877f32935198415507f4037f7e97891e46be + d22808de86d348a80e2944341f39bbb7953e652c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9f2a6d387ddf..1e7adfcbc12d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.21 - 8.0.21-servicing.25473.4 - 8.0.21-servicing.25473.4 - 8.0.21-servicing.25473.4 - 8.0.21-servicing.25473.4 - 8.0.21-servicing.25473.4 + 8.0.21-servicing.25474.11 + 8.0.21-servicing.25474.11 + 8.0.21-servicing.25474.11 + 8.0.21-servicing.25474.11 + 8.0.21-servicing.25474.11 8.0.21 From 12014cbd276787e3c877b78f1287ff5f3caa3902 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 00:26:43 +0000 Subject: [PATCH 55/68] Merged PR 53793: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [82bc8158-ef88-4a27-3f7b-08dca299e604](https://maestro.dot.net/subscriptions?search=82bc8158-ef88-4a27-3f7b-08dca299e604) - **Build**: [20250925.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2801893) ([284753](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-runtime/build/284753)) - **Date Produced**: September 25, 2025 11:57:30 PM UTC - **Commit**: [362ab6669d55a75d51166f01b596c967c734ef4c](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC362ab6669d55a75d51166f01b596c967c734ef4c) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.21-servicing.25473.21 to 8.0.21-servicing.25475.13][1] - Microsoft.NET.HostModel - Microsoft.NETCore.Platforms - VS.Redist.Common.NetCore.SharedFramework.x64.8.0 - VS.Redist.Common.NetCore.TargetingPack.x64.8.0 - From [8.0.21 to 8.0.21][1] - Microsoft.NET.ILLink.Tasks - Microsoft.NETCore.App.Host.win-x64 - Microsoft.NETCore.App.Ref - Microsoft.NETCore.App.Runtime.win-x64 - Microsoft.NETCore.DotNetHostResolver [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1892887e28c6812653f864f30a621b190b83dd7c&targetVersion=GC362ab6669d55a75d51166f01b596c967c734ef4c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 896918f8eef3..d1486b29dd98 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5edeb6de5320..24667668be53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1e7adfcbc12d..8f27a32d944e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.21 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.21 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.21 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From 5f3d59063a562eead28898e0f415113f12638e99 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 03:22:31 +0000 Subject: [PATCH 56/68] Merged PR 53812: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.21-servicing.25474.4 to 8.0.21-servicing.25475.4 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [11ffd28b-eb51-469a-d3fb-08dca292067e](https://maestro.dot.net/subscriptions?search=11ffd28b-eb51-469a-d3fb-08dca292067e) - **Build**: [20250925.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2802232) ([284785](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-windowsdesktop/build/284785)) - **Date Produced**: September 26, 2025 3:05:19 AM UTC - **Commit**: [74e82c7a451f7350b264b64f8ea43fde017ec0af](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC74e82c7a451f7350b264b64f8ea43fde017ec0af) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.21 to 8.0.21][1] - Microsoft.WindowsDesktop.App.Ref - Microsoft.WindowsDesktop.App.Runtime.win-x64 - From [8.0.21-servicing.25474.4 to 8.0.21-servicing.25475.7][1] - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0794008c14ec52875b3bfccce63de08893a58d4e&targetVersion=GC74e82c7a451f7350b264b64f8ea43fde017ec0af&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e) --- 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 d1486b29dd98..0b5cbf8cc901 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24667668be53..4d77bdaa98b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0794008c14ec52875b3bfccce63de08893a58d4e + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0794008c14ec52875b3bfccce63de08893a58d4e + 74e82c7a451f7350b264b64f8ea43fde017ec0af https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0794008c14ec52875b3bfccce63de08893a58d4e + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0794008c14ec52875b3bfccce63de08893a58d4e + 74e82c7a451f7350b264b64f8ea43fde017ec0af - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - cd697274d6103a2e6a19ad9ed377b38cce321733 + 3ff72f664fd6e585b4b61fe5d79f33255aca5d6c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8f27a32d944e..0b7c0637c078 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.21-servicing.25474.4 + 8.0.21-servicing.25475.4 From 687ed4752722665dc134f116c6b6c90e3c97fa77 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 04:34:38 +0000 Subject: [PATCH 57/68] Merged PR 53821: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [1ab2aba6-b648-40a9-9fe8-08dca2920c50](https://maestro.dot.net/subscriptions?search=1ab2aba6-b648-40a9-9fe8-08dca2920c50) - **Build**: [20250925.15](https://dev.azure.com/dnceng/internal/_build/results?buildId=2802206) ([284796](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-aspnetcore/build/284796)) - **Date Produced**: September 26, 2025 4:13:56 AM UTC - **Commit**: [6254f5ca64f85b90327592dff67ea6b2ec0262c6](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GC6254f5ca64f85b90327592dff67ea6b2ec0262c6) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.21-servicing.25474.11 to 8.0.21-servicing.25475.15][1] - dotnet-dev-certs - dotnet-user-jwts - dotnet-user-secrets - Microsoft.AspNetCore.Analyzers - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.AspNetCore.Components.SdkAnalyzers - Microsoft.AspNetCore.DeveloperCertificates.XPlat - Microsoft.AspNetCore.Mvc.Analyzers - Microsoft.AspNetCore.Mvc.Api.Analyzers - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 - From [8.0.21 to 8.0.21][1] - Microsoft.AspNetCore.App.Ref - Microsoft.AspNetCore.App.Runtime.win-x64 - Microsoft.AspNetCore.Authorization - Microsoft.AspNetCore.Components.Web - Microsoft.AspNetCore.TestHost - Microsoft.Extensions.FileProviders.Embedded - Microsoft.Extensions.ObjectPool - Microsoft.JSInterop [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCd22808de86d348a80e2944341f39bbb7953e652c&targetVersion=GC6254f5ca64f85b90327592dff67ea6b2ec0262c6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50) --- 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 0b5cbf8cc901..b44d8be56dea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d77bdaa98b9..0d9e65d87f8f 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 - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d22808de86d348a80e2944341f39bbb7953e652c + 6254f5ca64f85b90327592dff67ea6b2ec0262c6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0b7c0637c078..48eab6b7f87b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.21 - 8.0.21-servicing.25474.11 - 8.0.21-servicing.25474.11 - 8.0.21-servicing.25474.11 - 8.0.21-servicing.25474.11 - 8.0.21-servicing.25474.11 + 8.0.21-servicing.25475.15 + 8.0.21-servicing.25475.15 + 8.0.21-servicing.25475.15 + 8.0.21-servicing.25475.15 + 8.0.21-servicing.25475.15 8.0.21 From 45959f522f92f47242e377a2ac7b252003ef0845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Oct 2025 02:02:00 +0000 Subject: [PATCH 58/68] Update dependencies from https://github.com/dotnet/templating build 20251010.17 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.415-servicing.25465.9 -> To Version 8.0.416-servicing.25510.17 Microsoft.TemplateEngine.Abstractions From Version 8.0.415 -> To Version 8.0.416 --- 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 ff5001727a6a..846777941abb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f23f95bd2b9..7a149fd8b902 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - fe0130d773314a195b81fb2eecfb14db9b847563 + c7dcdbe1601eeb907b974abeda3d97e840fa0a32 - + https://github.com/dotnet/templating - fe0130d773314a195b81fb2eecfb14db9b847563 + c7dcdbe1601eeb907b974abeda3d97e840fa0a32 - + https://github.com/dotnet/templating - fe0130d773314a195b81fb2eecfb14db9b847563 + c7dcdbe1601eeb907b974abeda3d97e840fa0a32 diff --git a/eng/Versions.props b/eng/Versions.props index 237196c900a3..2d1989ef5f5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.415 + 8.0.416 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.415-servicing.25465.9 + 8.0.416-servicing.25510.17 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4dee5f505f55b8fa36625d9959e80bf4229d3030 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 15 Oct 2025 08:05:14 -0700 Subject: [PATCH 59/68] Remove source-build job dependency (#51263) --- .vsts-ci.yml | 1 - .vsts-pr.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b133060fd6a4..321b5d933c20 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -290,7 +290,6 @@ extends: publishAssetsImmediately: true dependsOn: - Windows_NT - - Source_Build_Managed pool: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 90dce5755f94..de119f29b2d5 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -171,7 +171,6 @@ stages: publishAssetsImmediately: true dependsOn: - Windows_NT - - Source_Build_Managed pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 From 57f37ab4cd22de9d2dd63b38d969ed091f6fcc1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Oct 2025 18:42:18 +0000 Subject: [PATCH 60/68] Update dependencies from https://github.com/dotnet/arcade build 20251015.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25504.1 -> To Version 8.0.0-beta.25515.1 --- 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 6f23f95bd2b9..81f5ad70dd04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 + 6544413e02741855b701468aa8afc6cf8ca62c72 - + https://github.com/dotnet/arcade - 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 + 6544413e02741855b701468aa8afc6cf8ca62c72 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 237196c900a3..8bbedafbd7bc 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.25504.1 + 8.0.0-beta.25515.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25504.1 + 8.0.0-beta.25515.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 0b7ae0dd1ace..f0acd9807f7f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.120", + "dotnet": "8.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1" } } From 3b2acf07f7a00a40acfecbe38f8353688e681b5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Oct 2025 02:02:28 +0000 Subject: [PATCH 61/68] Update dependencies from https://github.com/dotnet/templating build 20251015.10 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.415-servicing.25465.9 -> To Version 8.0.416-servicing.25515.10 Microsoft.TemplateEngine.Abstractions From Version 8.0.415 -> To Version 8.0.416 --- 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 846777941abb..f217055204c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a149fd8b902..522a7a2f52d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - c7dcdbe1601eeb907b974abeda3d97e840fa0a32 + d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51 - + https://github.com/dotnet/templating - c7dcdbe1601eeb907b974abeda3d97e840fa0a32 + d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51 - + https://github.com/dotnet/templating - c7dcdbe1601eeb907b974abeda3d97e840fa0a32 + d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51 diff --git a/eng/Versions.props b/eng/Versions.props index 2d1989ef5f5f..c1828ab596ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.416-servicing.25510.17 + 8.0.416-servicing.25515.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 859e6fbcde94b7156ea2a2afd50f23e43984770e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Nov 2025 10:26:04 -0800 Subject: [PATCH 62/68] Update branding to 8.0.417 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 33615e6b1f7e..1ed9289c0b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.416 + 8.0.417 8.0.400 true From 58cfc4b2c165b3308102a77eba2eb6db2096ec1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Nov 2025 02:04:36 +0000 Subject: [PATCH 63/68] Update dependencies from https://github.com/dotnet/arcade build 20251105.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25555.2 --- NuGet.config | 9 --------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/publish-build-assets.yml | 5 +++++ .../templates-official/post-build/post-build.yml | 5 +++++ .../templates/job/publish-build-assets.yml | 5 +++++ eng/common/templates/post-build/post-build.yml | 5 +++++ global.json | 4 ++-- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05c66ee36bba..cf2d07e3a71c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,21 +13,17 @@ - - - - @@ -55,18 +50,14 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 883bb5e0579b..9076d364ddb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6544413e02741855b701468aa8afc6cf8ca62c72 + 048a8c0ba5b72234301a3605c424ee9f9ff99772 - + https://github.com/dotnet/arcade - 6544413e02741855b701468aa8afc6cf8ca62c72 + 048a8c0ba5b72234301a3605c424ee9f9ff99772 - + https://github.com/dotnet/arcade - 6544413e02741855b701468aa8afc6cf8ca62c72 + 048a8c0ba5b72234301a3605c424ee9f9ff99772 - + https://github.com/dotnet/arcade - 6544413e02741855b701468aa8afc6cf8ca62c72 + 048a8c0ba5b72234301a3605c424ee9f9ff99772 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1ed9289c0b37..67d2c1427a8a 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.25515.1 + 8.0.0-beta.25555.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25515.1 + 8.0.0-beta.25555.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index a99d79df863c..53109246d948 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -152,6 +152,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 817e2d80dea1..07837055ee30 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -271,6 +271,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1fcdcc9adc34..b4ece772c326 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -148,6 +148,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ea1785a8aa26..96ca06882384 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -267,6 +267,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/global.json b/global.json index f0acd9807f7f..01df768ddc8c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25555.2" } } From 62a0812285a9910b816bbbb2cd919a427dee8128 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:39:50 +0000 Subject: [PATCH 64/68] Initial plan From 0eb24cfde0a56a09c282d8821f888882e2201491 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:48:55 +0000 Subject: [PATCH 65/68] Backport VS Release Images fix from PR #51558 Co-authored-by: nagilson <23152278+nagilson@users.noreply.github.com> --- build/RunTestsOnHelix.cmd | 3 ++ eng/common/tools.ps1 | 14 ++++++--- eng/enable-preview-sdks.ps1 | 59 +++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 eng/enable-preview-sdks.ps1 diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index c414a43205f3..d1b051e42001 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -10,6 +10,9 @@ set PATH=%DOTNET_ROOT%;%PATH% set DOTNET_MULTILEVEL_LOOKUP=0 set TestFullMSBuild=%1 +REM Ensure Visual Studio instances allow preview SDKs +PowerShell -ExecutionPolicy ByPass -NoProfile -File "%HELIX_CORRELATION_PAYLOAD%\t\eng\enable-preview-sdks.ps1" + set TestExecutionDirectory=%CD%\testExecutionDirectory mkdir %TestExecutionDirectory% diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb048ad125a8..0213bf2c40f9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -545,19 +545,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/eng/enable-preview-sdks.ps1 b/eng/enable-preview-sdks.ps1 new file mode 100644 index 000000000000..d21466f856da --- /dev/null +++ b/eng/enable-preview-sdks.ps1 @@ -0,0 +1,59 @@ +param() + +. $PSScriptRoot\common\tools.ps1 + +try { + $vsInfo = LocateVisualStudio +} +catch { + Write-Host "LocateVisualStudio failed: $_" + return +} + +if ($null -eq $vsInfo) { + Write-Host "No Visual Studio instance detected; preview SDKs remain enabled by default." + return +} + +$vsId = $vsInfo.instanceId +$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] +$instanceDir = Join-Path $env:USERPROFILE "AppData\Local\Microsoft\VisualStudio\$vsMajorVersion.0_$vsId" + +Create-Directory $instanceDir + +$sdkFile = Join-Path $instanceDir 'sdk.txt' + +$desiredLine = 'UsePreviews=True' +$existingLines = @() + +if (Test-Path $sdkFile) { + $existingLines = @(Get-Content -Path $sdkFile -Encoding ASCII) +} + +# Determine how to place the UsePreviews flag based on existing content. +$replacementIndex = -1 +for ($i = 0; $i -lt $existingLines.Count; $i++) { + if ($existingLines[$i] -match '^UsePreviews=.*$') { + $replacementIndex = $i + break + } +} + +# Replace the existing line to enforce it as True +if ($replacementIndex -ge 0) { + $updatedLines = $existingLines + $updatedLines[$replacementIndex] = $desiredLine +} +elseif ($existingLines.Count -gt 0) { + # Write to the top of the file but keep the remaining portion (assumption: order does not matter to VS) + $updatedLines = @($desiredLine) + $existingLines +} +else { + # Write a whole new file + $updatedLines = @($desiredLine) +} + +Set-Content -Path $sdkFile -Value $updatedLines -Encoding ASCII + +Write-Host "Updated $sdkFile" +Get-Content -Path $sdkFile | ForEach-Object { Write-Host " $_" } From 1ea07c94b91dcd6f9a6df342ed3ce303c130dacc Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 15 Jul 2025 10:38:05 -0700 Subject: [PATCH 66/68] Disable docker tests --- .../CreateImageIndexTests.cs | 2 +- .../DockerRegistryTests.cs | 2 +- .../EndToEndTests.cs | 2 +- .../DockerDaemonTests.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs index 2615b2e178ee..2ceadd1e46b1 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs @@ -22,7 +22,7 @@ public CreateImageIndexTests(ITestOutputHelper testOutput) _testOutput = testOutput; } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task CreateImageIndex_Baseline() { DirectoryInfo newProjectDir = CreateNewProject(); diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index a992e06b4e8c..f6e075b6cf88 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput) _loggerFactory = new TestLoggerFactory(testOutput); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task GetFromRegistry() { var loggerFactory = new TestLoggerFactory(_testOutput); diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 6c2fb259c235..5a8de66416cf 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -1379,7 +1379,7 @@ public void EndToEndMultiArch_Labels() [DockerSupportsArchInlineData("linux/386", "linux-x86", "/app", Skip = "There's no apphost for linux-x86 so we can't execute self-contained, and there's no .NET runtime base image for linux-x86 so we can't execute framework-dependent.")] [DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")] [DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")] - [DockerAvailableTheory] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir) { ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs)); diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs index 5e4e951b5cb2..ee4211e1081c 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs @@ -25,7 +25,7 @@ public void Dispose() _loggerFactory.Dispose(); } - [DockerAvailableFact(skipPodman: true)] // podman is a local cli not meant for connecting to remote Docker daemons. + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502", skipPodman: true)] // podman is a local cli not meant for connecting to remote Docker daemons. public async Task Can_detect_when_no_daemon_is_running() { // mimic no daemon running by setting the DOCKER_HOST to a nonexistent socket try { From d93fa31cf8e12059994acacce21a7db4e31fe8fd Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 12 Nov 2025 20:03:13 -0500 Subject: [PATCH 67/68] Disable additional docker tests --- .../CreateNewImageTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index f6a8e0823117..6fbb08677a6b 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput) _testOutput = testOutput; } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void CreateNewImage_Baseline() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -69,7 +69,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task) { return new(task.GeneratedContainerConfiguration); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void ParseContainerProperties_EndToEnd() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -132,7 +132,7 @@ public void ParseContainerProperties_EndToEnd() /// /// Creates a console app that outputs the environment variable added to the image. /// - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -215,7 +215,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() .And.HaveStdOut("Foo"); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage() { const string RootlessBase ="dotnet/rootlessbase"; @@ -296,7 +296,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage() } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void CanOverrideContainerImageFormat() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); From 3e1d31f051d8eb265c95d9ed74dfdd48750e2ed6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 12 Nov 2025 20:18:16 -0500 Subject: [PATCH 68/68] Fix incorrect attribute --- .../DockerDaemonTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs index ee4211e1081c..6399051664b1 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs @@ -25,7 +25,7 @@ public void Dispose() _loggerFactory.Dispose(); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502", skipPodman: true)] // podman is a local cli not meant for connecting to remote Docker daemons. + [DockerAvailableFact(skipPodman: true, Skip = "https://github.com/dotnet/sdk/issues/49502")] // podman is a local cli not meant for connecting to remote Docker daemons. public async Task Can_detect_when_no_daemon_is_running() { // mimic no daemon running by setting the DOCKER_HOST to a nonexistent socket try {