From cba3c89f99bc6fda169f9334f0f716fa79ad6061 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 20:10:13 +0000 Subject: [PATCH 001/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250516.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.16 -> To Version 8.0.17 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.16-servicing.25217.3 -> To Version 8.0.17-servicing.25266.7 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5540102a6506..d3c07f83a131 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,11 +43,7 @@ - - - - - + @@ -97,11 +93,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index deda60418362..8385e93f6b9f 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 - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 462021402ec29f73243207f87efc6ba893019915 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 462021402ec29f73243207f87efc6ba893019915 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 462021402ec29f73243207f87efc6ba893019915 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 462021402ec29f73243207f87efc6ba893019915 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bf5c017e225debf2b431cf33d0e4fad03039032 + b69de2e98b14e30aeeb10668209dcf471fabc79a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 488e9ef44292..796f9074a36b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ - 8.0.16-servicing.25217.3 + 8.0.17-servicing.25266.7 From 3aa62250296f3ef48ad7aa2476c26c3c9bff4d17 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 20:56:13 +0000 Subject: [PATCH 002/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250516.9 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.16-servicing.25216.11 -> To Version 8.0.17-servicing.25266.9 --- NuGet.config | 12 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3c07f83a131..22ee7302ddcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,11 +16,7 @@ - - - - - + @@ -68,11 +64,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8385e93f6b9f..3c025b66200e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b69de2e98b14e30aeeb10668209dcf471fabc79a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef 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 - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 796f9074a36b..e30b58247dcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 8.0.16 8.0.0 8.0.0 - 8.0.16 + 8.0.17 8.0.0 8.0.0 8.0.0 @@ -165,13 +165,13 @@ - 8.0.16 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16 + 8.0.17 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17 From 8643efe1b69859adb786c7127ba72927350c4471 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 May 2025 21:38:38 +0000 Subject: [PATCH 003/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250517.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.17 -> To Version 8.0.17 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.7 -> To Version 8.0.17-servicing.25266.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 22ee7302ddcf..6b3fecd0c519 100644 --- a/NuGet.config +++ b/NuGet.config @@ -39,7 +39,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c025b66200e..be8b9147c41d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 462021402ec29f73243207f87efc6ba893019915 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 462021402ec29f73243207f87efc6ba893019915 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 462021402ec29f73243207f87efc6ba893019915 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 462021402ec29f73243207f87efc6ba893019915 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b69de2e98b14e30aeeb10668209dcf471fabc79a + 3385cf1d42f4e488140452369a247a4a16183ce4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e30b58247dcb..18db4189326b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ - 8.0.17-servicing.25266.7 + 8.0.17-servicing.25266.9 From 3bad8fd03d880469edf22640c64016c43f4b2b96 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 19 May 2025 20:42:13 +0000 Subject: [PATCH 004/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250516.2 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.16-servicing.25215.6 -> To Version 8.0.17-servicing.25266.2 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.16 -> To Version 8.0.17 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 21 +++------------------ eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b3fecd0c519..cb2d5735242e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,14 +3,7 @@ - - - - - - - - + @@ -29,11 +22,7 @@ - - - - - + @@ -78,11 +67,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be8b9147c41d..b4cfa1a6b856 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ a1aab400bac5186c2c21df38edb272f0d3123b4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://github.com/dotnet/emsdk - adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755 + 2b0cca8ad3a88e02fe0878139009ffffde071f1f https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 18db4189326b..92bfd42dbae6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ - 8.0.16 - 8.0.16-servicing.25215.6 - 8.0.16 + 8.0.17 + 8.0.17-servicing.25266.2 + 8.0.17 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.16 - 8.0.16-servicing.25215.6 + 8.0.17 + 8.0.17-servicing.25266.2 8.0.0 8.0.1 8.0.3 8.0.1 - 8.0.16 + 8.0.17 8.0.0 8.0.0 8.0.17 @@ -225,7 +225,7 @@ - 8.0.16 + 8.0.17 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From a0c97e1cfadd4e3ee4e30c90c9c3241098068131 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 02:10:06 +0000 Subject: [PATCH 005/293] Update dependencies from https://github.com/dotnet/msbuild build 20250527.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.27-servicing-25210-15 -> To Version 17.8.29-servicing-25277-01 --- NuGet.config | 53 +++-------------------------------------- eng/Version.Details.xml | 18 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 61 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5540102a6506..e22aceae6009 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,51 +3,25 @@ - - - - - - - - - - - - - - - - - - - + - - - - - + + - - - - - @@ -72,36 +46,15 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index deda60418362..1724012c2a3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e + + https://github.com/dotnet/msbuild + 2e2d89a923d83b7cf43ec543f725c1b206c912fe - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e + + https://github.com/dotnet/msbuild + 2e2d89a923d83b7cf43ec543f725c1b206c912fe - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e + + https://github.com/dotnet/msbuild + 2e2d89a923d83b7cf43ec543f725c1b206c912fe diff --git a/eng/Versions.props b/eng/Versions.props index 488e9ef44292..619f7dad38ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.27 + 17.8.29 $(MicrosoftBuildPackageVersion) - + @@ -18,6 +18,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1724012c2a3b..656216082688 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755 - + https://github.com/dotnet/msbuild - 2e2d89a923d83b7cf43ec543f725c1b206c912fe + d832838517d47acce1d644b872ae7599c655b4e2 - + https://github.com/dotnet/msbuild - 2e2d89a923d83b7cf43ec543f725c1b206c912fe + d832838517d47acce1d644b872ae7599c655b4e2 - + https://github.com/dotnet/msbuild - 2e2d89a923d83b7cf43ec543f725c1b206c912fe + d832838517d47acce1d644b872ae7599c655b4e2 diff --git a/eng/Versions.props b/eng/Versions.props index 619f7dad38ca..138b16e105bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.29 + 17.8.30 $(MicrosoftBuildPackageVersion) + + + + + + @@ -18,16 +24,18 @@ + + + - - - - + + + @@ -52,6 +60,9 @@ + + + @@ -60,9 +71,15 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b028b026fc58..d90bc1875053 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4f1dbfa9c076..82cda612a3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25264.2 + 8.0.0-beta.25310.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25264.2 + 8.0.0-beta.25310.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 76babd5acaf9..c1d4d016b412 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.116", + "dotnet": "8.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" } } From a01552db70111dfc19007b8fec01a3a937e6b9d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jun 2025 04:41:03 +0000 Subject: [PATCH 009/293] Update dependencies from https://github.com/dotnet/templating build 20250610.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25304.6 -> To Version 8.0.118-servicing.25310.1 --- NuGet.config | 27 ++++++++++++++++++++++----- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b43a055de5f..4388d6b12a68 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,18 @@ + + + + + + @@ -18,16 +24,18 @@ + + + - - - - - + + + + @@ -52,6 +60,9 @@ + + + @@ -60,9 +71,15 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b028b026fc58..7afd0c33e516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - f03f218ac2e4c2ffdca3bb6c210ce8214fb1a7ad + 2a22f253451da18c9a91ce33d11afbb13d8bfc32 - + https://github.com/dotnet/templating - f03f218ac2e4c2ffdca3bb6c210ce8214fb1a7ad + 2a22f253451da18c9a91ce33d11afbb13d8bfc32 - + https://github.com/dotnet/templating - f03f218ac2e4c2ffdca3bb6c210ce8214fb1a7ad + 2a22f253451da18c9a91ce33d11afbb13d8bfc32 diff --git a/eng/Versions.props b/eng/Versions.props index 4f1dbfa9c076..53b180ad9cf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25304.6 + 8.0.118-servicing.25310.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 9ac0e039da9c5614fea3ab09632bcae3758e0f1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jun 2025 11:19:38 +0000 Subject: [PATCH 010/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250610.29 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.6 -> To Version 9.0.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.6-servicing.25258.2 -> To Version 9.0.7-servicing.25304.2 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 18 +++-- eng/Version.Details.xml | 152 ++++++++++++++++++++-------------------- eng/Versions.props | 72 +++++++++---------- 3 files changed, 125 insertions(+), 117 deletions(-) diff --git a/NuGet.config b/NuGet.config index 14f0f4d4ddf5..4330e79f01b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,24 +24,29 @@ - + + + - - + + + + + @@ -68,15 +73,18 @@ + + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18268ded972a..8bad4708d0a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 0c96b36ccec4428bbfdeafae392bda49c1667361 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - e3d8e8ea6df192d864698cdd76984d74135d0d13 + b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://github.com/dotnet/emsdk - e3d8e8ea6df192d864698cdd76984d74135d0d13 + b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://github.com/dotnet/emsdk - e3d8e8ea6df192d864698cdd76984d74135d0d13 + b567cdb6b8b461de79f2a2536a22ca3a67f2f33e @@ -230,29 +230,29 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 @@ -619,9 +619,9 @@ ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f18cef4c7dd6..f2ba74102090 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,47 +86,47 @@ - 9.0.6 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 8.0.0-rc.1.23414.4 - 9.0.6-servicing.25266.13 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7-servicing.25310.29 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 2.1.0 - 9.0.6 + 9.0.7 8.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 8.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 8.0.4 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.6-servicing.25258.2 - 9.0.6 + 9.0.7-servicing.25304.2 + 9.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 8d788347bf6ce9bda10e22496efd7d0d0f1dc99e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 11:58:18 +0000 Subject: [PATCH 011/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250611.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.17-servicing.25266.9 -> To Version 8.0.18-servicing.25311.13 --- NuGet.config | 11 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index b83483d84ec7..82b8061ada51 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,10 +12,7 @@ - - - - + @@ -30,7 +27,6 @@ - @@ -61,10 +57,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 129e5ad85b71..78770347e60f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 3385cf1d42f4e488140452369a247a4a16183ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b 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 - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 222684d89dc0..3cc82238c5d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 8.0.17 8.0.0 8.0.0 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.0 @@ -165,13 +165,13 @@ - 8.0.17 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18 From 781cee3fc8e7b1756c20c50e36cad190d99a0490 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 11:58:43 +0000 Subject: [PATCH 012/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250611.17 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.17-servicing.25266.2 -> To Version 8.0.18-servicing.25311.17 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.17 -> To Version 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 15 +++----------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82b8061ada51..f8f83131f14c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,10 +3,7 @@ - - - - + @@ -20,10 +17,7 @@ - - - - + @@ -65,10 +59,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78770347e60f..8548dfaf3b53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 2a22f253451da18c9a91ce33d11afbb13d8bfc32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://github.com/dotnet/emsdk - 2b0cca8ad3a88e02fe0878139009ffffde071f1f + 976b101e5539557c20e2ac39885ac879531bcf82 https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -425,9 +425,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3cc82238c5d3..b3342576443e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ - 8.0.17 - 8.0.17-servicing.25266.2 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.17 + 8.0.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.17 - 8.0.17-servicing.25266.2 + 8.0.18 + 8.0.18-servicing.25311.17 8.0.0 8.0.1 8.0.3 8.0.1 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.18 @@ -77,7 +77,7 @@ 8.0.2 8.0.0 8.0.1 - 8.0.5 + 8.0.6 8.0.0 8.0.2 @@ -225,7 +225,7 @@ - 8.0.17 + 8.0.18 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 678dbee95386bcf045112fe2ea01dc9c281a2246 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 11:59:03 +0000 Subject: [PATCH 013/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250611.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.17 -> To Version 8.0.18 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8f83131f14c..c24a42070e1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,10 +23,7 @@ - - - - + @@ -62,10 +59,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8548dfaf3b53..584c9cf7db72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From be883bf24372eae68361870e901c0df8270aeaa4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 11:59:42 +0000 Subject: [PATCH 014/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250611.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.17 -> To Version 8.0.18 --- NuGet.config | 30 ++++++++++++++++++++++++++---- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f3eaa0ef4e9..15c3804925e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,28 +5,42 @@ + + + + + + + + + - + + + + + + - + @@ -53,24 +67,32 @@ + + + - + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e43bf1cd1b1..a5af27e6a74c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From 78c0601af2e2c6f75166b21697f63f681935a81f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 11:59:52 +0000 Subject: [PATCH 015/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250611.17 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.17-servicing.25266.2 -> To Version 8.0.18-servicing.25311.17 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.17 -> To Version 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 39 ++++++++++++++++++++++-------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 78cbfb57b79c..a76a5e25417e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,34 +4,40 @@ - + + + + + + + - - - - - - - + + + + + + + @@ -58,25 +64,28 @@ + + + - - - - - - + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a1fdbde31eb..4e761ea0c5e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ b3dccb6b175963a35fb3c713ddd7a32e06658a5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://github.com/dotnet/emsdk - 2b0cca8ad3a88e02fe0878139009ffffde071f1f + 976b101e5539557c20e2ac39885ac879531bcf82 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -425,9 +425,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e84ac84a5748..d2c1d0b0da6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.17 - 8.0.17-servicing.25266.2 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.17 + 8.0.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.17 - 8.0.17-servicing.25266.2 + 8.0.18 + 8.0.18-servicing.25311.17 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.17 @@ -80,7 +80,7 @@ 8.0.2 8.0.0 8.0.1 - 8.0.5 + 8.0.6 8.0.0 8.0.2 @@ -229,7 +229,7 @@ - 8.0.17 + 8.0.18 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 10be4aa86835f3575afbc8df50b8e95c56b28fcc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 12:00:06 +0000 Subject: [PATCH 016/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250611.17 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.17-servicing.25266.2 -> To Version 8.0.18-servicing.25311.17 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.17 -> To Version 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 15 +++----------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15c3804925e6..3cb3490b7256 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,7 @@ - - - - + @@ -28,10 +25,7 @@ - - - - + @@ -86,10 +80,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5af27e6a74c..d1c7d989eef9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://github.com/dotnet/emsdk - 2b0cca8ad3a88e02fe0878139009ffffde071f1f + 976b101e5539557c20e2ac39885ac879531bcf82 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -425,9 +425,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 36a7b416d255..e02f6d16c580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.17 - 8.0.17-servicing.25266.2 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.17 + 8.0.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.17 - 8.0.17-servicing.25266.2 + 8.0.18 + 8.0.18-servicing.25311.17 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.17 @@ -80,7 +80,7 @@ 8.0.2 8.0.0 8.0.1 - 8.0.5 + 8.0.6 8.0.0 8.0.2 @@ -229,7 +229,7 @@ - 8.0.17 + 8.0.18 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 8c92a35873cecaf47fe795e47fe1fb5ab343f08c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 12:00:17 +0000 Subject: [PATCH 017/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250611.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.17-servicing.25266.9 -> To Version 8.0.18-servicing.25311.13 --- NuGet.config | 10 ++---- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index a76a5e25417e..7f8a0c482535 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,7 @@ - - - - + @@ -64,10 +61,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e761ea0c5e2..818213ac3b18 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 - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 3385cf1d42f4e488140452369a247a4a16183ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b 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 - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2c1d0b0da6b..5bfafda7d612 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.18 8.0.0 8.0.0 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.17 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18 From d16e3dcd0e50053fdb73835e1d069836c8566266 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 12:00:28 +0000 Subject: [PATCH 018/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250611.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.17-servicing.25266.9 -> To Version 8.0.18-servicing.25311.13 --- NuGet.config | 10 ++---- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3cb3490b7256..76024450f5cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,7 @@ - - - - + @@ -61,10 +58,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1c7d989eef9..5b6c8388e67e 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 - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 3385cf1d42f4e488140452369a247a4a16183ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b 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 - fa4d80b76c2431a825be026f6bbabca63e1f42ef + 1988c37e68bc83b1a0d3d230276a1ae8f89da38b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e02f6d16c580..23bc146af21f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.18 8.0.0 8.0.0 - 8.0.17 + 8.0.18 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.17 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17 + 8.0.18 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18-servicing.25311.13 + 8.0.18 From 6f97a1f003f2abbf76ff23d9bfb7fec165d6fd83 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 12:00:41 +0000 Subject: [PATCH 019/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250611.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.17 -> To Version 8.0.18 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7f8a0c482535..0d79ff40c883 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,10 +31,7 @@ - - - - + @@ -77,10 +74,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 818213ac3b18..10bd7ef56122 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + a6f159eb263aa0b45be92800081f53cac9684dd2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From 40539714d972cfd85abb71b8fcf518cec976c202 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 12:00:49 +0000 Subject: [PATCH 020/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250611.18 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.6 -> To Version 9.0.7 --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4330e79f01b4..a1828bd4a7ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,7 +36,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bad4708d0a6..fa8ea942d0e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f2ba74102090..ce535373914e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.7 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 9.0.7 @@ -98,8 +98,8 @@ 9.0.7 9.0.7 8.0.0-rc.1.23414.4 - 9.0.7-servicing.25310.29 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 9.0.7 From 1069a38c335121ff70ab0ef4098746b95b3fa97b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 17:44:02 +0000 Subject: [PATCH 021/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250611.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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.6-servicing.25267.1 -> To Version 9.0.7-servicing.25311.15 --- NuGet.config | 8 ++--- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 53 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index a1828bd4a7ee..1398b4902309 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,9 +27,7 @@ - - - + @@ -73,9 +71,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa8ea942d0e0..851f9a24a276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 620a20376852ae35038cd4251552ea8425f6cfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa @@ -343,21 +343,21 @@ 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 + 3720a89385f75c4a2edd7eb6d1d449c856670faa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ce535373914e..0d38bdc47f80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,19 +215,19 @@ - 9.0.6 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 - 9.0.6-servicing.25267.1 + 9.0.7 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 + 9.0.7-servicing.25311.15 From b3586f899d2ae7cd6667df36a975794c0aad3792 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 17:44:06 +0000 Subject: [PATCH 022/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250610.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.6 -> To Version 9.0.7 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.6-rtm.25267.1 -> To Version 9.0.6-rtm.25269.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 8 ++------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index a1828bd4a7ee..1ca7d08718b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -44,9 +44,7 @@ - - - + @@ -83,9 +81,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa8ea942d0e0..936ac6deba14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,26 +254,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32 + bfa836ee9a9d4f1857de6f3d2f104d72be4b368a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32 + bfa836ee9a9d4f1857de6f3d2f104d72be4b368a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32 + bfa836ee9a9d4f1857de6f3d2f104d72be4b368a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c7cc0b3d8bd0ee206eb06ba1ad7e201218fc3d32 + bfa836ee9a9d4f1857de6f3d2f104d72be4b368a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 620a20376852ae35038cd4251552ea8425f6cfe6 + 5a4e2343a2986271c9eec97862c2db4cdd15b08e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -394,9 +394,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 620a20376852ae35038cd4251552ea8425f6cfe6 + 5a4e2343a2986271c9eec97862c2db4cdd15b08e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ce535373914e..90076bc7b4f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,10 +130,10 @@ - 9.0.6-servicing.25267.2 - 9.0.6-servicing.25267.2 - 9.0.6 - 9.0.6 + 9.0.7-servicing.25310.2 + 9.0.7-servicing.25310.2 + 9.0.7 + 9.0.7 @@ -237,8 +237,8 @@ - 9.0.6-rtm.25267.1 - 9.0.6-rtm.25267.1 + 9.0.6-rtm.25269.2 + 9.0.6-rtm.25269.2 From 35572dc529e72e36700b680d86bf2f2a109fc5a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jun 2025 18:50:48 +0000 Subject: [PATCH 023/293] Update dependencies from https://github.com/dotnet/format build 20250612.1 dotnet-format From Version 8.1.617506 -> To Version 8.1.631201 --- NuGet.config | 3 +-- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b83483d84ec7..a7752adfcd5c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -30,7 +30,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 129e5ad85b71..e622d1ac6260 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 - + https://github.com/dotnet/format - 664013fbe5e68941be81f9a710058db028da788f + 7332bce179c114a5490773119053f561faf58a33 diff --git a/eng/Versions.props b/eng/Versions.props index 222684d89dc0..f0bbdbe5063c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 8.1.617506 + 8.1.631201 From 8995f9e8e244c7b639c376f067199f1851ee3af0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Jun 2025 19:23:23 +0000 Subject: [PATCH 024/293] Update dependencies from https://github.com/dotnet/format build 20250612.5 dotnet-format From Version 8.1.617506 -> To Version 8.1.631205 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index a7752adfcd5c..d0890c99bfdd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e622d1ac6260..a5df3c43e399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 - + https://github.com/dotnet/format - 7332bce179c114a5490773119053f561faf58a33 + a9a546ec24f105c72492bee017fec902ee99dc3e diff --git a/eng/Versions.props b/eng/Versions.props index f0bbdbe5063c..afe71ca826e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 8.1.631201 + 8.1.631205 From 69cad879df9b86c2be5bf3c909f062b8fe7dd91e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jun 2025 01:43:35 +0000 Subject: [PATCH 025/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250612.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.7 -> To Version 9.0.7 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.6-rtm.25269.2 -> To Version 9.0.7-rtm.25312.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52559f5a0ae7..27c695f8daea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -42,7 +42,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc4ae83d60d7..a2106acb2e2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bfa836ee9a9d4f1857de6f3d2f104d72be4b368a + 4c31f574f88e395456cec657c7ccb90fe32e0c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bfa836ee9a9d4f1857de6f3d2f104d72be4b368a + 4c31f574f88e395456cec657c7ccb90fe32e0c56 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bfa836ee9a9d4f1857de6f3d2f104d72be4b368a + 4c31f574f88e395456cec657c7ccb90fe32e0c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bfa836ee9a9d4f1857de6f3d2f104d72be4b368a + 4c31f574f88e395456cec657c7ccb90fe32e0c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a4e2343a2986271c9eec97862c2db4cdd15b08e + 2f2fe4899318aaf1a6bfab64a90e142addd46487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f0fc61ead7dc20cbce05eb81a42089e28c90c409 + ef2a3107f7abdeb18ac152197e4e6f37f0625f76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a4e2343a2986271c9eec97862c2db4cdd15b08e + 2f2fe4899318aaf1a6bfab64a90e142addd46487 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index e698d00eaaf8..ae9bc8dc8a9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.6-servicing.25266.5 + 9.0.7-servicing.25312.5 @@ -130,8 +130,8 @@ - 9.0.7-servicing.25310.2 - 9.0.7-servicing.25310.2 + 9.0.7-servicing.25312.1 + 9.0.7-servicing.25312.1 9.0.7 9.0.7 @@ -237,8 +237,8 @@ - 9.0.6-rtm.25269.2 - 9.0.6-rtm.25269.2 + 9.0.7-rtm.25312.2 + 9.0.7-rtm.25312.2 From 25fd74b614cd279db54c1b313733bfe2c7267dcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Jun 2025 04:36:45 +0000 Subject: [PATCH 026/293] Update dependencies from https://github.com/dotnet/msbuild build 20250613.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.30-servicing-25278-04 -> To Version 17.8.31-servicing-25313-09 --- 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 d0890c99bfdd..38c57c0f7e2d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5df3c43e399..98bac1dcd31f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - + https://github.com/dotnet/msbuild - d832838517d47acce1d644b872ae7599c655b4e2 + af11d4f253ee5c813bfd4f9d5902772638014572 - + https://github.com/dotnet/msbuild - d832838517d47acce1d644b872ae7599c655b4e2 + af11d4f253ee5c813bfd4f9d5902772638014572 - + https://github.com/dotnet/msbuild - d832838517d47acce1d644b872ae7599c655b4e2 + af11d4f253ee5c813bfd4f9d5902772638014572 diff --git a/eng/Versions.props b/eng/Versions.props index afe71ca826e3..64e525bfc034 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.30 + 17.8.31 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98bac1dcd31f..5b147abb0e05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -59,11 +59,11 @@ https://github.com/dotnet/msbuild af11d4f253ee5c813bfd4f9d5902772638014572 - + https://github.com/dotnet/msbuild af11d4f253ee5c813bfd4f9d5902772638014572 - + https://github.com/dotnet/msbuild af11d4f253ee5c813bfd4f9d5902772638014572 diff --git a/eng/Versions.props b/eng/Versions.props index 64e525bfc034..cb234f67a6e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,7 +130,7 @@ $([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim()) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.8.31-servicing-25313-09 + 17.8.31-servicing-25313-13 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) From 5805f09aa5b229d3073d3fb380cd56488d6051d1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jun 2025 13:48:51 +0000 Subject: [PATCH 028/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250613.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25313.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 76024450f5cd..22ea7f99477f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,7 +31,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b6c8388e67e..58ef733cca1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3385cf1d42f4e488140452369a247a4a16183ce4 + c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 23bc146af21f..55bc40f1030f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.17-servicing.25266.9 + 8.0.18-servicing.25313.2 From af4d6aa0539234f88d6613f3c1dc50e475f999ba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jun 2025 13:48:52 +0000 Subject: [PATCH 029/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250613.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25313.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 6 +++--- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index d72909150176..26546067ff7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c53dbc9911b..6143e6523504 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3385cf1d42f4e488140452369a247a4a16183ce4 + c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7f0b7f03c411..8a4e5d0b9c53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ - 8.0.17-servicing.25266.9 + 8.0.18-servicing.25313.2 From 47c99b4652a5abf709fcdb51bd6bfda06bbaefc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Jun 2025 13:48:56 +0000 Subject: [PATCH 030/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250613.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25313.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 0d79ff40c883..ebddc6525042 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,7 +31,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10bd7ef56122..b66150630eb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6f159eb263aa0b45be92800081f53cac9684dd2 + 0bec0d55c9b799a612a838e8887d710bbeed487b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3385cf1d42f4e488140452369a247a4a16183ce4 + c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5bfafda7d612..7951d63469ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.17-servicing.25266.9 + 8.0.18-servicing.25313.2 From 28d2fa65f2978826502b954f30654b0cd362c9c6 Mon Sep 17 00:00:00 2001 From: "Jason Di (BEYONDSOFT CONSULTING INC)" Date: Fri, 13 Jun 2025 18:30:38 +0000 Subject: [PATCH 031/293] Merged PR 50858: Merge release/8.0.3xx to internal/release/8.0.3xx #### AI description (iteration 1) #### PR Classification This pull request merges branch release/8.0.3xx into internal/release/8.0.3xx to perform code cleanup and update dependency and certificate configurations. #### PR Summary The merge removes numerous obsolete scripts and configuration files while aligning dependency versions and certificate data across the codebase. - Removed legacy files (e.g., PowerShell, shell scripts, patches, and config files) from folders like `src/arcade/eng/common/` and its subdirectories. - Updated dependency versions and corresponding SHA values in configuration files such as `eng/Version.Details.xml`, `eng/Versions.props`, and `global.json`, with additional NuGet source updates in `NuGet.config`. - Added a new certificate in `Layout/redist/trustedroots/timestampctl.pem` and updated associated certificate fingerprints in test files under `src/Tests/trustedroots.Tests/`. --- NuGet.config | 2 + eng/Version.Details.xml | 44 +-- eng/Versions.props | 16 +- global.json | 6 +- .../redist/trustedroots/timestampctl.pem | 35 +++ .../GivenCodeSigningCtlFile.cs | 1 + .../GivenTimestampingCtlFile.cs | 3 + .../build-configuration.json | 4 - .../eng/common/PSScriptAnalyzerSettings.psd1 | 11 - src/arcade/eng/common/README.md | 28 -- .../eng/common/cross/arm/tizen/tizen.patch | 9 - .../eng/common/cross/armel/tizen/tizen.patch | 9 - .../eng/common/cross/x64/tizen/tizen.patch | 9 - .../eng/common/cross/x86/tizen/tizen.patch | 9 - src/arcade/eng/common/dotnet-install.cmd | 2 - src/arcade/eng/common/dotnet-install.ps1 | 28 -- .../common/enable-cross-org-publishing.ps1 | 13 - src/arcade/eng/common/generate-locproject.ps1 | 189 ------------- src/arcade/eng/common/generate-sbom-prep.ps1 | 29 -- src/arcade/eng/common/init-tools-native.cmd | 3 - src/arcade/eng/common/init-tools-native.ps1 | 203 -------------- src/arcade/eng/common/init-tools-native.sh | 238 ---------------- .../eng/common/internal-feed-operations.ps1 | 132 --------- .../eng/common/internal-feed-operations.sh | 141 ---------- src/arcade/eng/common/internal/NuGet.config | 7 - .../common/loc/P22DotNetHtmlLocalization.lss | 29 -- src/arcade/eng/common/msbuild.ps1 | 28 -- src/arcade/eng/common/msbuild.sh | 58 ---- .../eng/common/native/common-library.sh | 172 ------------ .../eng/common/native/install-cmake-test.sh | 117 -------- src/arcade/eng/common/native/install-cmake.sh | 117 -------- src/arcade/eng/common/native/install-tool.ps1 | 132 --------- .../eng/common/pipeline-logging-functions.ps1 | 260 ------------------ .../eng/common/pipeline-logging-functions.sh | 206 -------------- src/arcade/eng/common/retain-build.ps1 | 45 --- .../eng/common/sdl/configure-sdl-tool.ps1 | 130 --------- .../common/sdl/extract-artifact-archives.ps1 | 63 ----- .../common/sdl/extract-artifact-packages.ps1 | 82 ------ src/arcade/eng/common/sdl/packages.config | 4 - src/arcade/eng/common/sdl/run-sdl.ps1 | 49 ---- .../variables/pool-providers.yml | 45 --- .../variables/sdl-variables.yml | 7 - 42 files changed, 74 insertions(+), 2641 deletions(-) delete mode 100644 src/arcade/eng/common/BuildConfiguration/build-configuration.json delete mode 100644 src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 delete mode 100644 src/arcade/eng/common/README.md delete mode 100644 src/arcade/eng/common/cross/arm/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/armel/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/x64/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/x86/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/dotnet-install.cmd delete mode 100644 src/arcade/eng/common/dotnet-install.ps1 delete mode 100644 src/arcade/eng/common/enable-cross-org-publishing.ps1 delete mode 100644 src/arcade/eng/common/generate-locproject.ps1 delete mode 100644 src/arcade/eng/common/generate-sbom-prep.ps1 delete mode 100644 src/arcade/eng/common/init-tools-native.cmd delete mode 100644 src/arcade/eng/common/init-tools-native.ps1 delete mode 100644 src/arcade/eng/common/init-tools-native.sh delete mode 100644 src/arcade/eng/common/internal-feed-operations.ps1 delete mode 100644 src/arcade/eng/common/internal-feed-operations.sh delete mode 100644 src/arcade/eng/common/internal/NuGet.config delete mode 100644 src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss delete mode 100644 src/arcade/eng/common/msbuild.ps1 delete mode 100644 src/arcade/eng/common/msbuild.sh delete mode 100644 src/arcade/eng/common/native/common-library.sh delete mode 100644 src/arcade/eng/common/native/install-cmake-test.sh delete mode 100644 src/arcade/eng/common/native/install-cmake.sh delete mode 100644 src/arcade/eng/common/native/install-tool.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.sh delete mode 100644 src/arcade/eng/common/retain-build.ps1 delete mode 100644 src/arcade/eng/common/sdl/configure-sdl-tool.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-archives.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-packages.ps1 delete mode 100644 src/arcade/eng/common/sdl/packages.config delete mode 100644 src/arcade/eng/common/sdl/run-sdl.ps1 delete mode 100644 src/arcade/eng/common/templates-official/variables/pool-providers.yml delete mode 100644 src/arcade/eng/common/templates-official/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index 22ea7f99477f..0abfbbc6ab01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -25,6 +26,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58ef733cca1b..e98a3e8b9178 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa + 7994f94ec4071d4803af1b4f75f4ba964d3391f2 - + https://github.com/dotnet/templating - 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa + 7994f94ec4071d4803af1b4f75f4ba964d3391f2 - + https://github.com/dotnet/templating - 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa + 7994f94ec4071d4803af1b4f75f4ba964d3391f2 @@ -77,9 +77,9 @@ 80c165644db640d0f309affe0daa281c7e17b939 - - https://dev.azure.com/dnceng/internal/_git/dotnet-format - 6512c545de4e74d1cafcf305430185287c19a549 + + https://github.com/dotnet/format + c7e5d39bdc5e4a2fedd4fb4f46e35a9843ddff4a @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 1988c37e68bc83b1a0d3d230276a1ae8f89da38b - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c + cee2d057118e3ad3c58a72a23271ad88b87d4d4d @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 55bc40f1030f..0554e4983a2c 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.25264.2 + 8.0.0-beta.25310.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -115,7 +115,7 @@ - 8.3.626605 + 8.3.631206 @@ -141,13 +141,13 @@ - 8.0.314 + 8.0.315 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.314-servicing.25266.2 + 8.0.315-servicing.25311.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) @@ -179,9 +179,9 @@ - 7.0.0-preview.25257.2 - 7.0.0-preview.25257.2 - 7.0.0-preview.25257.2 + 7.0.0-preview.25275.6 + 7.0.0-preview.25275.6 + 7.0.0-preview.25275.6 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25264.2 + 8.0.0-beta.25310.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 76babd5acaf9..c1d4d016b412 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.116", + "dotnet": "8.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" } } diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index e11dc73a8817..7bb520e98647 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9257,6 +9257,41 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib oTM3VxKKcl+Yqg== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF0TCCA7mgAwIBAgIJAOOiocT+gaENMA0GCSqGSIb3DQEBDAUAMIGFMQswCQYD +VQQGEwJKUDEmMCQGA1UEChMdU0VDT00gVHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4x +MDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAy +MzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAwMTA0MDc4MTAeFw0yMzAxMjUwODMzNTla +Fw00ODAxMDEwODMzNTlaMIGFMQswCQYDVQQGEwJKUDEmMCQGA1UEChMdU0VDT00g +VHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4xMDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50 +IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAyMzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAw +MTA0MDc4MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKyMB9lGvBCA +99HZrvIqzl/AQy8EFLvxSLWA+13ZonAeMUhuSPxzfhwkuDs+vWXeKJSFQj0Xv0jf +Hc7n3e2Mjf26vP7IrCc8MWr8VFJ4LMM/TaTO+N5DwUBUY0bMStZhTakJF9jrultP +2N44hkoZTMfIKY07LsWkCj9NVteVHmWfrUzdd73Mf7847d4melxs6RL/8mbhcf0u +9oSZf6lRVJ5MjdJWMBOcWSrn6XwB6b0OzfAmy3Sopq508740UkFb55sKslKw19xa +lw5Djx/HLXcMpWlhlrDJgg30MLFSN8lFEqM9gD1fkLSpgL8O9QMzlbuRYiAOOiKJ +rzdGZOa+2lzxCPb8Yx6P0przBmPVpPm8qorYWO1sbtinx7B58poFVT5YyTzuWiw+ +smj5E0Dd1SRu7gR1PDJshuP1qHoy7KuffdqErctLEVak7mLCFJAlzPzjE3MdBH5I +pYJ/m2zOKI/S9a7RgM1iugOBsjuIRiNMQcNhFyMX5u+vA4mugQtTt9/pn/6rF1uP +t3rv/D4WJwFaBN0vBkRgWYqHqAZVavScRV4lfYAFan5nmLui9bZB8ufI+NBv1vkA +FuO3Lw1q/ob314Ae9bi9iu35pGSAYHEazp+Zbxsk5XGTGkk2W+gNiFgJJEp8YG+2 +OcLWcy6mZefRnQF3rPDs6Fe3qC77YzC5AgMBAAGjQjBAMB0GA1UdDgQWBBQB3bEk +MIksyAODXhCucR5J8u5LBzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQwFAAOCAgEAoyB4wkvZg/bXHSyvp5g/H+0AGKBsGNOGUpE3 +GF2ZC3lnw2KB8NFK2hkLfehaPl3mPGIC7cJdCR8lpAnCAtBuSDyhTEx+FUyM9cJz +x0Vefz8xEN5f4tYOmQl5QGpRNMkQZKbj9xRHbeDOWGD5lcXC/7NXIOhgqf1uBEWH +Kb6qz6fSsrC/JNSSEuyBE9h2l9A64G7CwhmZX9bjLBfTaMGZHB4iVjXEO7ZpoYYA +6yw8Y16vEn4IsHbJ62aBSvqefCKGWZGgu2BLNBfxdmLmd5IcHFaZPatcnusbE02+ +RmS94w28Ujb4MXGiPP0oHeiirO/a6ARKvep/6cBsPMxJzDpFXTUzXbnSFkHzLxCO +fCuWIVsO9VBkvRzvGzLhb7GwfqO0FGqhXZbZ/2d9+Bi2FOJ1yBI7xfdyUjygxROB +L3WRCWNqO4ZiTCC3t0sq40a9Fs4k07HNjp9vSVszNChBAhBXCOtCbuvUWGKNj1/t +xsCzmpgsBmlyOt+wTJhj+Rx5v0j+YzxJYbjKJVZ8It+/jkzwdwoRoF9UqrKzrX+o ++9+NAhnONLINiuw9ZbCt3b0f6oCi92u6QoI6WVH/ZW5IdfewXQbDuX16BJYSZ7Yt +2eSQnr+vfogU+t0XpB1s2QUEC03y6mcxBevoILtv/023F8U2/5Mukg0vtjwR1N4J +7abHqTo= +-----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu diff --git a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs index 41483b5c8e9c..f120e3770116 100644 --- a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs @@ -26,6 +26,7 @@ public GivenCodeSigningCtlFile() [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("552f7bdcf1a7af9e6ce672017f4f12abf77240c78e761ac203d1d9d20ac89988")] // CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("7353b6d6c2d6da4247773f3f07d075decb5134212bead0928ef1f46115260941")] // CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US [InlineData("7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf")] // CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("7b9d553e1c92cb6e8803e137f4f287d4363757f5d44b37d52f9fca22fb97df86")] // CN=GlobalSign Code Signing Root R45, O=GlobalSign nv-sa, C=BE diff --git a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs index 7d2f255c9479..43a5ef2bdf1e 100644 --- a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs @@ -23,13 +23,16 @@ public GivenTimestampingCtlFile() [InlineData("43df5774b03e7fef5fe40d931a7bedf1bb2e6b42738c4e6d3841103d3aa7f339")] // CN=Entrust Root Certification Authority - G2, OU="(c) 2009 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177")] // CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net [InlineData("6fff78e400a70c11011cd85977c459fb5af96a3df0540820d0f4b8607875e58f")] // CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, S=UT, C=US [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("8a866fd1b276b57e578e921c65828a2bed58e9f2f288054134b7f1f4bfc9cc74")] // CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM [InlineData("a45ede3bbbf09c8ae15c72efc07268d693a21c996fd51e67ca079460fd6d8873")] // CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM [InlineData("cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b")] // CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3 + [InlineData("d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4")] // CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB [InlineData("e793c9b02fd8aa13e21c31228accb08119643b749c898964b1746d46c3d4cbd2")] // CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, S=New Jersey, C=US + [InlineData("ebd41040e4bb3ec742c9e381d31ef2a41a48b6685c96e7cef3c1df6cd4331c99")] // CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE public void File_contains_certificates_used_in_NuGet_org_package_signatures(string expectedFingerprint) { VerifyCertificateExists(s_fingerprints, expectedFingerprint); diff --git a/src/arcade/eng/common/BuildConfiguration/build-configuration.json b/src/arcade/eng/common/BuildConfiguration/build-configuration.json deleted file mode 100644 index 3d1cc89894c9..000000000000 --- a/src/arcade/eng/common/BuildConfiguration/build-configuration.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "RetryCountLimit": 1, - "RetryByAnyError": false -} diff --git a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 b/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 deleted file mode 100644 index 4c1ea7c98ea4..000000000000 --- a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 +++ /dev/null @@ -1,11 +0,0 @@ -@{ - IncludeRules=@('PSAvoidUsingCmdletAliases', - 'PSAvoidUsingWMICmdlet', - 'PSAvoidUsingPositionalParameters', - 'PSAvoidUsingInvokeExpression', - 'PSUseDeclaredVarsMoreThanAssignments', - 'PSUseCmdletCorrectly', - 'PSStandardDSCFunctionsInResource', - 'PSUseIdenticalMandatoryParametersForDSC', - 'PSUseIdenticalParametersForDSC') -} \ No newline at end of file diff --git a/src/arcade/eng/common/README.md b/src/arcade/eng/common/README.md deleted file mode 100644 index ff49c371527a..000000000000 --- a/src/arcade/eng/common/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Don't touch this folder - - uuuuuuuuuuuuuuuuuuuu - u" uuuuuuuuuuuuuuuuuu "u - u" u$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ - $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ - $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ - $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ - $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$" u" - "u """""""""""""""""" u" - """""""""""""""""""" - -!!! Changes made in this directory are subject to being overwritten by automation !!! - -The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. diff --git a/src/arcade/eng/common/cross/arm/tizen/tizen.patch b/src/arcade/eng/common/cross/arm/tizen/tizen.patch deleted file mode 100644 index fb12ade7250a..000000000000 --- a/src/arcade/eng/common/cross/arm/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/src/arcade/eng/common/cross/armel/tizen/tizen.patch b/src/arcade/eng/common/cross/armel/tizen/tizen.patch deleted file mode 100644 index ca7c7c1ff751..000000000000 --- a/src/arcade/eng/common/cross/armel/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) diff --git a/src/arcade/eng/common/cross/x64/tizen/tizen.patch b/src/arcade/eng/common/cross/x64/tizen/tizen.patch deleted file mode 100644 index 56fbc881095b..000000000000 --- a/src/arcade/eng/common/cross/x64/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so ---- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf64-x86-64) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) ) diff --git a/src/arcade/eng/common/cross/x86/tizen/tizen.patch b/src/arcade/eng/common/cross/x86/tizen/tizen.patch deleted file mode 100644 index f4fe8838ad66..000000000000 --- a/src/arcade/eng/common/cross/x86/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-i386) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) ) diff --git a/src/arcade/eng/common/dotnet-install.cmd b/src/arcade/eng/common/dotnet-install.cmd deleted file mode 100644 index b1c2642e76f7..000000000000 --- a/src/arcade/eng/common/dotnet-install.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/src/arcade/eng/common/dotnet-install.ps1 b/src/arcade/eng/common/dotnet-install.ps1 deleted file mode 100644 index 811f0f717f73..000000000000 --- a/src/arcade/eng/common/dotnet-install.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [string] $architecture = '', - [string] $version = 'Latest', - [string] $runtime = 'dotnet', - [string] $RuntimeSourceFeed = '', - [string] $RuntimeSourceFeedKey = '' -) - -. $PSScriptRoot\tools.ps1 - -$dotnetRoot = Join-Path $RepoRoot '.dotnet' - -$installdir = $dotnetRoot -try { - if ($architecture -and $architecture.Trim() -eq 'x86') { - $installdir = Join-Path $installdir 'x86' - } - InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/enable-cross-org-publishing.ps1 b/src/arcade/eng/common/enable-cross-org-publishing.ps1 deleted file mode 100644 index da09da4f1fc4..000000000000 --- a/src/arcade/eng/common/enable-cross-org-publishing.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -param( - [string] $token -) - - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Write-PipelineSetVariable will no-op if a variable named $ci is not defined -# Since this script is only ever called in AzDO builds, just universally set it -$ci = $true - -Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false diff --git a/src/arcade/eng/common/generate-locproject.ps1 b/src/arcade/eng/common/generate-locproject.ps1 deleted file mode 100644 index 524aaa57f2b7..000000000000 --- a/src/arcade/eng/common/generate-locproject.ps1 +++ /dev/null @@ -1,189 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here - [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json - [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one - [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally -) - -# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: -# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task - -Set-StrictMode -Version 2.0 -$ErrorActionPreference = "Stop" -. $PSScriptRoot\pipeline-logging-functions.ps1 - -$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" -$exclusions = @{ Exclusions = @() } -if (Test-Path -Path $exclusionsFilePath) -{ - $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json -} - -Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work - -# Template files -$jsonFiles = @() -$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern -$jsonTemplateFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" - $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern - -$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them -if (-not $wxlFiles) { - $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files - if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } - } -} - -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files -$macosHtmlFiles = @() -if ($macosHtmlEnFiles) { - $macosHtmlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } -} - -$xlfFiles = @() - -$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" -$langXlfFiles = @() -if ($allXlfFiles) { - $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' - $firstLangCode = $Matches.1 - $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" -} -$langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" - $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles - -$locJson = @{ - Projects = @( - @{ - LanguageSet = $LanguageSet - LocItems = @( - $locFiles | ForEach-Object { - $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { - Remove-Item -Path $sourceFile - } - if ($continue) - { - if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" - } - } else { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnName" - OutputPath = $outputPath - } - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "WiX_CloneLanguages" - LssFiles = @( "wxl_loc.lss" ) - LocItems = @( - $wxlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if ($continue) - { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "VS_macOS_CloneLanguages" - LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) - LocItems = @( - $macosHtmlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - $lciFile = $sourceFile + ".lci" - if ($continue) { - $result = @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - if (Test-Path $lciFile -PathType Leaf) { - $result["LciFile"] = $lciFile - } - return $result - } - } - ) - } - ) -} - -$json = ConvertTo-Json $locJson -Depth 5 -Write-Host "LocProject.json generated:`n`n$json`n`n" -Pop-Location - -if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json -} -else { - New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - - if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { - Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." - - exit 1 - } - else { - Write-Host "Generated LocProject.json and current LocProject.json are identical." - } -} diff --git a/src/arcade/eng/common/generate-sbom-prep.ps1 b/src/arcade/eng/common/generate-sbom-prep.ps1 deleted file mode 100644 index a0c7d792a76f..000000000000 --- a/src/arcade/eng/common/generate-sbom-prep.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed -) - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' -$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName - -Write-Host "Artifact name before : $ArtifactName" -Write-Host "Artifact name after : $SafeArtifactName" - -Write-Host "Creating dir $ManifestDirPath" - -# create directory for sbom manifest to be placed -if (!(Test-Path -path $SbomGenerationDir)) -{ - New-Item -ItemType Directory -path $SbomGenerationDir - Write-Host "Successfully created directory $SbomGenerationDir" -} -else{ - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -} - -Write-Host "Updating artifact name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/src/arcade/eng/common/init-tools-native.cmd b/src/arcade/eng/common/init-tools-native.cmd deleted file mode 100644 index 438cd548c452..000000000000 --- a/src/arcade/eng/common/init-tools-native.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file diff --git a/src/arcade/eng/common/init-tools-native.ps1 b/src/arcade/eng/common/init-tools-native.ps1 deleted file mode 100644 index 27ccdb9ecc95..000000000000 --- a/src/arcade/eng/common/init-tools-native.ps1 +++ /dev/null @@ -1,203 +0,0 @@ -<# -.SYNOPSIS -Entry point script for installing native tools - -.DESCRIPTION -Reads $RepoRoot\global.json file to determine native assets to install -and executes installers for those tools - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER InstallDirectory -Directory to install native toolset. This is a command-line override for the default -Install directory precedence order: -- InstallDirectory command-line override -- NETCOREENG_INSTALL_DIRECTORY environment variable -- (default) %USERPROFILE%/.netcoreeng/native - -.PARAMETER Clean -Switch specifying to not install anything, but cleanup native asset folders - -.PARAMETER Force -Clean and then install tools - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.PARAMETER GlobalJsonFile -File path to global.json file - -.PARAMETER PathPromotion -Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) -or break the build if a native tool is not found on the path (on a local dev machine) - -.NOTES -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [string] $BaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external', - [string] $InstallDirectory, - [switch] $Clean = $False, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile, - [switch] $PathPromotion -) - -if (!$GlobalJsonFile) { - $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName 'global.json' -} - -Set-StrictMode -version 2.0 -$ErrorActionPreference='Stop' - -. $PSScriptRoot\pipeline-logging-functions.ps1 -Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq 'Continue' - - $EngCommonBaseDir = Join-Path $PSScriptRoot 'native\' - $NativeBaseDir = $InstallDirectory - if (!$NativeBaseDir) { - $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory - } - $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir - $InstallBin = Join-Path $NativeBaseDir 'bin' - $InstallerPath = Join-Path $EngCommonBaseDir 'install-tool.ps1' - - # Process tools list - Write-Host "Processing $GlobalJsonFile" - If (-Not (Test-Path $GlobalJsonFile)) { - Write-Host "Unable to find '$GlobalJsonFile'" - exit 0 - } - $NativeTools = Get-Content($GlobalJsonFile) -Raw | - ConvertFrom-Json | - Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue - if ($NativeTools) { - if ($PathPromotion -eq $True) { - $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" - if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $InstalledTools = @{} - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - if ($ToolVersion -eq "latest") { - $ToolVersion = "" - } - $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) - if ($ToolDirectories -eq $null) { - Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." - exit 1 - } - $ToolDirectory = $ToolDirectories[0] - $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" - if (-not (Test-Path -Path "$BinPathFile")) { - Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." - exit 1 - } - $BinPath = Get-Content "$BinPathFile" - $ToolPath = Convert-Path -Path $BinPath - Write-Host "Adding $ToolName to the path ($ToolPath)..." - Write-Host "##vso[task.prependpath]$ToolPath" - $env:PATH = "$ToolPath;$env:PATH" - $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } - } - } - return $InstalledTools - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." - } - } - exit 0 - } - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false - } - if ($showNativeToolsWarning) { - Write-Warning $errMsg - } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 - } - } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 - } - } - } - else { - Write-Host 'No native tools defined in global.json' - exit 0 - } - - if ($Clean) { - exit 0 - } - if (Test-Path $InstallBin) { - Write-Host 'Native tools are available from ' (Convert-Path -Path $InstallBin) - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" - return $InstallBin - } - elseif (-not ($PathPromotion)) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' - exit 1 - } - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/init-tools-native.sh b/src/arcade/eng/common/init-tools-native.sh deleted file mode 100644 index 3e6a8d6acf2f..000000000000 --- a/src/arcade/eng/common/init-tools-native.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' -install_directory='' -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 -global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" -declare -a native_assets - -. $scriptroot/pipeline-logging-functions.sh -. $scriptroot/native/common-library.sh - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installdirectory) - install_directory=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --donotabortonfailure) - donotabortonfailure=true - shift 1 - ;; - --donotdisplaywarnings) - donotdisplaywarnings=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --installdirectory Directory to install native toolset." - echo " This is a command-line override for the default" - echo " Install directory precedence order:" - echo " - InstallDirectory command-line override" - echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" - echo " - (default) %USERPROFILE%/.netcoreeng/native" - echo "" - echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" - echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" - echo " --force Clean and then install tools" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --baseuri Base URI for where to download native tools from" - echo " --downloadretries Number of times a download should be attempted" - echo " --retrywaittimeseconds Wait time between download attempts" - echo "" - exit 0 - ;; - esac -done - -function ReadGlobalJsonNativeTools { - # happy path: we have a proper JSON parsing tool `jq(1)` in PATH! - if command -v jq &> /dev/null; then - - # jq: read each key/value pair under "native-tools" entry and emit: - # KEY="" VALUE="" - # followed by a null byte. - # - # bash: read line with null byte delimeter and push to array (for later `eval`uation). - - while IFS= read -rd '' line; do - native_assets+=("$line") - done < <(jq -r '. | - select(has("native-tools")) | - ."native-tools" | - keys[] as $k | - @sh "KEY=\($k) VALUE=\(.[$k])\u0000"' "$global_json_file") - - return - fi - - # Warning: falling back to manually parsing JSON, which is not recommended. - - # Following routine matches the output and escaping logic of jq(1)'s @sh formatter used above. - # It has been tested with several weird strings with escaped characters in entries (key and value) - # and results were compared with the output of jq(1) in binary representation using xxd(1); - # just before the assignment to 'native_assets' array (above and below). - - # try to capture the section under "native-tools". - if [[ ! "$(cat "$global_json_file")" =~ \"native-tools\"[[:space:]\:\{]*([^\}]+) ]]; then - return - fi - - section="${BASH_REMATCH[1]}" - - parseStarted=0 - possibleEnd=0 - escaping=0 - escaped=0 - isKey=1 - - for (( i=0; i<${#section}; i++ )); do - char="${section:$i:1}" - if ! ((parseStarted)) && [[ "$char" =~ [[:space:],:] ]]; then continue; fi - - if ! ((escaping)) && [[ "$char" == "\\" ]]; then - escaping=1 - elif ((escaping)) && ! ((escaped)); then - escaped=1 - fi - - if ! ((parseStarted)) && [[ "$char" == "\"" ]]; then - parseStarted=1 - possibleEnd=0 - elif [[ "$char" == "'" ]]; then - token="$token'\\\''" - possibleEnd=0 - elif ((escaping)) || [[ "$char" != "\"" ]]; then - token="$token$char" - possibleEnd=1 - fi - - if ((possibleEnd)) && ! ((escaping)) && [[ "$char" == "\"" ]]; then - # Use printf to unescape token to match jq(1)'s @sh formatting rules. - # do not use 'token="$(printf "$token")"' syntax, as $() eats the trailing linefeed. - printf -v token "'$token'" - - if ((isKey)); then - KEY="$token" - isKey=0 - else - line="KEY=$KEY VALUE=$token" - native_assets+=("$line") - isKey=1 - fi - - # reset for next token - parseStarted=0 - token= - elif ((escaping)) && ((escaped)); then - escaping=0 - escaped=0 - fi - done -} - -native_base_dir=$install_directory -if [[ -z $install_directory ]]; then - native_base_dir=$(GetNativeInstallDirectory) -fi - -install_bin="${native_base_dir}/bin" -installed_any=false - -ReadGlobalJsonNativeTools - -if [[ ${#native_assets[@]} -eq 0 ]]; then - echo "No native tools defined in global.json" - exit 0; -else - native_installer_dir="$scriptroot/native" - for index in "${!native_assets[@]}"; do - eval "${native_assets["$index"]}" - - installer_path="$native_installer_dir/install-$KEY.sh" - installer_command="$installer_path" - installer_command+=" --baseuri $base_uri" - installer_command+=" --installpath $install_bin" - installer_command+=" --version $VALUE" - echo $installer_command - - if [[ $force = true ]]; then - installer_command+=" --force" - fi - - if [[ $clean = true ]]; then - installer_command+=" --clean" - fi - - if [[ -a $installer_path ]]; then - $installer_command - if [[ $? != 0 ]]; then - if [[ $donotabortonfailure = true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - exit 1 - fi - else - $installed_any = true - fi - else - if [[ $donotabortonfailure == true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - exit 1 - fi - fi - done -fi - -if [[ $clean = true ]]; then - exit 0 -fi - -if [[ -d $install_bin ]]; then - echo "Native tools are available from $install_bin" - echo "##vso[task.prependpath]$install_bin" -else - if [[ $installed_any = true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" - exit 1 - fi -fi - -exit 0 diff --git a/src/arcade/eng/common/internal-feed-operations.ps1 b/src/arcade/eng/common/internal-feed-operations.ps1 deleted file mode 100644 index 92b77347d990..000000000000 --- a/src/arcade/eng/common/internal-feed-operations.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $Operation, - [string] $AuthToken, - [string] $CommitSha, - [string] $RepoName, - [switch] $IsFeedPrivate -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -. $PSScriptRoot\tools.ps1 - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified -# internal builds -function SetupCredProvider { - param( - [string] $AuthToken - ) - - # Install the Cred Provider NuGet plugin - Write-Host 'Setting up Cred Provider NuGet plugin in the agent...' - Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' - - Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 - - Write-Host 'Installing plugin...' - .\installcredprovider.ps1 -Force - - Write-Host "Deleting local copy of 'installcredprovider.ps1'..." - Remove-Item .\installcredprovider.ps1 - - if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { - Write-PipelineTelemetryError -Category 'Arcade' -Message 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - } - else { - Write-Host 'CredProvider plugin was installed correctly!' - } - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - $nugetConfigPath = Join-Path $RepoRoot "NuGet.config" - - if (-Not (Test-Path -Path $nugetConfigPath)) { - Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' - ExitWithExitCode 1 - } - - $endpoints = New-Object System.Collections.ArrayList - $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} - - if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { - foreach ($stableRestoreResource in $nugetConfigPackageSources) { - $trimmedResource = ([string]$stableRestoreResource).Trim() - [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) - } - } - - if (($endpoints | Measure-Object).Count -gt 0) { - $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress - - # Create the environment variables the AzDo way - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ - 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' - 'issecret' = 'false' - } - - # We don't want sessions cached since we will be updating the endpoints quite frequently - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ - 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' - 'issecret' = 'false' - } - } - else - { - Write-Host 'No internal endpoints found in NuGet.config' - } -} - -#Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - $dotnetTempDir = Join-Path $RepoRoot "dotnet" - $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - $dotnet = "$dotnetTempDir\dotnet.exe" - $restoreProjPath = "$PSScriptRoot\restore.proj" - - Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - '' | Out-File "$restoreProjPath" - - & $dotnet restore $restoreProjPath - - Write-Host 'Arcade SDK restored!' - - if (Test-Path -Path $restoreProjPath) { - Remove-Item $restoreProjPath - } - - if (Test-Path -Path $dotnetTempDir) { - Remove-Item $dotnetTempDir -Recurse - } -} - -try { - Push-Location $PSScriptRoot - - if ($Operation -like 'setup') { - SetupCredProvider $AuthToken - } - elseif ($Operation -like 'install-restore') { - InstallDotNetSdkAndRestoreArcade - } - else { - Write-PipelineTelemetryError -Category 'Arcade' -Message "Unknown operation '$Operation'!" - ExitWithExitCode 1 - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Arcade' -Message $_ - ExitWithExitCode 1 -} -finally { - Pop-Location -} diff --git a/src/arcade/eng/common/internal-feed-operations.sh b/src/arcade/eng/common/internal-feed-operations.sh deleted file mode 100644 index 9378223ba095..000000000000 --- a/src/arcade/eng/common/internal-feed-operations.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. -# This should ONLY be called from identified internal builds -function SetupCredProvider { - local authToken=$1 - - # Install the Cred Provider NuGet plugin - echo "Setting up Cred Provider NuGet plugin in the agent..."... - echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" - - echo "Writing the contents of 'installcredprovider.ps1' locally..." - local installcredproviderPath="installcredprovider.sh" - if command -v curl > /dev/null; then - curl $url > "$installcredproviderPath" - else - wget -q -O "$installcredproviderPath" "$url" - fi - - echo "Installing plugin..." - . "$installcredproviderPath" - - echo "Deleting local copy of 'installcredprovider.sh'..." - rm installcredprovider.sh - - if [ ! -d "$HOME/.nuget/plugins" ]; then - Write-PipelineTelemetryError -category 'Build' 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - else - echo "CredProvider plugin was installed correctly!" - fi - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - local nugetConfigPath="{$repo_root}NuGet.config" - - if [ ! "$nugetConfigPath" ]; then - Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" - ExitWithExitCode 1 - fi - - local endpoints='[' - local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` - local pattern="value=\"(.*)\"" - - for value in $nugetConfigPackageValues - do - if [[ $value =~ $pattern ]]; then - local endpoint="${BASH_REMATCH[1]}" - endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," - fi - done - - endpoints=${endpoints%?} - endpoints+=']' - - if [ ${#endpoints} -gt 2 ]; then - local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" - - echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" - echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" - else - echo "No internal endpoints found in NuGet.config" - fi -} - -# Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - local dotnetTempDir="$repo_root/dotnet" - local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - local restoreProjPath="$repo_root/eng/common/restore.proj" - - echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - echo "" > "$restoreProjPath" - - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - local res=`$dotnetTempDir/dotnet restore $restoreProjPath` - echo "Arcade SDK restored!" - - # Cleanup - if [ "$restoreProjPath" ]; then - rm "$restoreProjPath" - fi - - if [ "$dotnetTempDir" ]; then - rm -r $dotnetTempDir - fi -} - -source="${BASH_SOURCE[0]}" -operation='' -authToken='' -repoName='' - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - --operation) - operation=$2 - shift - ;; - --authtoken) - authToken=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. "$scriptroot/tools.sh" - -if [ "$operation" = "setup" ]; then - SetupCredProvider $authToken -elif [ "$operation" = "install-restore" ]; then - InstallDotNetSdkAndRestoreArcade -else - echo "Unknown operation '$operation'!" -fi diff --git a/src/arcade/eng/common/internal/NuGet.config b/src/arcade/eng/common/internal/NuGet.config deleted file mode 100644 index 19d3d311b166..000000000000 --- a/src/arcade/eng/common/internal/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss b/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss deleted file mode 100644 index 5d892d619398..000000000000 --- a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.ps1 b/src/arcade/eng/common/msbuild.ps1 deleted file mode 100644 index f041e5ddd958..000000000000 --- a/src/arcade/eng/common/msbuild.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [bool] $warnAsError = $true, - [bool] $nodeReuse = $true, - [switch] $ci, - [switch] $prepareMachine, - [switch] $excludePrereleaseVS, - [string] $msbuildEngine = $null, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs -) - -. $PSScriptRoot\tools.ps1 - -try { - if ($ci) { - $nodeReuse = $false - } - - MSBuild @extraArgs -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Build' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.sh b/src/arcade/eng/common/msbuild.sh deleted file mode 100644 index 20d3dad54352..000000000000 --- a/src/arcade/eng/common/msbuild.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -verbosity='minimal' -warn_as_error=true -node_reuse=true -prepare_machine=false -extra_args='' - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --verbosity) - verbosity=$2 - shift 2 - ;; - --warnaserror) - warn_as_error=$2 - shift 2 - ;; - --nodereuse) - node_reuse=$2 - shift 2 - ;; - --ci) - ci=true - shift 1 - ;; - --preparemachine) - prepare_machine=true - shift 1 - ;; - *) - extra_args="$extra_args $1" - shift 1 - ;; - esac -done - -. "$scriptroot/tools.sh" - -if [[ "$ci" == true ]]; then - node_reuse=false -fi - -MSBuild $extra_args -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/native/common-library.sh b/src/arcade/eng/common/native/common-library.sh deleted file mode 100644 index 080c2c283ae4..000000000000 --- a/src/arcade/eng/common/native/common-library.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -function GetNativeInstallDirectory { - local install_dir - - if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then - install_dir=$HOME/.netcoreeng/native/ - else - install_dir=$NETCOREENG_INSTALL_DIRECTORY - fi - - echo $install_dir - return 0 -} - -function GetTempDirectory { - - echo $(GetNativeInstallDirectory)temp/ - return 0 -} - -function ExpandZip { - local zip_path=$1 - local output_directory=$2 - local force=${3:-false} - - echo "Extracting $zip_path to $output_directory" - if [[ -d $output_directory ]] && [[ $force = false ]]; then - echo "Directory '$output_directory' already exists, skipping extract" - return 0 - fi - - if [[ -d $output_directory ]]; then - echo "'Force flag enabled, but '$output_directory' exists. Removing directory" - rm -rf $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to remove '$output_directory'" - return 1 - fi - fi - - echo "Creating directory: '$output_directory'" - mkdir -p $output_directory - - echo "Extracting archive" - tar -xf $zip_path -C $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to extract '$zip_path'" - return 1 - fi - - return 0 -} - -function GetCurrentOS { - local unameOut="$(uname -s)" - case $unameOut in - Linux*) echo "Linux";; - Darwin*) echo "MacOS";; - esac - return 0 -} - -function GetFile { - local uri=$1 - local path=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - if [[ -f $path ]]; then - if [[ $force = false ]]; then - echo "File '$path' already exists. Skipping download" - return 0 - else - rm -rf $path - fi - fi - - if [[ -f $uri ]]; then - echo "'$uri' is a file path, copying file to '$path'" - cp $uri $path - return $? - fi - - echo "Downloading $uri" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail - else - wget -q -O "$path" "$uri" --tries="$download_retries" - fi - - return $? -} - -function GetTempPathFileName { - local path=$1 - - local temp_dir=$(GetTempDirectory) - local temp_file_name=$(basename $path) - echo $temp_dir$temp_file_name - return 0 -} - -function DownloadAndExtract { - local uri=$1 - local installDir=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - local temp_tool_path=$(GetTempPathFileName $uri) - - echo "downloading to: $temp_tool_path" - - # Download file - GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to download '$uri' to '$temp_tool_path'." - return 1 - fi - - # Extract File - echo "extracting from $temp_tool_path to $installDir" - ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to extract '$temp_tool_path' to '$installDir'." - return 1 - fi - - return 0 -} - -function NewScriptShim { - local shimpath=$1 - local tool_file_path=$2 - local force=${3:-false} - - echo "Generating '$shimpath' shim" - if [[ -f $shimpath ]]; then - if [[ $force = false ]]; then - echo "File '$shimpath' already exists." >&2 - return 1 - else - rm -rf $shimpath - fi - fi - - if [[ ! -f $tool_file_path ]]; then - # try to see if the path is lower cased - tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" - if [[ ! -f $tool_file_path ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist" - return 1 - fi - fi - - local shim_contents=$'#!/usr/bin/env bash\n' - shim_contents+="SHIMARGS="$'$1\n' - shim_contents+="$tool_file_path"$' $SHIMARGS\n' - - # Write shim file - echo "$shim_contents" > $shimpath - - chmod +x $shimpath - - echo "Finished generating shim '$shimpath'" - - return $? -} - diff --git a/src/arcade/eng/common/native/install-cmake-test.sh b/src/arcade/eng/common/native/install-cmake-test.sh deleted file mode 100644 index 8a5e7cf0db5a..000000000000 --- a/src/arcade/eng/common/native/install-cmake-test.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake-test" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-cmake.sh b/src/arcade/eng/common/native/install-cmake.sh deleted file mode 100644 index de496beebc5a..000000000000 --- a/src/arcade/eng/common/native/install-cmake.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-tool.ps1 b/src/arcade/eng/common/native/install-tool.ps1 deleted file mode 100644 index 78f2d84a4e4b..000000000000 --- a/src/arcade/eng/common/native/install-tool.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -<# -.SYNOPSIS -Install native tool - -.DESCRIPTION -Install cmake native tool from Azure blob storage - -.PARAMETER InstallPath -Base directory to install native tool to - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER CommonLibraryDirectory -Path to folder containing common library modules - -.PARAMETER Force -Force install of tools even if they previously exist - -.PARAMETER Clean -Don't install the tool, just clean up the current install of the tool - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.NOTES -Returns 0 if install succeeds, 1 otherwise -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [Parameter(Mandatory=$True)] - [string] $ToolName, - [Parameter(Mandatory=$True)] - [string] $InstallPath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [Parameter(Mandatory=$True)] - [string] $Version, - [string] $CommonLibraryDirectory = $PSScriptRoot, - [switch] $Force = $False, - [switch] $Clean = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 -) - -. $PSScriptRoot\..\pipeline-logging-functions.ps1 - -# Import common library modules -Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $Arch = CommonLibrary\Get-MachineArchitecture - $ToolOs = "win64" - if($Arch -Eq "x32") { - $ToolOs = "win32" - } - $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" - $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" - $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" - $ShimPath = Join-Path $InstallPath "$ToolName.exe" - - if ($Clean) { - Write-Host "Cleaning $ToolInstallDirectory" - if (Test-Path $ToolInstallDirectory) { - Remove-Item $ToolInstallDirectory -Force -Recurse - } - Write-Host "Cleaning $ShimPath" - if (Test-Path $ShimPath) { - Remove-Item $ShimPath -Force - } - $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri - Write-Host "Cleaning $ToolTempPath" - if (Test-Path $ToolTempPath) { - Remove-Item $ToolTempPath -Force - } - exit 0 - } - - # Install tool - if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { - Write-Verbose "$ToolName ($Version) already exists, skipping install" - } - else { - $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` - -InstallDirectory $ToolInstallDirectory ` - -Force:$Force ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Verbose:$Verbose - - if ($InstallStatus -Eq $False) { - Write-PipelineTelemetryError "Installation failed" -Category "NativeToolsetBootstrapping" - exit 1 - } - } - - $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } - if (@($ToolFilePath).Length -Gt 1) { - Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" - exit 1 - } elseif (@($ToolFilePath).Length -Lt 1) { - Write-Host "$ToolName was not found in $ToolInstallDirectory." - exit 1 - } - - # Generate shim - # Always rewrite shims so that we are referencing the expected version - $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` - -ShimDirectory $InstallPath ` - -ToolFilePath "$ToolFilePath" ` - -BaseUri $BaseUri ` - -Force:$Force ` - -Verbose:$Verbose - - if ($GenerateShimStatus -Eq $False) { - Write-PipelineTelemetryError "Generate shim failed" -Category "NativeToolsetBootstrapping" - return 1 - } - - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category "NativeToolsetBootstrapping" -Message $_ - exit 1 -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.ps1 b/src/arcade/eng/common/pipeline-logging-functions.ps1 deleted file mode 100644 index 8e422c561e4b..000000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.ps1 +++ /dev/null @@ -1,260 +0,0 @@ -# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. - -# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 - -$script:loggingCommandPrefix = '##vso[' -$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? - New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } - New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } - New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } - New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } -) -# TODO: BUG: Escape % ??? -# TODO: Add test to verify don't need to escape "=". - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTelemetryError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Category, - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force) - - $PSBoundParameters.Remove('Category') | Out-Null - - if ($Force -Or ((Test-Path variable:ci) -And $ci)) { - $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" - } - $PSBoundParameters.Remove('Message') | Out-Null - $PSBoundParameters.Add('Message', $Message) - Write-PipelineTaskError @PSBoundParameters -} - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTaskError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force - ) - - if (!$Force -And (-Not (Test-Path variable:ci) -Or !$ci)) { - if ($Type -eq 'error') { - Write-Host $Message -ForegroundColor Red - return - } - elseif ($Type -eq 'warning') { - Write-Host $Message -ForegroundColor Yellow - return - } - } - - if (($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return - } - $PSBoundParameters.Remove('Force') | Out-Null - if (-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') - } - Write-LogIssue @PSBoundParameters -} - -function Write-PipelineSetVariable { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Name, - [string]$Value, - [switch]$Secret, - [switch]$AsOutput, - [bool]$IsMultiJobVariable = $true) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ - 'variable' = $Name - 'isSecret' = $Secret - 'isOutput' = $IsMultiJobVariable - } -AsOutput:$AsOutput - } -} - -function Write-PipelinePrependPath { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Path, - [switch]$AsOutput) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput - } -} - -function Write-PipelineSetResult { - [CmdletBinding()] - param( - [ValidateSet("Succeeded", "SucceededWithIssues", "Failed", "Cancelled", "Skipped")] - [Parameter(Mandatory = $true)] - [string]$Result, - [string]$Message) - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'complete' -Data $Message -Properties @{ - 'result' = $Result - } - } -} - -<######################################## -# Private functions. -########################################> -function Format-LoggingCommandData { - [CmdletBinding()] - param([string]$Value, [switch]$Reverse) - - if (!$Value) { - return '' - } - - if (!$Reverse) { - foreach ($mapping in $script:loggingCommandEscapeMappings) { - $Value = $Value.Replace($mapping.Token, $mapping.Replacement) - } - } - else { - for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { - $mapping = $script:loggingCommandEscapeMappings[$i] - $Value = $Value.Replace($mapping.Replacement, $mapping.Token) - } - } - - return $Value -} - -function Format-LoggingCommand { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Area, - [Parameter(Mandatory = $true)] - [string]$Event, - [string]$Data, - [hashtable]$Properties) - - # Append the preamble. - [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder - $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) - - # Append the properties. - if ($Properties) { - $first = $true - foreach ($key in $Properties.Keys) { - [string]$value = Format-LoggingCommandData $Properties[$key] - if ($value) { - if ($first) { - $null = $sb.Append(' ') - $first = $false - } - else { - $null = $sb.Append(';') - } - - $null = $sb.Append("$key=$value") - } - } - } - - # Append the tail and output the value. - $Data = Format-LoggingCommandData $Data - $sb.Append(']').Append($Data).ToString() -} - -function Write-LoggingCommand { - [CmdletBinding(DefaultParameterSetName = 'Parameters')] - param( - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Area, - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Event, - [Parameter(ParameterSetName = 'Parameters')] - [string]$Data, - [Parameter(ParameterSetName = 'Parameters')] - [hashtable]$Properties, - [Parameter(Mandatory = $true, ParameterSetName = 'Object')] - $Command, - [switch]$AsOutput) - - if ($PSCmdlet.ParameterSetName -eq 'Object') { - Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput - return - } - - $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties - if ($AsOutput) { - $command - } - else { - Write-Host $command - } -} - -function Write-LogIssue { - [CmdletBinding()] - param( - [ValidateSet('warning', 'error')] - [Parameter(Mandatory = $true)] - [string]$Type, - [string]$Message, - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ - 'type' = $Type - 'code' = $ErrCode - 'sourcepath' = $SourcePath - 'linenumber' = $LineNumber - 'columnnumber' = $ColumnNumber - } - if ($AsOutput) { - return $command - } - - if ($Type -eq 'error') { - $foregroundColor = $host.PrivateData.ErrorForegroundColor - $backgroundColor = $host.PrivateData.ErrorBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Red - $backgroundColor = [System.ConsoleColor]::Black - } - } - else { - $foregroundColor = $host.PrivateData.WarningForegroundColor - $backgroundColor = $host.PrivateData.WarningBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Yellow - $backgroundColor = [System.ConsoleColor]::Black - } - } - - Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.sh b/src/arcade/eng/common/pipeline-logging-functions.sh deleted file mode 100644 index 6a0b2255e911..000000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.sh +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env bash - -function Write-PipelineTelemetryError { - local telemetry_category='' - local force=false - local function_args=() - local message='' - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -category|-c) - telemetry_category=$2 - shift - ;; - -force|-f) - force=true - ;; - -*) - function_args+=("$1 $2") - shift - ;; - *) - message=$* - ;; - esac - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$message" >&2 - return - fi - - if [[ $force == true ]]; then - function_args+=("-force") - fi - message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" - function_args+=("$message") - Write-PipelineTaskError ${function_args[@]} -} - -function Write-PipelineTaskError { - local message_type="error" - local sourcepath='' - local linenumber='' - local columnnumber='' - local error_code='' - local force=false - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -type|-t) - message_type=$2 - shift - ;; - -sourcepath|-s) - sourcepath=$2 - shift - ;; - -linenumber|-ln) - linenumber=$2 - shift - ;; - -columnnumber|-cn) - columnnumber=$2 - shift - ;; - -errcode|-e) - error_code=$2 - shift - ;; - -force|-f) - force=true - ;; - *) - break - ;; - esac - - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$@" >&2 - return - fi - - local message="##vso[task.logissue" - - message="$message type=$message_type" - - if [ -n "$sourcepath" ]; then - message="$message;sourcepath=$sourcepath" - fi - - if [ -n "$linenumber" ]; then - message="$message;linenumber=$linenumber" - fi - - if [ -n "$columnnumber" ]; then - message="$message;columnnumber=$columnnumber" - fi - - if [ -n "$error_code" ]; then - message="$message;code=$error_code" - fi - - message="$message]$*" - echo "$message" -} - -function Write-PipelineSetVariable { - if [[ "$ci" != true ]]; then - return - fi - - local name='' - local value='' - local secret=false - local as_output=false - local is_multi_job_variable=true - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -name|-n) - name=$2 - shift - ;; - -value|-v) - value=$2 - shift - ;; - -secret|-s) - secret=true - ;; - -as_output|-a) - as_output=true - ;; - -is_multi_job_variable|-i) - is_multi_job_variable=$2 - shift - ;; - esac - shift - done - - value=${value/;/%3B} - value=${value/\\r/%0D} - value=${value/\\n/%0A} - value=${value/]/%5D} - - local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" - - if [[ "$as_output" == true ]]; then - $message - else - echo "$message" - fi -} - -function Write-PipelinePrependPath { - local prepend_path='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -path|-p) - prepend_path=$2 - shift - ;; - esac - shift - done - - export PATH="$prepend_path:$PATH" - - if [[ "$ci" == true ]]; then - echo "##vso[task.prependpath]$prepend_path" - fi -} - -function Write-PipelineSetResult { - local result='' - local message='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -result|-r) - result=$2 - shift - ;; - -message|-m) - message=$2 - shift - ;; - esac - shift - done - - if [[ "$ci" == true ]]; then - echo "##vso[task.complete result=$result;]$message" - fi -} diff --git a/src/arcade/eng/common/retain-build.ps1 b/src/arcade/eng/common/retain-build.ps1 deleted file mode 100644 index e7ba975adeb6..000000000000 --- a/src/arcade/eng/common/retain-build.ps1 +++ /dev/null @@ -1,45 +0,0 @@ - -Param( -[Parameter(Mandatory=$true)][int] $buildId, -[Parameter(Mandatory=$true)][string] $azdoOrgUri, -[Parameter(Mandatory=$true)][string] $azdoProject, -[Parameter(Mandatory=$true)][string] $token -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -function Get-AzDOHeaders( - [string] $token) -{ - $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) - $headers = @{"Authorization"="Basic $base64AuthInfo"} - return $headers -} - -function Update-BuildRetention( - [string] $azdoOrgUri, - [string] $azdoProject, - [int] $buildId, - [string] $token) -{ - $headers = Get-AzDOHeaders -token $token - $requestBody = "{ - `"keepForever`": `"true`" - }" - - $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" - write-Host "Attempting to retain build using the following URI: ${requestUri} ..." - - try { - Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" - Write-Host "Updated retention settings for build ${buildId}." - } - catch { - Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" - exit 1 - } -} - -Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token -exit 0 diff --git a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 b/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 deleted file mode 100644 index 27f5a4115fc7..000000000000 --- a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 +++ /dev/null @@ -1,130 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $TargetDirectory, - [string] $GdnFolder, - # The list of Guardian tools to configure. For each object in the array: - # - If the item is a [hashtable], it must contain these entries: - # - Name = The tool name as Guardian knows it. - # - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique - # among all tool entries with the same Name. - # - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")' - # - If the item is a [string] $v, it is treated as '@{ Name="$v" }' - [object[]] $ToolsList, - [string] $GuardianLoggerLevel='Standard', - # Optional: Additional params to add to any tool using CredScan. - [string[]] $CrScanAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using PoliCheck. - [string[]] $PoliCheckAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using CodeQL/Semmle. - [string[]] $CodeQLAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using Binskim. - [string[]] $BinskimAdditionalRunConfigParams -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # Normalize tools list: all in [hashtable] form with defined values for each key. - $ToolsList = $ToolsList | - ForEach-Object { - if ($_ -is [string]) { - $_ = @{ Name = $_ } - } - - if (-not ($_['Scenario'])) { $_.Scenario = "" } - if (-not ($_['Args'])) { $_.Args = @() } - $_ - } - - Write-Host "List of tools to configure:" - $ToolsList | ForEach-Object { $_ | Out-String | Write-Host } - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - foreach ($tool in $ToolsList) { - # Put together the name and scenario to make a unique key. - $toolConfigName = $tool.Name - if ($tool.Scenario) { - $toolConfigName += "_" + $tool.Scenario - } - - Write-Host "=== Configuring $toolConfigName..." - - $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" - - # For some tools, add default and automatic args. - switch -Exact ($tool.Name) { - 'credscan' { - if ($targetDirectory) { - $tool.Args += "`"TargetDirectory < $TargetDirectory`"" - } - $tool.Args += "`"OutputType < pre`"" - $tool.Args += $CrScanAdditionalRunConfigParams - } - 'policheck' { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" - } - $tool.Args += $PoliCheckAdditionalRunConfigParams - } - {$_ -in 'semmle', 'codeql'} { - if ($targetDirectory) { - $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" - } - $tool.Args += $CodeQLAdditionalRunConfigParams - } - 'binskim' { - if ($targetDirectory) { - # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. - # We are excluding all `_.pdb` files from the scan. - $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" - } - $tool.Args += $BinskimAdditionalRunConfigParams - } - } - - # Create variable pointing to the args array directly so we can use splat syntax later. - $toolArgs = $tool.Args - - # Configure the tool. If args array is provided or the current tool has some default arguments - # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}", - # one per parameter. Doc page for "guardian configure": - # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure - Exec-BlockVerbosely { - & $GuardianCliLocation configure ` - --working-directory $WorkingDirectory ` - --tool $tool.Name ` - --output-path $gdnConfigFile ` - --logger-level $GuardianLoggerLevel ` - --noninteractive ` - --force ` - $(if ($toolArgs) { "--args" }) @toolArgs - Exit-IfNZEC "Sdl" - } - - Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 b/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 deleted file mode 100644 index 68da4fbf2571..000000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -# This script looks for each archive file in a directory and extracts it into the target directory. -# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**". -# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip. -param( - # Full path to directory where archives are stored. - [Parameter(Mandatory=$true)][string] $InputPath, - # Full path to directory to extract archives into. May be the same as $InputPath. - [Parameter(Mandatory=$true)][string] $ExtractPath -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - Measure-Command { - $jobs = @() - - # Find archive files for non-Windows and Windows builds. - $archiveFiles = @( - Get-ChildItem (Join-Path $InputPath "*.tar.gz") - Get-ChildItem (Join-Path $InputPath "*.zip") - ) - - foreach ($targzFile in $archiveFiles) { - $jobs += Start-Job -ScriptBlock { - $file = $using:targzFile - $fileName = [System.IO.Path]::GetFileName($file) - $extractDir = Join-Path $using:ExtractPath "$fileName.extracted" - - New-Item $extractDir -ItemType Directory -Force | Out-Null - - Write-Host "Extracting '$file' to '$extractDir'..." - - # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early. - # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the - # error. Save output so it can be stored in the exception string along with context. - $output = tar -xf $file -C $extractDir 2>&1 - # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we - # don't have access to the outer scope. - if ($LASTEXITCODE -ne 0) { - throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'" - } - - Write-Host "Extracted to $extractDir" - } - } - - Receive-Job $jobs -Wait - } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 b/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 deleted file mode 100644 index f031ed5b25e9..000000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 +++ /dev/null @@ -1,82 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored - [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -function ExtractArtifacts { - if (!(Test-Path $InputPath)) { - Write-Host "Input Path does not exist: $InputPath" - ExitWithExitCode 0 - } - $Jobs = @() - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - $ExtractPackage = { - param( - [string] $PackagePath # Full path to a NuGet package - ) - - if (!(Test-Path $PackagePath)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - $RelevantExtensions = @('.dll', '.exe', '.pdb') - Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) - [System.IO.Directory]::CreateDirectory($TargetPath); - - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) - } - } - catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 - } - finally { - $zip.Dispose() - } - } - Measure-Command { ExtractArtifacts } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/packages.config b/src/arcade/eng/common/sdl/packages.config deleted file mode 100644 index e5f543ea68c2..000000000000 --- a/src/arcade/eng/common/sdl/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/arcade/eng/common/sdl/run-sdl.ps1 b/src/arcade/eng/common/sdl/run-sdl.ps1 deleted file mode 100644 index 2eac8c78f103..000000000000 --- a/src/arcade/eng/common/sdl/run-sdl.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $GdnFolder, - [string] $UpdateBaseline, - [string] $GuardianLoggerLevel='Standard' -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig' - Write-Host "Discovered Guardian config files:" - $gdnConfigFiles | Out-String | Write-Host - - Exec-BlockVerbosely { - & $GuardianCliLocation run ` - --working-directory $WorkingDirectory ` - --baseline mainbaseline ` - --update-baseline $UpdateBaseline ` - --logger-level $GuardianLoggerLevel ` - --config @gdnConfigFiles - Exit-IfNZEC "Sdl" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/templates-official/variables/pool-providers.yml b/src/arcade/eng/common/templates-official/variables/pool-providers.yml deleted file mode 100644 index 1f308b24efc4..000000000000 --- a/src/arcade/eng/common/templates-official/variables/pool-providers.yml +++ /dev/null @@ -1,45 +0,0 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, -# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. - -# Motivation: -# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS -# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing -# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template -# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. - -# How to use: -# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). -# If we find alternate naming conventions in broad usage it can be added to the condition below. -# -# First, import the template in an arcade-ified repo to pick up the variables, e.g.: -# -# variables: -# - template: /eng/common/templates-official/variables/pool-providers.yml -# -# ... then anywhere specifying the pool provider use the runtime variables, -# $(DncEngInternalBuildPool) -# -# pool: -# name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 - -variables: - # Coalesce the target and source branches so we know when a PR targets a release branch - # If these variables are somehow missing, fall back to main (tends to have more capacity) - - # Any new -Svc alternative pools should have variables added here to allow for splitting work - - - name: DncEngInternalBuildPool - value: $[ - replace( - replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore1ESPool-Svc-Internal' - ), - False, - 'NetCore1ESPool-Internal' - ) - ] \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml b/src/arcade/eng/common/templates-official/variables/sdl-variables.yml deleted file mode 100644 index dbdd66d4a4b3..000000000000 --- a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml +++ /dev/null @@ -1,7 +0,0 @@ -variables: -# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in -# sync with the packages.config file. -- name: DefaultGuardianVersion - value: 0.109.0 -- name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file From 55cf04a67ddf9d7bffe5297082dc0887f9e97302 Mon Sep 17 00:00:00 2001 From: "Jason Di (BEYONDSOFT CONSULTING INC)" Date: Fri, 13 Jun 2025 18:31:17 +0000 Subject: [PATCH 032/293] Merged PR 50859: Merge release/8.0.4xx to internal/release/8.0.4xx #### AI description (iteration 1) #### PR Classification This pull request is a branch merge incorporating release/8.0.4xx changes into the internal release branch, focusing on code cleanup and dependency updates. #### PR Summary The merge deprecates numerous obsolete build scripts and configuration files while updating dependency versions and related tooling configurations. - `src/arcade/eng/common`: Removed various PowerShell, shell, and configuration scripts no longer in use. - `Layout/redist/trustedroots/timestampctl.pem`: Added a new certificate block. - `eng/Version.Details.xml` and `eng/Versions.props`: Bumped dependency versions for Arcade, Helix, SignTool, dotnet-format, and templating assets. - `global.json` and `NuGet.config`: Updated MSBuild-SDKs, .NET tool versions, and added new package sources. - `Tests/trustedroots.Tests`: Updated inline certificate fingerprint entries for code signing and timestamping tests. --- NuGet.config | 2 + eng/Version.Details.xml | 38 +-- eng/Versions.props | 10 +- global.json | 6 +- .../redist/trustedroots/timestampctl.pem | 35 +++ .../GivenCodeSigningCtlFile.cs | 1 + .../GivenTimestampingCtlFile.cs | 3 + .../build-configuration.json | 4 - .../eng/common/PSScriptAnalyzerSettings.psd1 | 11 - src/arcade/eng/common/README.md | 28 -- .../eng/common/cross/arm/tizen/tizen.patch | 9 - .../eng/common/cross/armel/tizen/tizen.patch | 9 - .../eng/common/cross/x64/tizen/tizen.patch | 9 - .../eng/common/cross/x86/tizen/tizen.patch | 9 - src/arcade/eng/common/dotnet-install.cmd | 2 - src/arcade/eng/common/dotnet-install.ps1 | 28 -- .../common/enable-cross-org-publishing.ps1 | 13 - src/arcade/eng/common/generate-locproject.ps1 | 189 ------------- src/arcade/eng/common/generate-sbom-prep.ps1 | 29 -- src/arcade/eng/common/init-tools-native.cmd | 3 - src/arcade/eng/common/init-tools-native.ps1 | 203 -------------- src/arcade/eng/common/init-tools-native.sh | 238 ---------------- .../eng/common/internal-feed-operations.ps1 | 132 --------- .../eng/common/internal-feed-operations.sh | 141 ---------- src/arcade/eng/common/internal/NuGet.config | 7 - .../common/loc/P22DotNetHtmlLocalization.lss | 29 -- src/arcade/eng/common/msbuild.ps1 | 28 -- src/arcade/eng/common/msbuild.sh | 58 ---- .../eng/common/native/common-library.sh | 172 ------------ .../eng/common/native/install-cmake-test.sh | 117 -------- src/arcade/eng/common/native/install-cmake.sh | 117 -------- src/arcade/eng/common/native/install-tool.ps1 | 132 --------- .../eng/common/pipeline-logging-functions.ps1 | 260 ------------------ .../eng/common/pipeline-logging-functions.sh | 206 -------------- src/arcade/eng/common/retain-build.ps1 | 45 --- .../eng/common/sdl/configure-sdl-tool.ps1 | 130 --------- .../common/sdl/extract-artifact-archives.ps1 | 63 ----- .../common/sdl/extract-artifact-packages.ps1 | 82 ------ src/arcade/eng/common/sdl/packages.config | 4 - src/arcade/eng/common/sdl/run-sdl.ps1 | 49 ---- .../variables/pool-providers.yml | 45 --- .../variables/sdl-variables.yml | 7 - 42 files changed, 68 insertions(+), 2635 deletions(-) delete mode 100644 src/arcade/eng/common/BuildConfiguration/build-configuration.json delete mode 100644 src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 delete mode 100644 src/arcade/eng/common/README.md delete mode 100644 src/arcade/eng/common/cross/arm/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/armel/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/x64/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/x86/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/dotnet-install.cmd delete mode 100644 src/arcade/eng/common/dotnet-install.ps1 delete mode 100644 src/arcade/eng/common/enable-cross-org-publishing.ps1 delete mode 100644 src/arcade/eng/common/generate-locproject.ps1 delete mode 100644 src/arcade/eng/common/generate-sbom-prep.ps1 delete mode 100644 src/arcade/eng/common/init-tools-native.cmd delete mode 100644 src/arcade/eng/common/init-tools-native.ps1 delete mode 100644 src/arcade/eng/common/init-tools-native.sh delete mode 100644 src/arcade/eng/common/internal-feed-operations.ps1 delete mode 100644 src/arcade/eng/common/internal-feed-operations.sh delete mode 100644 src/arcade/eng/common/internal/NuGet.config delete mode 100644 src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss delete mode 100644 src/arcade/eng/common/msbuild.ps1 delete mode 100644 src/arcade/eng/common/msbuild.sh delete mode 100644 src/arcade/eng/common/native/common-library.sh delete mode 100644 src/arcade/eng/common/native/install-cmake-test.sh delete mode 100644 src/arcade/eng/common/native/install-cmake.sh delete mode 100644 src/arcade/eng/common/native/install-tool.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.sh delete mode 100644 src/arcade/eng/common/retain-build.ps1 delete mode 100644 src/arcade/eng/common/sdl/configure-sdl-tool.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-archives.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-packages.ps1 delete mode 100644 src/arcade/eng/common/sdl/packages.config delete mode 100644 src/arcade/eng/common/sdl/run-sdl.ps1 delete mode 100644 src/arcade/eng/common/templates-official/variables/pool-providers.yml delete mode 100644 src/arcade/eng/common/templates-official/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index ebddc6525042..f7d7609e6d80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -25,6 +26,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b66150630eb7..4680f00bde32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - b3dccb6b175963a35fb3c713ddd7a32e06658a5e + 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 - + https://github.com/dotnet/templating - b3dccb6b175963a35fb3c713ddd7a32e06658a5e + 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 - + https://github.com/dotnet/templating - b3dccb6b175963a35fb3c713ddd7a32e06658a5e + 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 @@ -77,9 +77,9 @@ e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - - https://dev.azure.com/dnceng/internal/_git/dotnet-format - 2e56b0d5d177375fc6d54c055025d16a7772724d + + https://github.com/dotnet/format + 64cbc6c3f71ff573a72b0c83c407612ad07d5c6e @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c + cee2d057118e3ad3c58a72a23271ad88b87d4d4d @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7951d63469ce..58d377b3cc8c 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.25264.2 + 8.0.0-beta.25310.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -115,7 +115,7 @@ - 8.3.626607 + 8.3.631204 @@ -141,13 +141,13 @@ - 8.0.411 + 8.0.412 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.411-servicing.25266.3 + 8.0.412-servicing.25311.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25264.2 + 8.0.0-beta.25310.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 76babd5acaf9..c1d4d016b412 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.116", + "dotnet": "8.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" } } diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index e11dc73a8817..7bb520e98647 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9257,6 +9257,41 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib oTM3VxKKcl+Yqg== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF0TCCA7mgAwIBAgIJAOOiocT+gaENMA0GCSqGSIb3DQEBDAUAMIGFMQswCQYD +VQQGEwJKUDEmMCQGA1UEChMdU0VDT00gVHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4x +MDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAy +MzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAwMTA0MDc4MTAeFw0yMzAxMjUwODMzNTla +Fw00ODAxMDEwODMzNTlaMIGFMQswCQYDVQQGEwJKUDEmMCQGA1UEChMdU0VDT00g +VHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4xMDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50 +IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAyMzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAw +MTA0MDc4MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKyMB9lGvBCA +99HZrvIqzl/AQy8EFLvxSLWA+13ZonAeMUhuSPxzfhwkuDs+vWXeKJSFQj0Xv0jf +Hc7n3e2Mjf26vP7IrCc8MWr8VFJ4LMM/TaTO+N5DwUBUY0bMStZhTakJF9jrultP +2N44hkoZTMfIKY07LsWkCj9NVteVHmWfrUzdd73Mf7847d4melxs6RL/8mbhcf0u +9oSZf6lRVJ5MjdJWMBOcWSrn6XwB6b0OzfAmy3Sopq508740UkFb55sKslKw19xa +lw5Djx/HLXcMpWlhlrDJgg30MLFSN8lFEqM9gD1fkLSpgL8O9QMzlbuRYiAOOiKJ +rzdGZOa+2lzxCPb8Yx6P0przBmPVpPm8qorYWO1sbtinx7B58poFVT5YyTzuWiw+ +smj5E0Dd1SRu7gR1PDJshuP1qHoy7KuffdqErctLEVak7mLCFJAlzPzjE3MdBH5I +pYJ/m2zOKI/S9a7RgM1iugOBsjuIRiNMQcNhFyMX5u+vA4mugQtTt9/pn/6rF1uP +t3rv/D4WJwFaBN0vBkRgWYqHqAZVavScRV4lfYAFan5nmLui9bZB8ufI+NBv1vkA +FuO3Lw1q/ob314Ae9bi9iu35pGSAYHEazp+Zbxsk5XGTGkk2W+gNiFgJJEp8YG+2 +OcLWcy6mZefRnQF3rPDs6Fe3qC77YzC5AgMBAAGjQjBAMB0GA1UdDgQWBBQB3bEk +MIksyAODXhCucR5J8u5LBzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQwFAAOCAgEAoyB4wkvZg/bXHSyvp5g/H+0AGKBsGNOGUpE3 +GF2ZC3lnw2KB8NFK2hkLfehaPl3mPGIC7cJdCR8lpAnCAtBuSDyhTEx+FUyM9cJz +x0Vefz8xEN5f4tYOmQl5QGpRNMkQZKbj9xRHbeDOWGD5lcXC/7NXIOhgqf1uBEWH +Kb6qz6fSsrC/JNSSEuyBE9h2l9A64G7CwhmZX9bjLBfTaMGZHB4iVjXEO7ZpoYYA +6yw8Y16vEn4IsHbJ62aBSvqefCKGWZGgu2BLNBfxdmLmd5IcHFaZPatcnusbE02+ +RmS94w28Ujb4MXGiPP0oHeiirO/a6ARKvep/6cBsPMxJzDpFXTUzXbnSFkHzLxCO +fCuWIVsO9VBkvRzvGzLhb7GwfqO0FGqhXZbZ/2d9+Bi2FOJ1yBI7xfdyUjygxROB +L3WRCWNqO4ZiTCC3t0sq40a9Fs4k07HNjp9vSVszNChBAhBXCOtCbuvUWGKNj1/t +xsCzmpgsBmlyOt+wTJhj+Rx5v0j+YzxJYbjKJVZ8It+/jkzwdwoRoF9UqrKzrX+o ++9+NAhnONLINiuw9ZbCt3b0f6oCi92u6QoI6WVH/ZW5IdfewXQbDuX16BJYSZ7Yt +2eSQnr+vfogU+t0XpB1s2QUEC03y6mcxBevoILtv/023F8U2/5Mukg0vtjwR1N4J +7abHqTo= +-----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu diff --git a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs index 41483b5c8e9c..f120e3770116 100644 --- a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs @@ -26,6 +26,7 @@ public GivenCodeSigningCtlFile() [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("552f7bdcf1a7af9e6ce672017f4f12abf77240c78e761ac203d1d9d20ac89988")] // CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("7353b6d6c2d6da4247773f3f07d075decb5134212bead0928ef1f46115260941")] // CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US [InlineData("7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf")] // CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("7b9d553e1c92cb6e8803e137f4f287d4363757f5d44b37d52f9fca22fb97df86")] // CN=GlobalSign Code Signing Root R45, O=GlobalSign nv-sa, C=BE diff --git a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs index 7d2f255c9479..43a5ef2bdf1e 100644 --- a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs @@ -23,13 +23,16 @@ public GivenTimestampingCtlFile() [InlineData("43df5774b03e7fef5fe40d931a7bedf1bb2e6b42738c4e6d3841103d3aa7f339")] // CN=Entrust Root Certification Authority - G2, OU="(c) 2009 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL + [InlineData("5d56499be4d2e08bcfcad08a3e38723d50503bde706948e42f55603019e528ae")] // CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US [InlineData("6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177")] // CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net [InlineData("6fff78e400a70c11011cd85977c459fb5af96a3df0540820d0f4b8607875e58f")] // CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, S=UT, C=US [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("8a866fd1b276b57e578e921c65828a2bed58e9f2f288054134b7f1f4bfc9cc74")] // CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM [InlineData("a45ede3bbbf09c8ae15c72efc07268d693a21c996fd51e67ca079460fd6d8873")] // CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM [InlineData("cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b")] // CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3 + [InlineData("d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4")] // CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB [InlineData("e793c9b02fd8aa13e21c31228accb08119643b749c898964b1746d46c3d4cbd2")] // CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, S=New Jersey, C=US + [InlineData("ebd41040e4bb3ec742c9e381d31ef2a41a48b6685c96e7cef3c1df6cd4331c99")] // CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE public void File_contains_certificates_used_in_NuGet_org_package_signatures(string expectedFingerprint) { VerifyCertificateExists(s_fingerprints, expectedFingerprint); diff --git a/src/arcade/eng/common/BuildConfiguration/build-configuration.json b/src/arcade/eng/common/BuildConfiguration/build-configuration.json deleted file mode 100644 index 3d1cc89894c9..000000000000 --- a/src/arcade/eng/common/BuildConfiguration/build-configuration.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "RetryCountLimit": 1, - "RetryByAnyError": false -} diff --git a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 b/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 deleted file mode 100644 index 4c1ea7c98ea4..000000000000 --- a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 +++ /dev/null @@ -1,11 +0,0 @@ -@{ - IncludeRules=@('PSAvoidUsingCmdletAliases', - 'PSAvoidUsingWMICmdlet', - 'PSAvoidUsingPositionalParameters', - 'PSAvoidUsingInvokeExpression', - 'PSUseDeclaredVarsMoreThanAssignments', - 'PSUseCmdletCorrectly', - 'PSStandardDSCFunctionsInResource', - 'PSUseIdenticalMandatoryParametersForDSC', - 'PSUseIdenticalParametersForDSC') -} \ No newline at end of file diff --git a/src/arcade/eng/common/README.md b/src/arcade/eng/common/README.md deleted file mode 100644 index ff49c371527a..000000000000 --- a/src/arcade/eng/common/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Don't touch this folder - - uuuuuuuuuuuuuuuuuuuu - u" uuuuuuuuuuuuuuuuuu "u - u" u$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ - $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ - $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ - $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ - $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$" u" - "u """""""""""""""""" u" - """""""""""""""""""" - -!!! Changes made in this directory are subject to being overwritten by automation !!! - -The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. diff --git a/src/arcade/eng/common/cross/arm/tizen/tizen.patch b/src/arcade/eng/common/cross/arm/tizen/tizen.patch deleted file mode 100644 index fb12ade7250a..000000000000 --- a/src/arcade/eng/common/cross/arm/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/src/arcade/eng/common/cross/armel/tizen/tizen.patch b/src/arcade/eng/common/cross/armel/tizen/tizen.patch deleted file mode 100644 index ca7c7c1ff751..000000000000 --- a/src/arcade/eng/common/cross/armel/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) diff --git a/src/arcade/eng/common/cross/x64/tizen/tizen.patch b/src/arcade/eng/common/cross/x64/tizen/tizen.patch deleted file mode 100644 index 56fbc881095b..000000000000 --- a/src/arcade/eng/common/cross/x64/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so ---- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf64-x86-64) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) ) diff --git a/src/arcade/eng/common/cross/x86/tizen/tizen.patch b/src/arcade/eng/common/cross/x86/tizen/tizen.patch deleted file mode 100644 index f4fe8838ad66..000000000000 --- a/src/arcade/eng/common/cross/x86/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-i386) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) ) diff --git a/src/arcade/eng/common/dotnet-install.cmd b/src/arcade/eng/common/dotnet-install.cmd deleted file mode 100644 index b1c2642e76f7..000000000000 --- a/src/arcade/eng/common/dotnet-install.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/src/arcade/eng/common/dotnet-install.ps1 b/src/arcade/eng/common/dotnet-install.ps1 deleted file mode 100644 index 811f0f717f73..000000000000 --- a/src/arcade/eng/common/dotnet-install.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [string] $architecture = '', - [string] $version = 'Latest', - [string] $runtime = 'dotnet', - [string] $RuntimeSourceFeed = '', - [string] $RuntimeSourceFeedKey = '' -) - -. $PSScriptRoot\tools.ps1 - -$dotnetRoot = Join-Path $RepoRoot '.dotnet' - -$installdir = $dotnetRoot -try { - if ($architecture -and $architecture.Trim() -eq 'x86') { - $installdir = Join-Path $installdir 'x86' - } - InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/enable-cross-org-publishing.ps1 b/src/arcade/eng/common/enable-cross-org-publishing.ps1 deleted file mode 100644 index da09da4f1fc4..000000000000 --- a/src/arcade/eng/common/enable-cross-org-publishing.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -param( - [string] $token -) - - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Write-PipelineSetVariable will no-op if a variable named $ci is not defined -# Since this script is only ever called in AzDO builds, just universally set it -$ci = $true - -Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false diff --git a/src/arcade/eng/common/generate-locproject.ps1 b/src/arcade/eng/common/generate-locproject.ps1 deleted file mode 100644 index 524aaa57f2b7..000000000000 --- a/src/arcade/eng/common/generate-locproject.ps1 +++ /dev/null @@ -1,189 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here - [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json - [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one - [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally -) - -# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: -# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task - -Set-StrictMode -Version 2.0 -$ErrorActionPreference = "Stop" -. $PSScriptRoot\pipeline-logging-functions.ps1 - -$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" -$exclusions = @{ Exclusions = @() } -if (Test-Path -Path $exclusionsFilePath) -{ - $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json -} - -Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work - -# Template files -$jsonFiles = @() -$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern -$jsonTemplateFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" - $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern - -$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them -if (-not $wxlFiles) { - $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files - if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } - } -} - -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files -$macosHtmlFiles = @() -if ($macosHtmlEnFiles) { - $macosHtmlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } -} - -$xlfFiles = @() - -$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" -$langXlfFiles = @() -if ($allXlfFiles) { - $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' - $firstLangCode = $Matches.1 - $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" -} -$langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" - $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles - -$locJson = @{ - Projects = @( - @{ - LanguageSet = $LanguageSet - LocItems = @( - $locFiles | ForEach-Object { - $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { - Remove-Item -Path $sourceFile - } - if ($continue) - { - if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" - } - } else { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnName" - OutputPath = $outputPath - } - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "WiX_CloneLanguages" - LssFiles = @( "wxl_loc.lss" ) - LocItems = @( - $wxlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if ($continue) - { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "VS_macOS_CloneLanguages" - LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) - LocItems = @( - $macosHtmlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - $lciFile = $sourceFile + ".lci" - if ($continue) { - $result = @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - if (Test-Path $lciFile -PathType Leaf) { - $result["LciFile"] = $lciFile - } - return $result - } - } - ) - } - ) -} - -$json = ConvertTo-Json $locJson -Depth 5 -Write-Host "LocProject.json generated:`n`n$json`n`n" -Pop-Location - -if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json -} -else { - New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - - if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { - Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." - - exit 1 - } - else { - Write-Host "Generated LocProject.json and current LocProject.json are identical." - } -} diff --git a/src/arcade/eng/common/generate-sbom-prep.ps1 b/src/arcade/eng/common/generate-sbom-prep.ps1 deleted file mode 100644 index a0c7d792a76f..000000000000 --- a/src/arcade/eng/common/generate-sbom-prep.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed -) - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' -$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName - -Write-Host "Artifact name before : $ArtifactName" -Write-Host "Artifact name after : $SafeArtifactName" - -Write-Host "Creating dir $ManifestDirPath" - -# create directory for sbom manifest to be placed -if (!(Test-Path -path $SbomGenerationDir)) -{ - New-Item -ItemType Directory -path $SbomGenerationDir - Write-Host "Successfully created directory $SbomGenerationDir" -} -else{ - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -} - -Write-Host "Updating artifact name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/src/arcade/eng/common/init-tools-native.cmd b/src/arcade/eng/common/init-tools-native.cmd deleted file mode 100644 index 438cd548c452..000000000000 --- a/src/arcade/eng/common/init-tools-native.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file diff --git a/src/arcade/eng/common/init-tools-native.ps1 b/src/arcade/eng/common/init-tools-native.ps1 deleted file mode 100644 index 27ccdb9ecc95..000000000000 --- a/src/arcade/eng/common/init-tools-native.ps1 +++ /dev/null @@ -1,203 +0,0 @@ -<# -.SYNOPSIS -Entry point script for installing native tools - -.DESCRIPTION -Reads $RepoRoot\global.json file to determine native assets to install -and executes installers for those tools - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER InstallDirectory -Directory to install native toolset. This is a command-line override for the default -Install directory precedence order: -- InstallDirectory command-line override -- NETCOREENG_INSTALL_DIRECTORY environment variable -- (default) %USERPROFILE%/.netcoreeng/native - -.PARAMETER Clean -Switch specifying to not install anything, but cleanup native asset folders - -.PARAMETER Force -Clean and then install tools - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.PARAMETER GlobalJsonFile -File path to global.json file - -.PARAMETER PathPromotion -Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) -or break the build if a native tool is not found on the path (on a local dev machine) - -.NOTES -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [string] $BaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external', - [string] $InstallDirectory, - [switch] $Clean = $False, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile, - [switch] $PathPromotion -) - -if (!$GlobalJsonFile) { - $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName 'global.json' -} - -Set-StrictMode -version 2.0 -$ErrorActionPreference='Stop' - -. $PSScriptRoot\pipeline-logging-functions.ps1 -Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq 'Continue' - - $EngCommonBaseDir = Join-Path $PSScriptRoot 'native\' - $NativeBaseDir = $InstallDirectory - if (!$NativeBaseDir) { - $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory - } - $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir - $InstallBin = Join-Path $NativeBaseDir 'bin' - $InstallerPath = Join-Path $EngCommonBaseDir 'install-tool.ps1' - - # Process tools list - Write-Host "Processing $GlobalJsonFile" - If (-Not (Test-Path $GlobalJsonFile)) { - Write-Host "Unable to find '$GlobalJsonFile'" - exit 0 - } - $NativeTools = Get-Content($GlobalJsonFile) -Raw | - ConvertFrom-Json | - Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue - if ($NativeTools) { - if ($PathPromotion -eq $True) { - $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" - if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $InstalledTools = @{} - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - if ($ToolVersion -eq "latest") { - $ToolVersion = "" - } - $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) - if ($ToolDirectories -eq $null) { - Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." - exit 1 - } - $ToolDirectory = $ToolDirectories[0] - $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" - if (-not (Test-Path -Path "$BinPathFile")) { - Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." - exit 1 - } - $BinPath = Get-Content "$BinPathFile" - $ToolPath = Convert-Path -Path $BinPath - Write-Host "Adding $ToolName to the path ($ToolPath)..." - Write-Host "##vso[task.prependpath]$ToolPath" - $env:PATH = "$ToolPath;$env:PATH" - $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } - } - } - return $InstalledTools - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." - } - } - exit 0 - } - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false - } - if ($showNativeToolsWarning) { - Write-Warning $errMsg - } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 - } - } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 - } - } - } - else { - Write-Host 'No native tools defined in global.json' - exit 0 - } - - if ($Clean) { - exit 0 - } - if (Test-Path $InstallBin) { - Write-Host 'Native tools are available from ' (Convert-Path -Path $InstallBin) - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" - return $InstallBin - } - elseif (-not ($PathPromotion)) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' - exit 1 - } - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/init-tools-native.sh b/src/arcade/eng/common/init-tools-native.sh deleted file mode 100644 index 3e6a8d6acf2f..000000000000 --- a/src/arcade/eng/common/init-tools-native.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' -install_directory='' -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 -global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" -declare -a native_assets - -. $scriptroot/pipeline-logging-functions.sh -. $scriptroot/native/common-library.sh - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installdirectory) - install_directory=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --donotabortonfailure) - donotabortonfailure=true - shift 1 - ;; - --donotdisplaywarnings) - donotdisplaywarnings=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --installdirectory Directory to install native toolset." - echo " This is a command-line override for the default" - echo " Install directory precedence order:" - echo " - InstallDirectory command-line override" - echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" - echo " - (default) %USERPROFILE%/.netcoreeng/native" - echo "" - echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" - echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" - echo " --force Clean and then install tools" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --baseuri Base URI for where to download native tools from" - echo " --downloadretries Number of times a download should be attempted" - echo " --retrywaittimeseconds Wait time between download attempts" - echo "" - exit 0 - ;; - esac -done - -function ReadGlobalJsonNativeTools { - # happy path: we have a proper JSON parsing tool `jq(1)` in PATH! - if command -v jq &> /dev/null; then - - # jq: read each key/value pair under "native-tools" entry and emit: - # KEY="" VALUE="" - # followed by a null byte. - # - # bash: read line with null byte delimeter and push to array (for later `eval`uation). - - while IFS= read -rd '' line; do - native_assets+=("$line") - done < <(jq -r '. | - select(has("native-tools")) | - ."native-tools" | - keys[] as $k | - @sh "KEY=\($k) VALUE=\(.[$k])\u0000"' "$global_json_file") - - return - fi - - # Warning: falling back to manually parsing JSON, which is not recommended. - - # Following routine matches the output and escaping logic of jq(1)'s @sh formatter used above. - # It has been tested with several weird strings with escaped characters in entries (key and value) - # and results were compared with the output of jq(1) in binary representation using xxd(1); - # just before the assignment to 'native_assets' array (above and below). - - # try to capture the section under "native-tools". - if [[ ! "$(cat "$global_json_file")" =~ \"native-tools\"[[:space:]\:\{]*([^\}]+) ]]; then - return - fi - - section="${BASH_REMATCH[1]}" - - parseStarted=0 - possibleEnd=0 - escaping=0 - escaped=0 - isKey=1 - - for (( i=0; i<${#section}; i++ )); do - char="${section:$i:1}" - if ! ((parseStarted)) && [[ "$char" =~ [[:space:],:] ]]; then continue; fi - - if ! ((escaping)) && [[ "$char" == "\\" ]]; then - escaping=1 - elif ((escaping)) && ! ((escaped)); then - escaped=1 - fi - - if ! ((parseStarted)) && [[ "$char" == "\"" ]]; then - parseStarted=1 - possibleEnd=0 - elif [[ "$char" == "'" ]]; then - token="$token'\\\''" - possibleEnd=0 - elif ((escaping)) || [[ "$char" != "\"" ]]; then - token="$token$char" - possibleEnd=1 - fi - - if ((possibleEnd)) && ! ((escaping)) && [[ "$char" == "\"" ]]; then - # Use printf to unescape token to match jq(1)'s @sh formatting rules. - # do not use 'token="$(printf "$token")"' syntax, as $() eats the trailing linefeed. - printf -v token "'$token'" - - if ((isKey)); then - KEY="$token" - isKey=0 - else - line="KEY=$KEY VALUE=$token" - native_assets+=("$line") - isKey=1 - fi - - # reset for next token - parseStarted=0 - token= - elif ((escaping)) && ((escaped)); then - escaping=0 - escaped=0 - fi - done -} - -native_base_dir=$install_directory -if [[ -z $install_directory ]]; then - native_base_dir=$(GetNativeInstallDirectory) -fi - -install_bin="${native_base_dir}/bin" -installed_any=false - -ReadGlobalJsonNativeTools - -if [[ ${#native_assets[@]} -eq 0 ]]; then - echo "No native tools defined in global.json" - exit 0; -else - native_installer_dir="$scriptroot/native" - for index in "${!native_assets[@]}"; do - eval "${native_assets["$index"]}" - - installer_path="$native_installer_dir/install-$KEY.sh" - installer_command="$installer_path" - installer_command+=" --baseuri $base_uri" - installer_command+=" --installpath $install_bin" - installer_command+=" --version $VALUE" - echo $installer_command - - if [[ $force = true ]]; then - installer_command+=" --force" - fi - - if [[ $clean = true ]]; then - installer_command+=" --clean" - fi - - if [[ -a $installer_path ]]; then - $installer_command - if [[ $? != 0 ]]; then - if [[ $donotabortonfailure = true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - exit 1 - fi - else - $installed_any = true - fi - else - if [[ $donotabortonfailure == true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - exit 1 - fi - fi - done -fi - -if [[ $clean = true ]]; then - exit 0 -fi - -if [[ -d $install_bin ]]; then - echo "Native tools are available from $install_bin" - echo "##vso[task.prependpath]$install_bin" -else - if [[ $installed_any = true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" - exit 1 - fi -fi - -exit 0 diff --git a/src/arcade/eng/common/internal-feed-operations.ps1 b/src/arcade/eng/common/internal-feed-operations.ps1 deleted file mode 100644 index 92b77347d990..000000000000 --- a/src/arcade/eng/common/internal-feed-operations.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $Operation, - [string] $AuthToken, - [string] $CommitSha, - [string] $RepoName, - [switch] $IsFeedPrivate -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -. $PSScriptRoot\tools.ps1 - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified -# internal builds -function SetupCredProvider { - param( - [string] $AuthToken - ) - - # Install the Cred Provider NuGet plugin - Write-Host 'Setting up Cred Provider NuGet plugin in the agent...' - Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' - - Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 - - Write-Host 'Installing plugin...' - .\installcredprovider.ps1 -Force - - Write-Host "Deleting local copy of 'installcredprovider.ps1'..." - Remove-Item .\installcredprovider.ps1 - - if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { - Write-PipelineTelemetryError -Category 'Arcade' -Message 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - } - else { - Write-Host 'CredProvider plugin was installed correctly!' - } - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - $nugetConfigPath = Join-Path $RepoRoot "NuGet.config" - - if (-Not (Test-Path -Path $nugetConfigPath)) { - Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' - ExitWithExitCode 1 - } - - $endpoints = New-Object System.Collections.ArrayList - $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} - - if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { - foreach ($stableRestoreResource in $nugetConfigPackageSources) { - $trimmedResource = ([string]$stableRestoreResource).Trim() - [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) - } - } - - if (($endpoints | Measure-Object).Count -gt 0) { - $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress - - # Create the environment variables the AzDo way - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ - 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' - 'issecret' = 'false' - } - - # We don't want sessions cached since we will be updating the endpoints quite frequently - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ - 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' - 'issecret' = 'false' - } - } - else - { - Write-Host 'No internal endpoints found in NuGet.config' - } -} - -#Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - $dotnetTempDir = Join-Path $RepoRoot "dotnet" - $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - $dotnet = "$dotnetTempDir\dotnet.exe" - $restoreProjPath = "$PSScriptRoot\restore.proj" - - Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - '' | Out-File "$restoreProjPath" - - & $dotnet restore $restoreProjPath - - Write-Host 'Arcade SDK restored!' - - if (Test-Path -Path $restoreProjPath) { - Remove-Item $restoreProjPath - } - - if (Test-Path -Path $dotnetTempDir) { - Remove-Item $dotnetTempDir -Recurse - } -} - -try { - Push-Location $PSScriptRoot - - if ($Operation -like 'setup') { - SetupCredProvider $AuthToken - } - elseif ($Operation -like 'install-restore') { - InstallDotNetSdkAndRestoreArcade - } - else { - Write-PipelineTelemetryError -Category 'Arcade' -Message "Unknown operation '$Operation'!" - ExitWithExitCode 1 - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Arcade' -Message $_ - ExitWithExitCode 1 -} -finally { - Pop-Location -} diff --git a/src/arcade/eng/common/internal-feed-operations.sh b/src/arcade/eng/common/internal-feed-operations.sh deleted file mode 100644 index 9378223ba095..000000000000 --- a/src/arcade/eng/common/internal-feed-operations.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. -# This should ONLY be called from identified internal builds -function SetupCredProvider { - local authToken=$1 - - # Install the Cred Provider NuGet plugin - echo "Setting up Cred Provider NuGet plugin in the agent..."... - echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" - - echo "Writing the contents of 'installcredprovider.ps1' locally..." - local installcredproviderPath="installcredprovider.sh" - if command -v curl > /dev/null; then - curl $url > "$installcredproviderPath" - else - wget -q -O "$installcredproviderPath" "$url" - fi - - echo "Installing plugin..." - . "$installcredproviderPath" - - echo "Deleting local copy of 'installcredprovider.sh'..." - rm installcredprovider.sh - - if [ ! -d "$HOME/.nuget/plugins" ]; then - Write-PipelineTelemetryError -category 'Build' 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - else - echo "CredProvider plugin was installed correctly!" - fi - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - local nugetConfigPath="{$repo_root}NuGet.config" - - if [ ! "$nugetConfigPath" ]; then - Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" - ExitWithExitCode 1 - fi - - local endpoints='[' - local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` - local pattern="value=\"(.*)\"" - - for value in $nugetConfigPackageValues - do - if [[ $value =~ $pattern ]]; then - local endpoint="${BASH_REMATCH[1]}" - endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," - fi - done - - endpoints=${endpoints%?} - endpoints+=']' - - if [ ${#endpoints} -gt 2 ]; then - local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" - - echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" - echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" - else - echo "No internal endpoints found in NuGet.config" - fi -} - -# Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - local dotnetTempDir="$repo_root/dotnet" - local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - local restoreProjPath="$repo_root/eng/common/restore.proj" - - echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - echo "" > "$restoreProjPath" - - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - local res=`$dotnetTempDir/dotnet restore $restoreProjPath` - echo "Arcade SDK restored!" - - # Cleanup - if [ "$restoreProjPath" ]; then - rm "$restoreProjPath" - fi - - if [ "$dotnetTempDir" ]; then - rm -r $dotnetTempDir - fi -} - -source="${BASH_SOURCE[0]}" -operation='' -authToken='' -repoName='' - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - --operation) - operation=$2 - shift - ;; - --authtoken) - authToken=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. "$scriptroot/tools.sh" - -if [ "$operation" = "setup" ]; then - SetupCredProvider $authToken -elif [ "$operation" = "install-restore" ]; then - InstallDotNetSdkAndRestoreArcade -else - echo "Unknown operation '$operation'!" -fi diff --git a/src/arcade/eng/common/internal/NuGet.config b/src/arcade/eng/common/internal/NuGet.config deleted file mode 100644 index 19d3d311b166..000000000000 --- a/src/arcade/eng/common/internal/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss b/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss deleted file mode 100644 index 5d892d619398..000000000000 --- a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.ps1 b/src/arcade/eng/common/msbuild.ps1 deleted file mode 100644 index f041e5ddd958..000000000000 --- a/src/arcade/eng/common/msbuild.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [bool] $warnAsError = $true, - [bool] $nodeReuse = $true, - [switch] $ci, - [switch] $prepareMachine, - [switch] $excludePrereleaseVS, - [string] $msbuildEngine = $null, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs -) - -. $PSScriptRoot\tools.ps1 - -try { - if ($ci) { - $nodeReuse = $false - } - - MSBuild @extraArgs -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Build' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.sh b/src/arcade/eng/common/msbuild.sh deleted file mode 100644 index 20d3dad54352..000000000000 --- a/src/arcade/eng/common/msbuild.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -verbosity='minimal' -warn_as_error=true -node_reuse=true -prepare_machine=false -extra_args='' - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --verbosity) - verbosity=$2 - shift 2 - ;; - --warnaserror) - warn_as_error=$2 - shift 2 - ;; - --nodereuse) - node_reuse=$2 - shift 2 - ;; - --ci) - ci=true - shift 1 - ;; - --preparemachine) - prepare_machine=true - shift 1 - ;; - *) - extra_args="$extra_args $1" - shift 1 - ;; - esac -done - -. "$scriptroot/tools.sh" - -if [[ "$ci" == true ]]; then - node_reuse=false -fi - -MSBuild $extra_args -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/native/common-library.sh b/src/arcade/eng/common/native/common-library.sh deleted file mode 100644 index 080c2c283ae4..000000000000 --- a/src/arcade/eng/common/native/common-library.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -function GetNativeInstallDirectory { - local install_dir - - if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then - install_dir=$HOME/.netcoreeng/native/ - else - install_dir=$NETCOREENG_INSTALL_DIRECTORY - fi - - echo $install_dir - return 0 -} - -function GetTempDirectory { - - echo $(GetNativeInstallDirectory)temp/ - return 0 -} - -function ExpandZip { - local zip_path=$1 - local output_directory=$2 - local force=${3:-false} - - echo "Extracting $zip_path to $output_directory" - if [[ -d $output_directory ]] && [[ $force = false ]]; then - echo "Directory '$output_directory' already exists, skipping extract" - return 0 - fi - - if [[ -d $output_directory ]]; then - echo "'Force flag enabled, but '$output_directory' exists. Removing directory" - rm -rf $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to remove '$output_directory'" - return 1 - fi - fi - - echo "Creating directory: '$output_directory'" - mkdir -p $output_directory - - echo "Extracting archive" - tar -xf $zip_path -C $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to extract '$zip_path'" - return 1 - fi - - return 0 -} - -function GetCurrentOS { - local unameOut="$(uname -s)" - case $unameOut in - Linux*) echo "Linux";; - Darwin*) echo "MacOS";; - esac - return 0 -} - -function GetFile { - local uri=$1 - local path=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - if [[ -f $path ]]; then - if [[ $force = false ]]; then - echo "File '$path' already exists. Skipping download" - return 0 - else - rm -rf $path - fi - fi - - if [[ -f $uri ]]; then - echo "'$uri' is a file path, copying file to '$path'" - cp $uri $path - return $? - fi - - echo "Downloading $uri" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail - else - wget -q -O "$path" "$uri" --tries="$download_retries" - fi - - return $? -} - -function GetTempPathFileName { - local path=$1 - - local temp_dir=$(GetTempDirectory) - local temp_file_name=$(basename $path) - echo $temp_dir$temp_file_name - return 0 -} - -function DownloadAndExtract { - local uri=$1 - local installDir=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - local temp_tool_path=$(GetTempPathFileName $uri) - - echo "downloading to: $temp_tool_path" - - # Download file - GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to download '$uri' to '$temp_tool_path'." - return 1 - fi - - # Extract File - echo "extracting from $temp_tool_path to $installDir" - ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to extract '$temp_tool_path' to '$installDir'." - return 1 - fi - - return 0 -} - -function NewScriptShim { - local shimpath=$1 - local tool_file_path=$2 - local force=${3:-false} - - echo "Generating '$shimpath' shim" - if [[ -f $shimpath ]]; then - if [[ $force = false ]]; then - echo "File '$shimpath' already exists." >&2 - return 1 - else - rm -rf $shimpath - fi - fi - - if [[ ! -f $tool_file_path ]]; then - # try to see if the path is lower cased - tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" - if [[ ! -f $tool_file_path ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist" - return 1 - fi - fi - - local shim_contents=$'#!/usr/bin/env bash\n' - shim_contents+="SHIMARGS="$'$1\n' - shim_contents+="$tool_file_path"$' $SHIMARGS\n' - - # Write shim file - echo "$shim_contents" > $shimpath - - chmod +x $shimpath - - echo "Finished generating shim '$shimpath'" - - return $? -} - diff --git a/src/arcade/eng/common/native/install-cmake-test.sh b/src/arcade/eng/common/native/install-cmake-test.sh deleted file mode 100644 index 8a5e7cf0db5a..000000000000 --- a/src/arcade/eng/common/native/install-cmake-test.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake-test" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-cmake.sh b/src/arcade/eng/common/native/install-cmake.sh deleted file mode 100644 index de496beebc5a..000000000000 --- a/src/arcade/eng/common/native/install-cmake.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-tool.ps1 b/src/arcade/eng/common/native/install-tool.ps1 deleted file mode 100644 index 78f2d84a4e4b..000000000000 --- a/src/arcade/eng/common/native/install-tool.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -<# -.SYNOPSIS -Install native tool - -.DESCRIPTION -Install cmake native tool from Azure blob storage - -.PARAMETER InstallPath -Base directory to install native tool to - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER CommonLibraryDirectory -Path to folder containing common library modules - -.PARAMETER Force -Force install of tools even if they previously exist - -.PARAMETER Clean -Don't install the tool, just clean up the current install of the tool - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.NOTES -Returns 0 if install succeeds, 1 otherwise -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [Parameter(Mandatory=$True)] - [string] $ToolName, - [Parameter(Mandatory=$True)] - [string] $InstallPath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [Parameter(Mandatory=$True)] - [string] $Version, - [string] $CommonLibraryDirectory = $PSScriptRoot, - [switch] $Force = $False, - [switch] $Clean = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 -) - -. $PSScriptRoot\..\pipeline-logging-functions.ps1 - -# Import common library modules -Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $Arch = CommonLibrary\Get-MachineArchitecture - $ToolOs = "win64" - if($Arch -Eq "x32") { - $ToolOs = "win32" - } - $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" - $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" - $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" - $ShimPath = Join-Path $InstallPath "$ToolName.exe" - - if ($Clean) { - Write-Host "Cleaning $ToolInstallDirectory" - if (Test-Path $ToolInstallDirectory) { - Remove-Item $ToolInstallDirectory -Force -Recurse - } - Write-Host "Cleaning $ShimPath" - if (Test-Path $ShimPath) { - Remove-Item $ShimPath -Force - } - $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri - Write-Host "Cleaning $ToolTempPath" - if (Test-Path $ToolTempPath) { - Remove-Item $ToolTempPath -Force - } - exit 0 - } - - # Install tool - if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { - Write-Verbose "$ToolName ($Version) already exists, skipping install" - } - else { - $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` - -InstallDirectory $ToolInstallDirectory ` - -Force:$Force ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Verbose:$Verbose - - if ($InstallStatus -Eq $False) { - Write-PipelineTelemetryError "Installation failed" -Category "NativeToolsetBootstrapping" - exit 1 - } - } - - $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } - if (@($ToolFilePath).Length -Gt 1) { - Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" - exit 1 - } elseif (@($ToolFilePath).Length -Lt 1) { - Write-Host "$ToolName was not found in $ToolInstallDirectory." - exit 1 - } - - # Generate shim - # Always rewrite shims so that we are referencing the expected version - $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` - -ShimDirectory $InstallPath ` - -ToolFilePath "$ToolFilePath" ` - -BaseUri $BaseUri ` - -Force:$Force ` - -Verbose:$Verbose - - if ($GenerateShimStatus -Eq $False) { - Write-PipelineTelemetryError "Generate shim failed" -Category "NativeToolsetBootstrapping" - return 1 - } - - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category "NativeToolsetBootstrapping" -Message $_ - exit 1 -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.ps1 b/src/arcade/eng/common/pipeline-logging-functions.ps1 deleted file mode 100644 index 8e422c561e4b..000000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.ps1 +++ /dev/null @@ -1,260 +0,0 @@ -# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. - -# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 - -$script:loggingCommandPrefix = '##vso[' -$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? - New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } - New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } - New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } - New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } -) -# TODO: BUG: Escape % ??? -# TODO: Add test to verify don't need to escape "=". - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTelemetryError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Category, - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force) - - $PSBoundParameters.Remove('Category') | Out-Null - - if ($Force -Or ((Test-Path variable:ci) -And $ci)) { - $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" - } - $PSBoundParameters.Remove('Message') | Out-Null - $PSBoundParameters.Add('Message', $Message) - Write-PipelineTaskError @PSBoundParameters -} - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTaskError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force - ) - - if (!$Force -And (-Not (Test-Path variable:ci) -Or !$ci)) { - if ($Type -eq 'error') { - Write-Host $Message -ForegroundColor Red - return - } - elseif ($Type -eq 'warning') { - Write-Host $Message -ForegroundColor Yellow - return - } - } - - if (($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return - } - $PSBoundParameters.Remove('Force') | Out-Null - if (-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') - } - Write-LogIssue @PSBoundParameters -} - -function Write-PipelineSetVariable { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Name, - [string]$Value, - [switch]$Secret, - [switch]$AsOutput, - [bool]$IsMultiJobVariable = $true) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ - 'variable' = $Name - 'isSecret' = $Secret - 'isOutput' = $IsMultiJobVariable - } -AsOutput:$AsOutput - } -} - -function Write-PipelinePrependPath { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Path, - [switch]$AsOutput) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput - } -} - -function Write-PipelineSetResult { - [CmdletBinding()] - param( - [ValidateSet("Succeeded", "SucceededWithIssues", "Failed", "Cancelled", "Skipped")] - [Parameter(Mandatory = $true)] - [string]$Result, - [string]$Message) - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'complete' -Data $Message -Properties @{ - 'result' = $Result - } - } -} - -<######################################## -# Private functions. -########################################> -function Format-LoggingCommandData { - [CmdletBinding()] - param([string]$Value, [switch]$Reverse) - - if (!$Value) { - return '' - } - - if (!$Reverse) { - foreach ($mapping in $script:loggingCommandEscapeMappings) { - $Value = $Value.Replace($mapping.Token, $mapping.Replacement) - } - } - else { - for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { - $mapping = $script:loggingCommandEscapeMappings[$i] - $Value = $Value.Replace($mapping.Replacement, $mapping.Token) - } - } - - return $Value -} - -function Format-LoggingCommand { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Area, - [Parameter(Mandatory = $true)] - [string]$Event, - [string]$Data, - [hashtable]$Properties) - - # Append the preamble. - [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder - $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) - - # Append the properties. - if ($Properties) { - $first = $true - foreach ($key in $Properties.Keys) { - [string]$value = Format-LoggingCommandData $Properties[$key] - if ($value) { - if ($first) { - $null = $sb.Append(' ') - $first = $false - } - else { - $null = $sb.Append(';') - } - - $null = $sb.Append("$key=$value") - } - } - } - - # Append the tail and output the value. - $Data = Format-LoggingCommandData $Data - $sb.Append(']').Append($Data).ToString() -} - -function Write-LoggingCommand { - [CmdletBinding(DefaultParameterSetName = 'Parameters')] - param( - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Area, - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Event, - [Parameter(ParameterSetName = 'Parameters')] - [string]$Data, - [Parameter(ParameterSetName = 'Parameters')] - [hashtable]$Properties, - [Parameter(Mandatory = $true, ParameterSetName = 'Object')] - $Command, - [switch]$AsOutput) - - if ($PSCmdlet.ParameterSetName -eq 'Object') { - Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput - return - } - - $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties - if ($AsOutput) { - $command - } - else { - Write-Host $command - } -} - -function Write-LogIssue { - [CmdletBinding()] - param( - [ValidateSet('warning', 'error')] - [Parameter(Mandatory = $true)] - [string]$Type, - [string]$Message, - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ - 'type' = $Type - 'code' = $ErrCode - 'sourcepath' = $SourcePath - 'linenumber' = $LineNumber - 'columnnumber' = $ColumnNumber - } - if ($AsOutput) { - return $command - } - - if ($Type -eq 'error') { - $foregroundColor = $host.PrivateData.ErrorForegroundColor - $backgroundColor = $host.PrivateData.ErrorBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Red - $backgroundColor = [System.ConsoleColor]::Black - } - } - else { - $foregroundColor = $host.PrivateData.WarningForegroundColor - $backgroundColor = $host.PrivateData.WarningBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Yellow - $backgroundColor = [System.ConsoleColor]::Black - } - } - - Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.sh b/src/arcade/eng/common/pipeline-logging-functions.sh deleted file mode 100644 index 6a0b2255e911..000000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.sh +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env bash - -function Write-PipelineTelemetryError { - local telemetry_category='' - local force=false - local function_args=() - local message='' - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -category|-c) - telemetry_category=$2 - shift - ;; - -force|-f) - force=true - ;; - -*) - function_args+=("$1 $2") - shift - ;; - *) - message=$* - ;; - esac - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$message" >&2 - return - fi - - if [[ $force == true ]]; then - function_args+=("-force") - fi - message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" - function_args+=("$message") - Write-PipelineTaskError ${function_args[@]} -} - -function Write-PipelineTaskError { - local message_type="error" - local sourcepath='' - local linenumber='' - local columnnumber='' - local error_code='' - local force=false - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -type|-t) - message_type=$2 - shift - ;; - -sourcepath|-s) - sourcepath=$2 - shift - ;; - -linenumber|-ln) - linenumber=$2 - shift - ;; - -columnnumber|-cn) - columnnumber=$2 - shift - ;; - -errcode|-e) - error_code=$2 - shift - ;; - -force|-f) - force=true - ;; - *) - break - ;; - esac - - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$@" >&2 - return - fi - - local message="##vso[task.logissue" - - message="$message type=$message_type" - - if [ -n "$sourcepath" ]; then - message="$message;sourcepath=$sourcepath" - fi - - if [ -n "$linenumber" ]; then - message="$message;linenumber=$linenumber" - fi - - if [ -n "$columnnumber" ]; then - message="$message;columnnumber=$columnnumber" - fi - - if [ -n "$error_code" ]; then - message="$message;code=$error_code" - fi - - message="$message]$*" - echo "$message" -} - -function Write-PipelineSetVariable { - if [[ "$ci" != true ]]; then - return - fi - - local name='' - local value='' - local secret=false - local as_output=false - local is_multi_job_variable=true - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -name|-n) - name=$2 - shift - ;; - -value|-v) - value=$2 - shift - ;; - -secret|-s) - secret=true - ;; - -as_output|-a) - as_output=true - ;; - -is_multi_job_variable|-i) - is_multi_job_variable=$2 - shift - ;; - esac - shift - done - - value=${value/;/%3B} - value=${value/\\r/%0D} - value=${value/\\n/%0A} - value=${value/]/%5D} - - local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" - - if [[ "$as_output" == true ]]; then - $message - else - echo "$message" - fi -} - -function Write-PipelinePrependPath { - local prepend_path='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -path|-p) - prepend_path=$2 - shift - ;; - esac - shift - done - - export PATH="$prepend_path:$PATH" - - if [[ "$ci" == true ]]; then - echo "##vso[task.prependpath]$prepend_path" - fi -} - -function Write-PipelineSetResult { - local result='' - local message='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -result|-r) - result=$2 - shift - ;; - -message|-m) - message=$2 - shift - ;; - esac - shift - done - - if [[ "$ci" == true ]]; then - echo "##vso[task.complete result=$result;]$message" - fi -} diff --git a/src/arcade/eng/common/retain-build.ps1 b/src/arcade/eng/common/retain-build.ps1 deleted file mode 100644 index e7ba975adeb6..000000000000 --- a/src/arcade/eng/common/retain-build.ps1 +++ /dev/null @@ -1,45 +0,0 @@ - -Param( -[Parameter(Mandatory=$true)][int] $buildId, -[Parameter(Mandatory=$true)][string] $azdoOrgUri, -[Parameter(Mandatory=$true)][string] $azdoProject, -[Parameter(Mandatory=$true)][string] $token -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -function Get-AzDOHeaders( - [string] $token) -{ - $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) - $headers = @{"Authorization"="Basic $base64AuthInfo"} - return $headers -} - -function Update-BuildRetention( - [string] $azdoOrgUri, - [string] $azdoProject, - [int] $buildId, - [string] $token) -{ - $headers = Get-AzDOHeaders -token $token - $requestBody = "{ - `"keepForever`": `"true`" - }" - - $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" - write-Host "Attempting to retain build using the following URI: ${requestUri} ..." - - try { - Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" - Write-Host "Updated retention settings for build ${buildId}." - } - catch { - Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" - exit 1 - } -} - -Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token -exit 0 diff --git a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 b/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 deleted file mode 100644 index 27f5a4115fc7..000000000000 --- a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 +++ /dev/null @@ -1,130 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $TargetDirectory, - [string] $GdnFolder, - # The list of Guardian tools to configure. For each object in the array: - # - If the item is a [hashtable], it must contain these entries: - # - Name = The tool name as Guardian knows it. - # - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique - # among all tool entries with the same Name. - # - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")' - # - If the item is a [string] $v, it is treated as '@{ Name="$v" }' - [object[]] $ToolsList, - [string] $GuardianLoggerLevel='Standard', - # Optional: Additional params to add to any tool using CredScan. - [string[]] $CrScanAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using PoliCheck. - [string[]] $PoliCheckAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using CodeQL/Semmle. - [string[]] $CodeQLAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using Binskim. - [string[]] $BinskimAdditionalRunConfigParams -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # Normalize tools list: all in [hashtable] form with defined values for each key. - $ToolsList = $ToolsList | - ForEach-Object { - if ($_ -is [string]) { - $_ = @{ Name = $_ } - } - - if (-not ($_['Scenario'])) { $_.Scenario = "" } - if (-not ($_['Args'])) { $_.Args = @() } - $_ - } - - Write-Host "List of tools to configure:" - $ToolsList | ForEach-Object { $_ | Out-String | Write-Host } - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - foreach ($tool in $ToolsList) { - # Put together the name and scenario to make a unique key. - $toolConfigName = $tool.Name - if ($tool.Scenario) { - $toolConfigName += "_" + $tool.Scenario - } - - Write-Host "=== Configuring $toolConfigName..." - - $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" - - # For some tools, add default and automatic args. - switch -Exact ($tool.Name) { - 'credscan' { - if ($targetDirectory) { - $tool.Args += "`"TargetDirectory < $TargetDirectory`"" - } - $tool.Args += "`"OutputType < pre`"" - $tool.Args += $CrScanAdditionalRunConfigParams - } - 'policheck' { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" - } - $tool.Args += $PoliCheckAdditionalRunConfigParams - } - {$_ -in 'semmle', 'codeql'} { - if ($targetDirectory) { - $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" - } - $tool.Args += $CodeQLAdditionalRunConfigParams - } - 'binskim' { - if ($targetDirectory) { - # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. - # We are excluding all `_.pdb` files from the scan. - $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" - } - $tool.Args += $BinskimAdditionalRunConfigParams - } - } - - # Create variable pointing to the args array directly so we can use splat syntax later. - $toolArgs = $tool.Args - - # Configure the tool. If args array is provided or the current tool has some default arguments - # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}", - # one per parameter. Doc page for "guardian configure": - # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure - Exec-BlockVerbosely { - & $GuardianCliLocation configure ` - --working-directory $WorkingDirectory ` - --tool $tool.Name ` - --output-path $gdnConfigFile ` - --logger-level $GuardianLoggerLevel ` - --noninteractive ` - --force ` - $(if ($toolArgs) { "--args" }) @toolArgs - Exit-IfNZEC "Sdl" - } - - Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 b/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 deleted file mode 100644 index 68da4fbf2571..000000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -# This script looks for each archive file in a directory and extracts it into the target directory. -# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**". -# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip. -param( - # Full path to directory where archives are stored. - [Parameter(Mandatory=$true)][string] $InputPath, - # Full path to directory to extract archives into. May be the same as $InputPath. - [Parameter(Mandatory=$true)][string] $ExtractPath -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - Measure-Command { - $jobs = @() - - # Find archive files for non-Windows and Windows builds. - $archiveFiles = @( - Get-ChildItem (Join-Path $InputPath "*.tar.gz") - Get-ChildItem (Join-Path $InputPath "*.zip") - ) - - foreach ($targzFile in $archiveFiles) { - $jobs += Start-Job -ScriptBlock { - $file = $using:targzFile - $fileName = [System.IO.Path]::GetFileName($file) - $extractDir = Join-Path $using:ExtractPath "$fileName.extracted" - - New-Item $extractDir -ItemType Directory -Force | Out-Null - - Write-Host "Extracting '$file' to '$extractDir'..." - - # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early. - # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the - # error. Save output so it can be stored in the exception string along with context. - $output = tar -xf $file -C $extractDir 2>&1 - # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we - # don't have access to the outer scope. - if ($LASTEXITCODE -ne 0) { - throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'" - } - - Write-Host "Extracted to $extractDir" - } - } - - Receive-Job $jobs -Wait - } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 b/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 deleted file mode 100644 index f031ed5b25e9..000000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 +++ /dev/null @@ -1,82 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored - [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -function ExtractArtifacts { - if (!(Test-Path $InputPath)) { - Write-Host "Input Path does not exist: $InputPath" - ExitWithExitCode 0 - } - $Jobs = @() - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - $ExtractPackage = { - param( - [string] $PackagePath # Full path to a NuGet package - ) - - if (!(Test-Path $PackagePath)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - $RelevantExtensions = @('.dll', '.exe', '.pdb') - Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) - [System.IO.Directory]::CreateDirectory($TargetPath); - - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) - } - } - catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 - } - finally { - $zip.Dispose() - } - } - Measure-Command { ExtractArtifacts } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/packages.config b/src/arcade/eng/common/sdl/packages.config deleted file mode 100644 index e5f543ea68c2..000000000000 --- a/src/arcade/eng/common/sdl/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/arcade/eng/common/sdl/run-sdl.ps1 b/src/arcade/eng/common/sdl/run-sdl.ps1 deleted file mode 100644 index 2eac8c78f103..000000000000 --- a/src/arcade/eng/common/sdl/run-sdl.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $GdnFolder, - [string] $UpdateBaseline, - [string] $GuardianLoggerLevel='Standard' -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig' - Write-Host "Discovered Guardian config files:" - $gdnConfigFiles | Out-String | Write-Host - - Exec-BlockVerbosely { - & $GuardianCliLocation run ` - --working-directory $WorkingDirectory ` - --baseline mainbaseline ` - --update-baseline $UpdateBaseline ` - --logger-level $GuardianLoggerLevel ` - --config @gdnConfigFiles - Exit-IfNZEC "Sdl" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/templates-official/variables/pool-providers.yml b/src/arcade/eng/common/templates-official/variables/pool-providers.yml deleted file mode 100644 index 1f308b24efc4..000000000000 --- a/src/arcade/eng/common/templates-official/variables/pool-providers.yml +++ /dev/null @@ -1,45 +0,0 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, -# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. - -# Motivation: -# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS -# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing -# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template -# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. - -# How to use: -# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). -# If we find alternate naming conventions in broad usage it can be added to the condition below. -# -# First, import the template in an arcade-ified repo to pick up the variables, e.g.: -# -# variables: -# - template: /eng/common/templates-official/variables/pool-providers.yml -# -# ... then anywhere specifying the pool provider use the runtime variables, -# $(DncEngInternalBuildPool) -# -# pool: -# name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 - -variables: - # Coalesce the target and source branches so we know when a PR targets a release branch - # If these variables are somehow missing, fall back to main (tends to have more capacity) - - # Any new -Svc alternative pools should have variables added here to allow for splitting work - - - name: DncEngInternalBuildPool - value: $[ - replace( - replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore1ESPool-Svc-Internal' - ), - False, - 'NetCore1ESPool-Internal' - ) - ] \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml b/src/arcade/eng/common/templates-official/variables/sdl-variables.yml deleted file mode 100644 index dbdd66d4a4b3..000000000000 --- a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml +++ /dev/null @@ -1,7 +0,0 @@ -variables: -# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in -# sync with the packages.config file. -- name: DefaultGuardianVersion - value: 0.109.0 -- name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file From da7a6c1b0910fba30b71ebb12a1a43bf89566482 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jun 2025 02:01:41 +0000 Subject: [PATCH 033/293] Update dependencies from https://github.com/dotnet/msbuild build 20250613.10 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.29-servicing-25223-08 -> To Version 17.10.32-servicing-25313-10 --- NuGet.config | 27 ++++++++++++++++++++++----- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 89bbecaf0641..019f4a1e188c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,26 +5,38 @@ + + + + + + - + + + + + + + @@ -51,23 +63,28 @@ + + + - - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33a794c01eb2..0e132d3653ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 + + https://github.com/dotnet/msbuild + bb7294f72e2779834a7898b8d7f1d8c54eac9845 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 + + https://github.com/dotnet/msbuild + bb7294f72e2779834a7898b8d7f1d8c54eac9845 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 + + https://github.com/dotnet/msbuild + bb7294f72e2779834a7898b8d7f1d8c54eac9845 diff --git a/eng/Versions.props b/eng/Versions.props index 2ca2f13704bc..1b2484e24d75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.29 + 17.10.32 $(MicrosoftBuildPackageVersion) - + - - - @@ -76,7 +73,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb86f2824d5..c7d8cb3e1d5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 697aa47dfb80..84b8f2ae3429 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 @@ -98,8 +98,8 @@ 9.0.7 9.0.7 8.0.0-rc.1.23414.4 - 9.0.7-servicing.25311.18 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 From e9fab58ffdcfa6c2bee3f495b98778e75de59ba0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 01:23:29 +0000 Subject: [PATCH 035/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250616.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.7 -> To Version 9.0.7 --- NuGet.config | 7 ++----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index b9c6737f5dd3..291e7c5be7ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -38,13 +38,10 @@ - - - - + @@ -79,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb86f2824d5..3855fef9f993 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,20 +256,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c31f574f88e395456cec657c7ccb90fe32e0c56 + fe72c97cc05b32083e2f2904c55e609a8ace559c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c31f574f88e395456cec657c7ccb90fe32e0c56 + fe72c97cc05b32083e2f2904c55e609a8ace559c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c31f574f88e395456cec657c7ccb90fe32e0c56 + fe72c97cc05b32083e2f2904c55e609a8ace559c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c31f574f88e395456cec657c7ccb90fe32e0c56 + fe72c97cc05b32083e2f2904c55e609a8ace559c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 697aa47dfb80..737ef41a8267 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,8 +130,8 @@ - 9.0.7-servicing.25312.1 - 9.0.7-servicing.25312.1 + 9.0.7-servicing.25316.2 + 9.0.7-servicing.25316.2 9.0.7 9.0.7 From 810266906b097ffa412dd3c226ae78c6e686d62a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jun 2025 02:02:38 +0000 Subject: [PATCH 036/293] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250616.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25269.2 -> To Version 8.0.0-alpha.1.25316.2 --- NuGet.config | 28 ---------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe315ad741d2..71ff778d4fe2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,19 +3,11 @@ - - - - - - - - @@ -23,19 +15,11 @@ - - - - - - - - @@ -60,10 +44,6 @@ - - - - @@ -71,16 +51,8 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b147abb0e05..8f9f6af60dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - cee2d057118e3ad3c58a72a23271ad88b87d4d4d + 3827e68e002064268d4be4b2d1d96048f9794808 From 5b10bf007cde40e0d910af8da958a6c77e5e2f4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jun 2025 02:02:50 +0000 Subject: [PATCH 037/293] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250616.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25269.2 -> To Version 8.0.0-alpha.1.25316.2 --- NuGet.config | 28 ---------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 019f4a1e188c..c9905637a82f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,11 @@ - - - - - - - - @@ -24,19 +16,11 @@ - - - - - - - - @@ -63,10 +47,6 @@ - - - - @@ -76,16 +56,8 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e132d3653ab..9fd3e5dacaa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - cee2d057118e3ad3c58a72a23271ad88b87d4d4d + 3827e68e002064268d4be4b2d1d96048f9794808 From e86068c1abdb4a6d8461c21ecc223725d3967a0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jun 2025 02:03:08 +0000 Subject: [PATCH 038/293] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250616.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25269.2 -> To Version 8.0.0-alpha.1.25316.2 --- NuGet.config | 31 ------------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb9980d433b8..5f250b1a29c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,38 +4,22 @@ - - - - - - - - - - - - - - - - @@ -62,29 +46,14 @@ - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e993a31c832d..93cc73288f7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - cee2d057118e3ad3c58a72a23271ad88b87d4d4d + 3827e68e002064268d4be4b2d1d96048f9794808 From cb98507892bc591718ea7da888ab1243018e9d93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jun 2025 03:53:17 +0000 Subject: [PATCH 039/293] Update dependencies from https://github.com/dotnet/templating build 20250616.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25310.1 -> To Version 8.0.118-servicing.25316.3 --- NuGet.config | 30 +----------------------------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe315ad741d2..edc3f8014a79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,19 +3,11 @@ - - - - - - - - @@ -23,19 +15,11 @@ - - - - - + - - - - @@ -60,10 +44,6 @@ - - - - @@ -71,16 +51,8 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b147abb0e05..c6cea9458d2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 2a22f253451da18c9a91ce33d11afbb13d8bfc32 + 792298e571e22f47422178c2b08e59554d3499a5 - + https://github.com/dotnet/templating - 2a22f253451da18c9a91ce33d11afbb13d8bfc32 + 792298e571e22f47422178c2b08e59554d3499a5 - + https://github.com/dotnet/templating - 2a22f253451da18c9a91ce33d11afbb13d8bfc32 + 792298e571e22f47422178c2b08e59554d3499a5 diff --git a/eng/Versions.props b/eng/Versions.props index cb234f67a6e3..a1a1b5a85b97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25310.1 + 8.0.118-servicing.25316.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f4defa43ebb2ecd30d6d8d5d6dcbc1e30a53525a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 17:31:03 +0000 Subject: [PATCH 040/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250617.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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.7-servicing.25311.15 -> To Version 9.0.7-servicing.25317.2 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index d542447b00ec..02a2c82aaf65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7d8cb3e1d5d..44ab14fecf7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3720a89385f75c4a2edd7eb6d1d449c856670faa + f6b3a5da75eb405046889a5447ec9b14cc29d285 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 84b8f2ae3429..2c0c85bb0925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.7 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 9.0.7 9.0.7 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 - 9.0.7-servicing.25311.15 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 + 9.0.7-servicing.25317.2 From 7e32cc44645b7550e8fddb1ff068a0ffcdd8f65b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 18:42:31 +0000 Subject: [PATCH 041/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250617.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.7 -> To Version 9.0.7 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.7-rtm.25312.2 -> To Version 9.0.7-rtm.25317.1 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 291e7c5be7ed..8854e1570ffb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3855fef9f993..00dd41389597 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fe72c97cc05b32083e2f2904c55e609a8ace559c + bd9e6e960b9e9f00df0462574638f54e80734b7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fe72c97cc05b32083e2f2904c55e609a8ace559c + bd9e6e960b9e9f00df0462574638f54e80734b7c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fe72c97cc05b32083e2f2904c55e609a8ace559c + bd9e6e960b9e9f00df0462574638f54e80734b7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fe72c97cc05b32083e2f2904c55e609a8ace559c + bd9e6e960b9e9f00df0462574638f54e80734b7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f2fe4899318aaf1a6bfab64a90e142addd46487 + 7ac13333cf0a6ba33b4be231673080313e752e6a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ef2a3107f7abdeb18ac152197e4e6f37f0625f76 + 839ce1ed3f4e73f8628ba24f48660ecebd99824e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f2fe4899318aaf1a6bfab64a90e142addd46487 + 7ac13333cf0a6ba33b4be231673080313e752e6a https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 737ef41a8267..9576f12fdd5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.7-servicing.25312.5 + 9.0.7-servicing.25316.4 @@ -130,8 +130,8 @@ - 9.0.7-servicing.25316.2 - 9.0.7-servicing.25316.2 + 9.0.7-servicing.25317.1 + 9.0.7-servicing.25317.1 9.0.7 9.0.7 @@ -237,8 +237,8 @@ - 9.0.7-rtm.25312.2 - 9.0.7-rtm.25312.2 + 9.0.7-rtm.25317.1 + 9.0.7-rtm.25317.1 From bd449744452ef0314097ba737877543bced14b1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 19:11:47 +0000 Subject: [PATCH 042/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250617.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25313.2 -> To Version 8.0.18-servicing.25317.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 26546067ff7c..e1b47e055b7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcf6f06e29ac..6f5853b20ee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 + 480ddbb714f16a09b74e75cff57e1da769e9d82d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 001fe0faf177..758d8833bc35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,7 +181,7 @@ - 8.0.18-servicing.25313.2 + 8.0.18-servicing.25317.3 From 96f34dbcf222ef3599d7834fb4228f9c99bdac32 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 19:11:48 +0000 Subject: [PATCH 043/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250617.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25313.2 -> To Version 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index f7d7609e6d80..6b573620846f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,6 @@ - - - - - - @@ -27,13 +21,9 @@ - - - - - + @@ -64,19 +54,13 @@ - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4680f00bde32..6000d3d7b527 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 + 480ddbb714f16a09b74e75cff57e1da769e9d82d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 58d377b3cc8c..fb6129c1f125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.18-servicing.25313.2 + 8.0.18-servicing.25317.3 From 6c4256bf70dae1e5df62fcc42783a87dc76d7f34 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 19:11:50 +0000 Subject: [PATCH 044/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250617.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.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25313.2 -> To Version 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0abfbbc6ab01..1062dcc30f5e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,6 @@ - - - - - - @@ -27,13 +21,9 @@ - - - - - + @@ -67,19 +57,13 @@ - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e98a3e8b9178..926e0f5d335f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0bec0d55c9b799a612a838e8887d710bbeed487b + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c8ef90c1fc2ee2778b82b40148c04cd4880e0c35 + 480ddbb714f16a09b74e75cff57e1da769e9d82d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0554e4983a2c..5d7998980fdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.18-servicing.25313.2 + 8.0.18-servicing.25317.3 From 4b3937f548da122188fc204c0b708365a98c19d1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 20:59:52 +0000 Subject: [PATCH 045/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250617.6 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.18-servicing.25311.13 -> To Version 8.0.18-servicing.25317.6 --- 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 e1b47e055b7c..07b1d99ab09e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f5853b20ee0..ace40d0f7843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 758d8833bc35..b4241e535d9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,11 +166,11 @@ 8.0.18 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 8.0.18 From 5aaa7e2f32b93e475fd8a2ff708e1f6c603d362b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 20:59:53 +0000 Subject: [PATCH 046/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250617.6 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.18-servicing.25311.13 -> To Version 8.0.18-servicing.25317.6 --- 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 1062dcc30f5e..2b70e6ed8e91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 926e0f5d335f..d155a4e63030 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 - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5d7998980fdf..4be5980dde1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.18 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 8.0.18 From 0879a24661716f3f846b514d0552d14d65608510 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 20:59:53 +0000 Subject: [PATCH 047/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250617.6 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.18-servicing.25311.13 -> To Version 8.0.18-servicing.25317.6 --- 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 6b573620846f..34f228ffa965 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6000d3d7b527..b9e98c3ae3bc 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 - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1988c37e68bc83b1a0d3d230276a1ae8f89da38b + cea5fa610dba4e0c024727f4c528a66018b820a3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fb6129c1f125..18a0e5450b63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.18 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 - 8.0.18-servicing.25311.13 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 8.0.18 From 190550614de16992fbf5d6e1191bfa3d598c5f50 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Jun 2025 21:03:26 +0000 Subject: [PATCH 048/293] Merged PR 50990: Merge from release/8.0.1xx #### AI description (iteration 1) #### PR Classification Dependency update. #### PR Summary This pull request merges changes from the release branch to update a build dependency reference in the version details metadata. - `/eng/Version.Details.xml`: Updated the `Microsoft.SourceBuild.Intermediate.source-build-reference-packages` dependency from version 8.0.0-alpha.1.25269.2 to 8.0.0-alpha.1.25316.2 and modified its corresponding SHA. --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f5853b20ee0..320a06cca2c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - cee2d057118e3ad3c58a72a23271ad88b87d4d4d + 3827e68e002064268d4be4b2d1d96048f9794808 From 647db78cc074010fc49b4403b38adc3c99d7e9b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jun 2025 02:01:56 +0000 Subject: [PATCH 049/293] Update dependencies from https://github.com/dotnet/templating build 20250617.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.412-servicing.25311.3 -> To Version 8.0.412-servicing.25317.2 --- 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 5f250b1a29c2..38919a7efbd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93cc73288f7b..04bdc7a4d7d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 + 2051325648666d0a6d876aa807e40ca4d3675351 - + https://github.com/dotnet/templating - 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 + 2051325648666d0a6d876aa807e40ca4d3675351 - + https://github.com/dotnet/templating - 62bbe0ac8fc5bb955e8d5f3ed0c930037edc3172 + 2051325648666d0a6d876aa807e40ca4d3675351 diff --git a/eng/Versions.props b/eng/Versions.props index 94a966732695..c6f108ade5af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.412-servicing.25311.3 + 8.0.412-servicing.25317.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 99805796a28d18d898ec1345a3cc450fd096a6f6 Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Wed, 18 Jun 2025 19:19:15 +0000 Subject: [PATCH 050/293] Updated NuGet.config - replace msbuild feed bb7 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 2b70e6ed8e91..cb13aaa55a40 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + From 8bbc7c001e9a139719f9a5d8d165a8b11a4cbdce Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Wed, 18 Jun 2025 19:21:00 +0000 Subject: [PATCH 051/293] Updated NuGet.config - add disable for msbuild bb7 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index cb13aaa55a40..43489a828d1a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -54,6 +54,7 @@ + From 02fc283068e9c955059351a9081ab1f948911057 Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Wed, 18 Jun 2025 21:34:09 +0000 Subject: [PATCH 052/293] Updated NuGet.config - fix public msbuild feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 43489a828d1a..cb13aaa55a40 100644 --- a/NuGet.config +++ b/NuGet.config @@ -54,7 +54,6 @@ - From 8192651ba0e565170fb8e007e0f51a60d86449ba Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jun 2025 18:38:58 +0000 Subject: [PATCH 053/293] Merged PR 51089: Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will... Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request reintroduces dependency version pinning for System.Text.Json to ensure compatibility with ComponentModel's 8.0.6 dependency. #### PR Summary The changes add a new pinned version property and update multiple project files to explicitly reference the pinned System.Text.Json version. This ensures consistency with Microsoft.Extensions.DependencyModel and avoids conflicts with the version unified by MSBuild in VS 17.10. - `eng/Versions.props`: Added `` with value 8.0.5 and an explanatory comment. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated the System.Text.Json PackageReference to use the pinned version. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Modified the System.Text.Json PackageReference with the VersionOverride attribute. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Updated the System.Text.Json PackageReference to include the VersionOverride. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Applied the VersionOverride to the System.Text.Json PackageReference. --- eng/Versions.props | 2 ++ src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 2 +- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 +- .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 18a0e5450b63..8e4bbf59f962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,6 +81,8 @@ 8.0.0 8.0.1 8.0.6 + + 8.0.5 8.0.0 8.0.2 diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index bc51087b0222..b579edba0a21 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 705da27875e8..73adbccc2189 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index db6db8c39eaa..9aad73f88322 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -72,7 +72,7 @@ - + diff --git a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj index 2f91c038c3a5..ea3efe6f6881 100644 --- a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj +++ b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj @@ -38,7 +38,7 @@ - + From 4643e946ec7f4c6cc971413fb327508db5ccabf8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jun 2025 18:39:02 +0000 Subject: [PATCH 054/293] Merged PR 51090: Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will... Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request is a dependency update that reintroduces version pinning for System.Text.Json. #### PR Summary The changes add a pinned version property and update multiple project files to use the pinned System.Text.Json version, ensuring compatibility with DependencyModel dependency on 8.0.6. - `eng/Versions.props`: Added `8.0.5` with a comment to align with Microsoft.Extensions.DependencyModel. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated the `System.Text.Json` package reference to include `VersionOverride="$(PinnedSystemTextJsonPackageVersion)"`. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Updated the `System.Text.Json` package reference with the pinned version override. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Revised the `System.Text.Json` package reference to use the pinned version. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Modified the `System.Text.Json` package reference to incorporate the pinned version override. --- eng/Versions.props | 2 ++ src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 2 +- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 +- .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 755ec96c4da5..f58ee6ce9141 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,6 +81,8 @@ 8.0.0 8.0.1 8.0.6 + + 8.0.5 8.0.0 8.0.2 diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index bc51087b0222..b579edba0a21 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 705da27875e8..73adbccc2189 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index db6db8c39eaa..9aad73f88322 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -72,7 +72,7 @@ - + diff --git a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj index 2f91c038c3a5..ea3efe6f6881 100644 --- a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj +++ b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj @@ -38,7 +38,7 @@ - + From 20d5fd85ce9c57773e657ddac495345b58660952 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jun 2025 18:39:08 +0000 Subject: [PATCH 055/293] Merged PR 51091: Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will... Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request performs a dependency management update by reintroducing explicit version pinning for System.Text.Json. #### PR Summary The changes restore STJ pinning by specifying a pinned version (8.0.5) in the property file and updating all related project files to override the default System.Text.Json version. - `eng/Versions.props`: Added a new `` element set to 8.0.5. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated System.Text.Json package reference to use the pinned version via `VersionOverride`. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Applied the pinned version override for System.Text.Json. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Integrated the pinned version override for System.Text.Json. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Modified the System.Text.Json package reference to include the pinned version override. --- eng/Versions.props | 2 ++ src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 2 +- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 +- .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b4241e535d9d..3c93b737ceeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,6 +78,8 @@ 8.0.0 8.0.1 8.0.6 + + 8.0.5 8.0.0 8.0.2 diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index bc51087b0222..b579edba0a21 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 705da27875e8..73adbccc2189 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 7a08a236be4d..a440e04f87c1 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -72,7 +72,7 @@ - + diff --git a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj index 2f91c038c3a5..ea3efe6f6881 100644 --- a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj +++ b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj @@ -38,7 +38,7 @@ - + From c90a69c75b95037e59ffa4a02fcd51cb342660f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Jun 2025 02:03:05 +0000 Subject: [PATCH 056/293] Update dependencies from https://github.com/dotnet/arcade build 20250623.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25323.2 --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 28 +++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/core-templates/job/job.yml | 4 ++++ eng/common/internal/NuGet.config | 3 +++ global.json | 6 +++--- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..a276da0ecd9d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,15 +33,13 @@ - - - + + - @@ -70,16 +66,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..f72a1dfac98c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..bc608ad24328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd513..abe80a2a0e09 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b166..f70261ed689b 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index 87632bddbf94..35bd2b190a6d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.106", + "dotnet": "9.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25323.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 0730dcc5aad49c0c1d4e265268f7b5a538e7adf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Jun 2025 23:36:53 +0000 Subject: [PATCH 057/293] Update dependencies from https://github.com/dotnet/templating build 20250623.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.108-servicing.25311.4 -> To Version 9.0.108-servicing.25323.4 --- NuGet.config | 12 +----------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..b63aa2112bae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,15 +33,11 @@ - - - - + - @@ -70,16 +64,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..6588acff3fbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + c7a9a5ff947080d5ab5d97038363ab208c233b76 - + https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + c7a9a5ff947080d5ab5d97038363ab208c233b76 - + https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + c7a9a5ff947080d5ab5d97038363ab208c233b76 diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..d054230821a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.108-servicing.25311.4 + 9.0.108-servicing.25323.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From b430899d9f4b4384b8d5ce9431635724798a366b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Jun 2025 02:03:17 +0000 Subject: [PATCH 058/293] Update dependencies from https://github.com/dotnet/arcade build 20250625.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25325.4 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index a276da0ecd9d..8d503f487341 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f72a1dfac98c..72bf261f9208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d diff --git a/eng/Versions.props b/eng/Versions.props index bc608ad24328..5a8a4bfbb974 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 diff --git a/global.json b/global.json index 35bd2b190a6d..bbeb0ca1727a 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 0d0866ea5d7716b0e6e179f4c964554519ddcb9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Jun 2025 04:41:03 +0000 Subject: [PATCH 059/293] Update dependencies from https://github.com/dotnet/templating build 20250625.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.108-servicing.25311.4 -> To Version 9.0.108-servicing.25325.2 --- 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 b63aa2112bae..2b3499dc5250 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6588acff3fbf..4a0708e14f10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - c7a9a5ff947080d5ab5d97038363ab208c233b76 + 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 - + https://github.com/dotnet/templating - c7a9a5ff947080d5ab5d97038363ab208c233b76 + 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 - + https://github.com/dotnet/templating - c7a9a5ff947080d5ab5d97038363ab208c233b76 + 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 diff --git a/eng/Versions.props b/eng/Versions.props index d054230821a6..7caf1beb2ff9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.108-servicing.25323.4 + 9.0.108-servicing.25325.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8ee6aa84ec2c77b1a9c7aef0b3c235527e59fb3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 02:02:23 +0000 Subject: [PATCH 060/293] Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 --- NuGet.config | 4 ++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..993212788d81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..6ac370d7e889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..c47faff41452 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 98ccbd7a9c16..9713e93c84cd 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -135,6 +135,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e295031c0985..2856f7de1061 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index c1d4d016b412..ed50dd9fa2e4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" } } From 4de8310c1dce549ac72e078c1e1393309c5853b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 02:02:46 +0000 Subject: [PATCH 061/293] Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f250b1a29c2..a6a2c9ca5af3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,10 @@ + + + + @@ -18,6 +22,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93cc73288f7b..d1d536597e29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94a966732695..e09a0c42958d 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.25310.3 + 8.0.0-beta.25326.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 98ccbd7a9c16..9713e93c84cd 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -135,6 +135,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e295031c0985..2856f7de1061 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index c1d4d016b412..ed50dd9fa2e4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" } } From ffd696f0ebae06140ac5ed12b36b3706470b2f10 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Fri, 27 Jun 2025 10:33:04 +0800 Subject: [PATCH 062/293] Update Microsoft.NET.Build.Tests that depend on System.ValueTuple totarget netstandard2.0 --- ...nThatWeWantToBuildADesktopExeWithFSharp.cs | 2 +- .../GivenThatWeWantToBuildALibrary.cs | 24 +++++++++---------- ...ivenThatWeWantToBuildALibraryWithFSharp.cs | 16 ++++++------- .../GivenThatWeWantToBuildALibraryWithVB.cs | 19 +++++++-------- .../GivenThereAreDefaultItems.cs | 2 +- .../TestLibrary/TestLibrary.csproj | 2 +- .../TestLibrary/TestLibrary.fsproj | 2 +- .../TestLibrary/TestLibrary.vbproj | 2 +- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs index 1dfd5b8c2ef9..50836fe13e06 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs @@ -12,7 +12,7 @@ public GivenThatWeWantToBuildADesktopExeWithFSharp(ITestOutputHelper log) : base [WindowsOnlyFact] public void It_builds_a_simple_desktop_app() { - var targetFramework = "net45"; + var targetFramework = "net462"; var testAsset = _testAssetsManager .CopyTestAsset("HelloWorldFS") .WithSource() diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 8180f2bdaa30..d1b4b3720067 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -15,7 +15,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log) } [Theory] - [InlineData("netstandard1.5")] + [InlineData("netstandard2.0")] [InlineData("netcoreapp2.1")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_builds_the_library_successfully(string targetFramework) @@ -72,7 +72,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.5"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier) @@ -153,7 +153,7 @@ public void It_creates_a_documentation_file(string language) .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -187,7 +187,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -231,7 +231,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -283,7 +283,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "DefineConstants") + "netstandard2.0", "DefineConstants") { ShouldCompile = true, Configuration = configuration @@ -296,15 +296,15 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = getValuesCommand.GetValues(); - definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" }); + definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", + "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" }); } [Theory] - [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })] - [InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })] - [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })] + [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] [InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })] [InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER", "NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })] diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs index 97db7747bff4..2f237355bb99 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs @@ -25,7 +25,7 @@ public void It_builds_the_library_successfully() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.6"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -65,7 +65,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.6"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibraryFS", callingMethod) @@ -146,7 +146,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.6", "DefineConstants") + "netstandard2.0", "DefineConstants") { ShouldCompile = true, Configuration = configuration @@ -159,14 +159,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = getValuesCommand.GetValues(); - definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", - "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" }); + definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", + "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", + "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" }); } [Theory] - [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })] - [InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] [InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER", "NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })] [InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })] diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs index 0ae219de93fb..96a7ca1bcbe6 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs @@ -25,7 +25,7 @@ public void It_builds_the_library_successfully() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -76,7 +76,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.6"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibraryVB", callingMethod) @@ -157,7 +157,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "FinalDefineConstants") + "netstandard2.0", "FinalDefineConstants") { ShouldCompile = true, Configuration = configuration @@ -170,16 +170,15 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList(); - definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1", - "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1" })); + definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", + "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1" })); } [Theory] - [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("netstandard1.3", new[] { "NETSTANDARD=-1", "NETSTANDARD1_3=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("netstandard1.6", new[] { "NETSTANDARD=-1", "NETSTANDARD1_6=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", - "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1" })] + [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", + "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", + "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] [InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1", "NET451_OR_GREATER=-1", "NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })] [InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })] diff --git a/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 35ce15466617..7cfaf14103de 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -470,7 +470,7 @@ public void Default_items_have_the_correct_relative_paths() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", diff --git a/test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj b/test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj index 2ba689d92653..3e3942db0b5e 100644 --- a/test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj +++ b/test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj @@ -2,6 +2,6 @@ 42.43.44.45-alpha Library - netstandard1.5 + netstandard2.0 \ No newline at end of file diff --git a/test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj b/test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj index 7f47ec9e14f4..56a7b25661aa 100644 --- a/test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj +++ b/test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 4.2.3 diff --git a/test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj b/test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj index aef4739a2ebc..f510fdae7355 100644 --- a/test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj +++ b/test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj @@ -2,7 +2,7 @@ 42.43.44.45-alpha Library - netstandard1.5 + netstandard2.0 From 6e068e9a76597e72d2311bc65e76ac60cfd52e2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 04:17:26 +0000 Subject: [PATCH 063/293] Update dependencies from https://github.com/dotnet/templating build 20250626.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25316.3 -> To Version 8.0.118-servicing.25326.3 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..1a54a67d2517 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + @@ -17,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..0f34ccd9b5ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 - + https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 - + https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..99419cecbd68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25316.3 + 8.0.118-servicing.25326.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From e4cb3a8c84ef1259e88196f95dae5c37e97bb20b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 07:40:27 +0000 Subject: [PATCH 064/293] Update dependencies from https://github.com/dotnet/templating build 20250627.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.108-servicing.25311.4 -> To Version 9.0.108-servicing.25327.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b3499dc5250..b9a9dfab4f8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a0708e14f10..c446f851dc7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 + e22eff8d4831848715916a7db8aeeb550fb7890a - + https://github.com/dotnet/templating - 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 + e22eff8d4831848715916a7db8aeeb550fb7890a - + https://github.com/dotnet/templating - 57dab1c65e69d5aeb25e01ea7facad4a5b614b28 + e22eff8d4831848715916a7db8aeeb550fb7890a diff --git a/eng/Versions.props b/eng/Versions.props index 7caf1beb2ff9..6e33847cf863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.108-servicing.25325.2 + 9.0.108-servicing.25327.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0f6f55f47d281a13e54c541b637bc2019be28015 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Jun 2025 02:04:23 +0000 Subject: [PATCH 065/293] Update dependencies from https://github.com/dotnet/templating build 20250626.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.412-servicing.25311.3 -> To Version 8.0.412-servicing.25326.5 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 38919a7efbd4..a3057a4f1d22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,10 @@ + + + + @@ -17,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04bdc7a4d7d6..08445bfa7623 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 2051325648666d0a6d876aa807e40ca4d3675351 + 921a2c8dd7178bff2305aa54bf2e578f551ffc49 - + https://github.com/dotnet/templating - 2051325648666d0a6d876aa807e40ca4d3675351 + 921a2c8dd7178bff2305aa54bf2e578f551ffc49 - + https://github.com/dotnet/templating - 2051325648666d0a6d876aa807e40ca4d3675351 + 921a2c8dd7178bff2305aa54bf2e578f551ffc49 diff --git a/eng/Versions.props b/eng/Versions.props index c6f108ade5af..a2e51c0bde8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.412-servicing.25317.2 + 8.0.412-servicing.25326.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fbbc073990c58887e124a89012816520a6c8a675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Jun 2025 09:07:30 +0000 Subject: [PATCH 066/293] Update dependencies from https://github.com/dotnet/razor build 20250629.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25275.5 -> To Version 7.0.0-preview.25329.5 --- NuGet.config | 4 ++++ eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..993212788d81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..667867907dd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..e3c5487d058f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ - 7.0.0-preview.25275.5 - 7.0.0-preview.25275.5 - 7.0.0-preview.25275.5 + 7.0.0-preview.25329.5 + 7.0.0-preview.25329.5 + 7.0.0-preview.25329.5 From a2c7f2eb48ab3741791ab2e4732d8f0e4db41ce5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Jun 2025 09:17:44 +0000 Subject: [PATCH 067/293] Update dependencies from https://github.com/dotnet/razor build 20250629.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25275.1 -> To Version 9.0.0-preview.25329.4 --- NuGet.config | 13 +++---------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..8d503f487341 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,15 +33,14 @@ - - - + + + - @@ -70,16 +67,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..2500d05ae59c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,20 +325,20 @@ 379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2 - + https://github.com/dotnet/razor 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://github.com/dotnet/razor 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://github.com/dotnet/razor 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://github.com/dotnet/razor 44568f7817cd7c6daf90c9340c64c3b69277b7f6 diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..7018c6fc7bef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25275.1 - 9.0.0-preview.25275.1 - 9.0.0-preview.25275.1 + 9.0.0-preview.25329.4 + 9.0.0-preview.25329.4 + 9.0.0-preview.25329.4 From 4658133a362d602c1c923ec15f03f5fdbc6b142b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Jun 2025 02:02:43 +0000 Subject: [PATCH 068/293] Update dependencies from https://github.com/dotnet/roslyn build 20250629.7 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25275.3 -> To Version 4.12.0-3.25329.7 --- NuGet.config | 13 +++---------- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..8d503f487341 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,15 +33,14 @@ - - - + + + - @@ -70,16 +67,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..62fc0b266ff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,41 +97,41 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..5dbaf55de168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 - 4.12.0-3.25275.3 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 + 4.12.0-3.25329.7 From d56bda14f32a0f17c320dbfecdf19dd66ea935d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jul 2025 16:59:52 +0000 Subject: [PATCH 069/293] Update dependencies from https://github.com/dotnet/scenario-tests build 20250626.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25316.1 -> To Version 9.0.0-preview.25326.1 --- NuGet.config | 13 +++---------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..8d503f487341 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,15 +33,14 @@ - - - + + + - @@ -70,16 +67,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..aef392f1cc56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -631,14 +631,14 @@ https://github.com/dotnet/arcade-services e156e649f28395d9d0ee1e848225a689b59e0fd3 - + https://github.com/dotnet/scenario-tests - 45390d82e9b9686adeee65e046b8232f6814bea0 + 270606f9f338c1c2dfb255b6f18bbcb5f085a06c - + https://github.com/dotnet/scenario-tests - 45390d82e9b9686adeee65e046b8232f6814bea0 + 270606f9f338c1c2dfb255b6f18bbcb5f085a06c From 1fff6e786d28133944041d32cccf308f26ea8610 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Jul 2025 09:47:40 +0000 Subject: [PATCH 070/293] Update dependencies from https://github.com/dotnet/msbuild build 20250702.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.31-servicing-25313-13 -> To Version 17.8.32-servicing-25352-05 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..67ce7021bf06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,15 @@ + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..096272b095ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - + https://github.com/dotnet/msbuild - af11d4f253ee5c813bfd4f9d5902772638014572 + 74df0b3f5a40864840fb8d7d597631ffcfd5215a - + https://github.com/dotnet/msbuild - af11d4f253ee5c813bfd4f9d5902772638014572 + 74df0b3f5a40864840fb8d7d597631ffcfd5215a - + https://github.com/dotnet/msbuild - af11d4f253ee5c813bfd4f9d5902772638014572 + 74df0b3f5a40864840fb8d7d597631ffcfd5215a diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..b1a070c8478d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.31 + 17.8.32 $(MicrosoftBuildPackageVersion) + + + + + @@ -18,6 +23,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93cc73288f7b..6d0241d2267e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 933b72e36e86c22ba73e8b8148488f8298bb73c7 + + https://github.com/dotnet/msbuild + e4f165e45046f7c72b6838124cb91de6ae750b2e - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 933b72e36e86c22ba73e8b8148488f8298bb73c7 + + https://github.com/dotnet/msbuild + e4f165e45046f7c72b6838124cb91de6ae750b2e - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 933b72e36e86c22ba73e8b8148488f8298bb73c7 + + https://github.com/dotnet/msbuild + e4f165e45046f7c72b6838124cb91de6ae750b2e diff --git a/eng/Versions.props b/eng/Versions.props index 94a966732695..2ca80071c278 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.31 + 17.11.36 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c446f851dc7a..3dea0809a4c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - e22eff8d4831848715916a7db8aeeb550fb7890a + 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 - + https://github.com/dotnet/templating - e22eff8d4831848715916a7db8aeeb550fb7890a + 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 - + https://github.com/dotnet/templating - e22eff8d4831848715916a7db8aeeb550fb7890a + 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 diff --git a/eng/Versions.props b/eng/Versions.props index 6e33847cf863..9dafceff8e66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,13 +187,13 @@ - 9.0.108 + 9.0.109 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.108-servicing.25327.1 + 9.0.109-servicing.25353.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 294777a40efac59d668aaada789759710f31238d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Jul 2025 18:57:40 +0000 Subject: [PATCH 073/293] Update dependencies from https://github.com/dotnet/templating build 20250703.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25316.3 -> To Version 8.0.119-servicing.25353.1 --- 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 1a54a67d2517..03c6f59ae026 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f34ccd9b5ee..d92a91749b29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 diff --git a/eng/Versions.props b/eng/Versions.props index 99419cecbd68..d0cdb87e9432 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 8.0.118 + 8.0.119 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25326.3 + 8.0.119-servicing.25353.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From bbea0e100f6726d2ddab29ba5e347d9ea29d5deb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jul 2025 02:02:32 +0000 Subject: [PATCH 074/293] Update dependencies from https://github.com/dotnet/msbuild build 20250703.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.31-servicing-25210-17 -> To Version 17.11.37-servicing-25353-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 7f700d0f69a2..db60dde8d9d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d0241d2267e..3109b679a193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - + https://github.com/dotnet/msbuild - e4f165e45046f7c72b6838124cb91de6ae750b2e + 82fb8bbff3ced66900af2ecc6184d407e2a738e2 - + https://github.com/dotnet/msbuild - e4f165e45046f7c72b6838124cb91de6ae750b2e + 82fb8bbff3ced66900af2ecc6184d407e2a738e2 - + https://github.com/dotnet/msbuild - e4f165e45046f7c72b6838124cb91de6ae750b2e + 82fb8bbff3ced66900af2ecc6184d407e2a738e2 diff --git a/eng/Versions.props b/eng/Versions.props index 2ca80071c278..3c6feb21f06c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.36 + 17.11.37 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dea0809a4c4..9969fa67599e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 - + https://github.com/dotnet/templating - 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 - + https://github.com/dotnet/templating - 3e28f6fb8cac1ece91d67b0fcd5d1991157e4685 + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 diff --git a/eng/Versions.props b/eng/Versions.props index 9dafceff8e66..92236e5a48b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.109-servicing.25353.3 + 9.0.109-servicing.25353.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 24a43b28118a6456c75b68a24aede2b2a69d090d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Jul 2025 06:43:29 +0000 Subject: [PATCH 076/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250703.13 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.7 -> To Version 9.0.8 --- NuGet.config | 22 ++++++- eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++---------- 3 files changed, 124 insertions(+), 106 deletions(-) diff --git a/NuGet.config b/NuGet.config index b481426af99f..b7e1c5bfe56f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,15 @@ + + + + + + @@ -35,13 +41,19 @@ - + + + + + + + @@ -68,14 +80,20 @@ + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a2fed1e181c..e5b0638aea22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 088027fb4d4b86829fcee3ccba911a932e42642c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 @@ -230,29 +230,29 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 @@ -619,9 +619,9 @@ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 71a2e69ad23d..1ff89c7f9999 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,47 +86,47 @@ - 9.0.7 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 8.0.0-rc.1.23414.4 - 9.0.7-servicing.25316.16 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8-servicing.25353.13 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 2.1.0 - 9.0.7 + 9.0.8 8.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 8.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 8.0.5 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 From b57d2131a18b72cf6b48f716017f7a1273d95bf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jul 2025 02:02:52 +0000 Subject: [PATCH 077/293] Update dependencies from https://github.com/dotnet/msbuild build 20250703.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.39-preview-25312-03 -> To Version 17.12.40-preview-25353-01 --- NuGet.config | 15 ++++----------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3540db9ea853..7dfb4414f100 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,26 +24,23 @@ - - - + - - - + + + - @@ -70,16 +67,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672d870a2891..a43d10fcf139 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ e3d8e8ea6df192d864698cdd76984d74135d0d13 - + https://github.com/dotnet/msbuild - 590305fc69a6af024c9d868d557be3efd5e42ddf + 714fcf8f443dc6a34a934f218e7038901f4343c7 - + https://github.com/dotnet/msbuild - 590305fc69a6af024c9d868d557be3efd5e42ddf + 714fcf8f443dc6a34a934f218e7038901f4343c7 - + https://github.com/dotnet/msbuild - 590305fc69a6af024c9d868d557be3efd5e42ddf + 714fcf8f443dc6a34a934f218e7038901f4343c7 diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..7dc950b1c6aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.39 - 17.12.39-preview-25312-03 + 17.12.40 + 17.12.40-preview-25353-01 17.11.31 17.12 From d4b12822adb19ac2c99d0526fcb53c88ad55e025 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 3 Jul 2025 10:36:04 -0700 Subject: [PATCH 078/293] Update branding to 9.0.109 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 023faaf46a68..dfb59a5f2211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 08 + 09 From 195debe4b3eb8a03a5c0af6198f29dc846f29b0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Jul 2025 07:17:11 +0000 Subject: [PATCH 079/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250703.6 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.7-servicing.25317.2 -> To Version 9.0.8-servicing.25353.6 --- NuGet.config | 22 ++++++++++-- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 71 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index b481426af99f..2726bd017166 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,12 @@ + + + - + @@ -36,12 +39,21 @@ + + + + + + + + + @@ -68,14 +80,20 @@ - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a2fed1e181c..dd2a6050bb07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7ac13333cf0a6ba33b4be231673080313e752e6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e @@ -343,21 +343,21 @@ 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6b3a5da75eb405046889a5447ec9b14cc29d285 + a171cdfb07ba2a9c277987402749d99ab7b7f12e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71a2e69ad23d..a84280a2028a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,19 +215,19 @@ - 9.0.7 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 - 9.0.7-servicing.25317.2 + 9.0.8 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 + 9.0.8-servicing.25353.6 From e63b89eb9ca27e7676ceafbe53deb29132b56a58 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Fri, 4 Jul 2025 16:27:44 +0800 Subject: [PATCH 080/293] [release/8.0.1xx] Update Microsoft.NET.Build.Tests that depend on System.ValueTuple to arget netstandard2.0 --- .../TestLibrary/TestLibrary.csproj | 2 +- .../TestLibrary/TestLibrary.fsproj | 2 +- .../TestLibrary/TestLibrary.vbproj | 2 +- ...nThatWeWantToBuildADesktopExeWithFSharp.cs | 2 +- .../GivenThatWeWantToBuildALibrary.cs | 24 +++++++++---------- ...ivenThatWeWantToBuildALibraryWithFSharp.cs | 16 ++++++------- .../GivenThatWeWantToBuildALibraryWithVB.cs | 20 ++++++++-------- .../GivenThereAreDefaultItems.cs | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj b/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj index 2ba689d92653..3e3942db0b5e 100644 --- a/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj +++ b/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj @@ -2,6 +2,6 @@ 42.43.44.45-alpha Library - netstandard1.5 + netstandard2.0 \ No newline at end of file diff --git a/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj b/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj index 7f47ec9e14f4..56a7b25661aa 100644 --- a/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj +++ b/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 4.2.3 diff --git a/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj b/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj index aef4739a2ebc..f510fdae7355 100644 --- a/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj +++ b/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj @@ -2,7 +2,7 @@ 42.43.44.45-alpha Library - netstandard1.5 + netstandard2.0 diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs index 1dfd5b8c2ef9..50836fe13e06 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs @@ -12,7 +12,7 @@ public GivenThatWeWantToBuildADesktopExeWithFSharp(ITestOutputHelper log) : base [WindowsOnlyFact] public void It_builds_a_simple_desktop_app() { - var targetFramework = "net45"; + var targetFramework = "net462"; var testAsset = _testAssetsManager .CopyTestAsset("HelloWorldFS") .WithSource() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 367536df5d06..8543e8853c59 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -15,7 +15,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log) } [Theory] - [InlineData("netstandard1.5")] + [InlineData("netstandard2.0")] [InlineData("netcoreapp2.1")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_builds_the_library_successfully(string targetFramework) @@ -72,7 +72,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.5"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier) @@ -153,7 +153,7 @@ public void It_creates_a_documentation_file(string language) .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -187,7 +187,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -231,7 +231,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -283,7 +283,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "DefineConstants"); + "netstandard2.0", "DefineConstants"); getValuesCommand.ShouldCompile = true; getValuesCommand.Configuration = configuration; @@ -295,15 +295,15 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = getValuesCommand.GetValues(); - definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" }); + definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", + "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" }); } [Theory] - [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })] - [InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })] - [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })] + [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] [InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })] [InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER", "NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })] diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs index 2ff22a04a58f..69f14024836a 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs @@ -25,7 +25,7 @@ public void It_builds_the_library_successfully() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.6"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -65,7 +65,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.6"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibraryFS", callingMethod) @@ -146,7 +146,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.6", "DefineConstants"); + "netstandard2.0", "DefineConstants"); getValuesCommand.ShouldCompile = true; getValuesCommand.Configuration = configuration; @@ -158,14 +158,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = getValuesCommand.GetValues(); - definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", - "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" }); + definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", + "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", + "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" }); } [Theory] - [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", - "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })] - [InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", + "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })] [InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER", "NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })] [InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })] diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs index 109776e31e53..52e64ee18a0c 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs @@ -25,7 +25,7 @@ public void It_builds_the_library_successfully() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", @@ -76,7 +76,7 @@ internal static List GetValuesFromTestLibrary( { msbuildArgs = msbuildArgs ?? Array.Empty(); - string targetFramework = "netstandard1.6"; + string targetFramework = "netstandard2.0"; var testAsset = testAssetsManager .CopyTestAsset("AppWithLibraryVB", callingMethod) @@ -157,7 +157,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary"); var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory, - "netstandard1.5", "FinalDefineConstants"); + "netstandard2.0", "FinalDefineConstants"); getValuesCommand.ShouldCompile = true; getValuesCommand.Configuration = configuration; @@ -169,16 +169,16 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList(); - definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1", - "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1" })); + definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1", + "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", + "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1" })); } [Theory] - [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("netstandard1.3", new[] { "NETSTANDARD=-1", "NETSTANDARD1_3=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("netstandard1.6", new[] { "NETSTANDARD=-1", "NETSTANDARD1_6=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", - "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })] - [InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1" })] + [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", + "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] + [InlineData("netstandard2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", + "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })] [InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1", "NET451_OR_GREATER=-1", "NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })] [InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })] diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs index 03d608d7afa3..501267e0dadf 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs @@ -470,7 +470,7 @@ public void Default_items_have_the_correct_relative_paths() .Should() .Pass(); - var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5"); + var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0"); outputDirectory.Should().OnlyHaveFiles(new[] { "TestLibrary.dll", From 7226d2ec70f730237974dd0563190cce698e3221 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jul 2025 02:02:30 +0000 Subject: [PATCH 081/293] Update dependencies from https://github.com/dotnet/templating build 20250703.7 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.412-servicing.25311.3 -> To Version 8.0.413-servicing.25353.7 --- 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 a3057a4f1d22..29b82a387148 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08445bfa7623..a1e3e2639b7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 921a2c8dd7178bff2305aa54bf2e578f551ffc49 + caa21b1109a61dfb867ef1332a76a740894001f7 - + https://github.com/dotnet/templating - 921a2c8dd7178bff2305aa54bf2e578f551ffc49 + caa21b1109a61dfb867ef1332a76a740894001f7 - + https://github.com/dotnet/templating - 921a2c8dd7178bff2305aa54bf2e578f551ffc49 + caa21b1109a61dfb867ef1332a76a740894001f7 diff --git a/eng/Versions.props b/eng/Versions.props index a2e51c0bde8b..63a2bd934532 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.412 + 8.0.413 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.412-servicing.25326.5 + 8.0.413-servicing.25353.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 75121275bc4dc75190abc01e0302d9bc7add7eac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jul 2025 02:02:30 +0000 Subject: [PATCH 082/293] Update dependencies from https://github.com/dotnet/msbuild build 20250704.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.31-servicing-25210-17 -> To Version 17.11.38-servicing-25354-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 db60dde8d9d8..97aacfe22868 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3109b679a193..da6890e02ae0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - + https://github.com/dotnet/msbuild - 82fb8bbff3ced66900af2ecc6184d407e2a738e2 + 901dc04e451b05d9d583d4cedd50c3db605dab8c - + https://github.com/dotnet/msbuild - 82fb8bbff3ced66900af2ecc6184d407e2a738e2 + 901dc04e451b05d9d583d4cedd50c3db605dab8c - + https://github.com/dotnet/msbuild - 82fb8bbff3ced66900af2ecc6184d407e2a738e2 + 901dc04e451b05d9d583d4cedd50c3db605dab8c diff --git a/eng/Versions.props b/eng/Versions.props index 3c6feb21f06c..11acfcfa45b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.37 + 17.11.38 $(MicrosoftBuildPackageVersion) - 8.0.118 + 8.0.119 true release From 3100f76be47ed299c3414b96ef5cafdf53ab4ed4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 3 Jul 2025 10:35:36 -0700 Subject: [PATCH 084/293] Update branding to 8.0.316 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1b2484e24d75..b6a99b77b57f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.315 + 8.0.316 8.0.300 true From ea299e5880488c135e76855f0e5ebde47ac2229d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jul 2025 02:02:18 +0000 Subject: [PATCH 085/293] Update dependencies from https://github.com/dotnet/msbuild build 20250703.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.32-servicing-25313-10 -> To Version 17.10.33-servicing-25353-02 --- NuGet.config | 10 +++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9905637a82f..52d8a7e42cfe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,15 @@ + + + + - + @@ -19,6 +23,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fd3e5dacaa4..4a3f80c33314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 2b0cca8ad3a88e02fe0878139009ffffde071f1f - + https://github.com/dotnet/msbuild - bb7294f72e2779834a7898b8d7f1d8c54eac9845 + dbc02fd53b9594bf912231e2955694827ed18884 - + https://github.com/dotnet/msbuild - bb7294f72e2779834a7898b8d7f1d8c54eac9845 + dbc02fd53b9594bf912231e2955694827ed18884 - + https://github.com/dotnet/msbuild - bb7294f72e2779834a7898b8d7f1d8c54eac9845 + dbc02fd53b9594bf912231e2955694827ed18884 diff --git a/eng/Versions.props b/eng/Versions.props index 1b2484e24d75..5c7be3ca72a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.32 + 17.10.33 $(MicrosoftBuildPackageVersion) + + + + @@ -19,6 +23,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fd3e5dacaa4..2c7d059fb67c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore fa4d80b76c2431a825be026f6bbabca63e1f42ef - + 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 1b2484e24d75..490edd74a97c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.25275.6 - 7.0.0-preview.25275.6 - 7.0.0-preview.25275.6 + 7.0.0-preview.25329.2 + 7.0.0-preview.25329.2 + 7.0.0-preview.25329.2 From fc7dfc355e41093e8015f6d41fb4d2c1d81e5923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 02:02:28 +0000 Subject: [PATCH 087/293] Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9905637a82f..0eaec59ffb58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,10 @@ + + + + @@ -19,6 +23,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fd3e5dacaa4..9b2c23deac4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1b2484e24d75..0d3fb2097ab1 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.25310.3 + 8.0.0-beta.25326.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 98ccbd7a9c16..9713e93c84cd 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -135,6 +135,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e295031c0985..2856f7de1061 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index c1d4d016b412..ed50dd9fa2e4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" } } From 9c933e1df604e98db50b959f84503d29bd453c76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jun 2025 02:01:58 +0000 Subject: [PATCH 088/293] Update dependencies from https://github.com/dotnet/templating build 20250617.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.315-servicing.25311.2 -> To Version 8.0.315-servicing.25317.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9905637a82f..bb8cfe9d15d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fd3e5dacaa4..077764b90888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7994f94ec4071d4803af1b4f75f4ba964d3391f2 + e13e9de8c50200862582d25317bdb15cbfca18e6 - + https://github.com/dotnet/templating - 7994f94ec4071d4803af1b4f75f4ba964d3391f2 + e13e9de8c50200862582d25317bdb15cbfca18e6 - + https://github.com/dotnet/templating - 7994f94ec4071d4803af1b4f75f4ba964d3391f2 + e13e9de8c50200862582d25317bdb15cbfca18e6 diff --git a/eng/Versions.props b/eng/Versions.props index 1b2484e24d75..2035417ac56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.315-servicing.25311.2 + 8.0.315-servicing.25317.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0274840642b96ed9b746de1c2b4891b3bc552053 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Jun 2025 02:04:17 +0000 Subject: [PATCH 089/293] Update dependencies from https://github.com/dotnet/templating build 20250626.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.315-servicing.25311.2 -> To Version 8.0.315-servicing.25326.4 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb8cfe9d15d0..3170e5455061 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,10 @@ + + + + @@ -18,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 077764b90888..302d5441b8eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - e13e9de8c50200862582d25317bdb15cbfca18e6 + e74967482bb6e7619f8a0374e97192903ea0e04f - + https://github.com/dotnet/templating - e13e9de8c50200862582d25317bdb15cbfca18e6 + e74967482bb6e7619f8a0374e97192903ea0e04f - + https://github.com/dotnet/templating - e13e9de8c50200862582d25317bdb15cbfca18e6 + e74967482bb6e7619f8a0374e97192903ea0e04f diff --git a/eng/Versions.props b/eng/Versions.props index 2035417ac56a..b6644566197a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.315-servicing.25317.1 + 8.0.315-servicing.25326.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From d7398cca6a0f55e027bdaed67892372762735adb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jul 2025 02:02:30 +0000 Subject: [PATCH 090/293] Update dependencies from https://github.com/dotnet/templating build 20250703.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.315-servicing.25311.2 -> To Version 8.0.316-servicing.25353.2 --- 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 3170e5455061..d557f0198c91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 302d5441b8eb..4d12dc5a6aec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - e74967482bb6e7619f8a0374e97192903ea0e04f + ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 - + https://github.com/dotnet/templating - e74967482bb6e7619f8a0374e97192903ea0e04f + ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 - + https://github.com/dotnet/templating - e74967482bb6e7619f8a0374e97192903ea0e04f + ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 diff --git a/eng/Versions.props b/eng/Versions.props index b6644566197a..8c97f2bbe0b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.315 + 8.0.316 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.315-servicing.25326.4 + 8.0.316-servicing.25353.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fbee30ee303031dc07b346e4d70588817c8ca4e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jul 2025 02:02:29 +0000 Subject: [PATCH 091/293] Update dependencies from https://github.com/dotnet/templating build 20250703.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.315-servicing.25311.2 -> To Version 8.0.316-servicing.25353.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 d557f0198c91..673205fd8826 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d12dc5a6aec..02e6588fd313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 + fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f - + https://github.com/dotnet/templating - ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 + fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f - + https://github.com/dotnet/templating - ce84dc896c4479e5b43a7e6219e4f7ffb1defaf7 + fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f diff --git a/eng/Versions.props b/eng/Versions.props index 8c97f2bbe0b1..3bf05b3a1898 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.316-servicing.25353.2 + 8.0.316-servicing.25353.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 83a3b8cd24d77a4134114393fbc14d1b97d26f63 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 8 Jul 2025 10:09:15 -0700 Subject: [PATCH 092/293] Disable flakey container registry tests These tests have a high number of failures documented at (Skip = "https://github.com/dotnet/sdk/issues/49502"). The registry issue may not be solved until funding is increased or engineering effort is made to handle this case better and not run the tests. --- .../EndToEndTests.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index a9b228a8ba14..6c2fb259c235 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -42,7 +42,7 @@ public void Dispose() _loggerFactory.Dispose(); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithRegistryPushAndPull() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull)); @@ -89,7 +89,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithLocalLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad)); @@ -130,7 +130,7 @@ public async Task ApiEndToEndWithLocalLoad() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithArchiveWritingAndLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad)); @@ -180,7 +180,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task TarballsHaveCorrectStructure() { var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, @@ -351,7 +351,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st return publishDirectory; } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task EndToEnd_MultiProjectSolution() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); @@ -441,7 +441,7 @@ public async Task EndToEnd_MultiProjectSolution() /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport /// enabled by default, so the target will be skipped. /// - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)); @@ -509,7 +509,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); } - [DockerAvailableTheory()] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")] [InlineData("webapi", false)] [InlineData("webapi", true)] [InlineData("worker", false)] @@ -685,7 +685,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage privateNuGetAssets.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void EndToEnd_NoAPI_Console() { DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, "CreateNewImageTest")); @@ -766,7 +766,7 @@ public void EndToEnd_NoAPI_Console() privateNuGetAssets.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void EndToEnd_SingleArch_NoRid() { // Create a new console project @@ -858,7 +858,7 @@ public void EndToEndMultiArch_LocalRegistry(string imageName) newProjectDir.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void MultiArchStillAllowsSingleRID() { string imageName = NewImageName(); @@ -910,7 +910,7 @@ public void MultiArchStillAllowsSingleRID() newProjectDir.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties() { string imageName = NewImageName(); @@ -1430,7 +1430,7 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir) } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows() { var loggerFactory = new TestLoggerFactory(_testOutput); From 1adb812969fe3c67f476f558b57957910ff1daf6 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 8 Jul 2025 10:09:15 -0700 Subject: [PATCH 093/293] Disable flakey container registry tests These tests have a high number of failures documented at (Skip = "#49502"). The registry issue may not be solved until funding is increased or engineering effort is made to handle this case better and not run the tests. Merge --- .../DockerRegistryTests.cs | 2 +- .../EndToEndTests.cs | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index 64404c07fed8..ce0c46a50a87 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/test/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/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 534961fb6881..1bcd97a70096 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -42,7 +42,7 @@ public void Dispose() _loggerFactory.Dispose(); } - [DockerAvailableFact()] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithRegistryPushAndPull() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull)); @@ -89,7 +89,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull() } } - [DockerAvailableFact()] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithLocalLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad)); @@ -130,7 +130,7 @@ public async Task ApiEndToEndWithLocalLoad() } } - [DockerAvailableFact()] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task ApiEndToEndWithArchiveWritingAndLoad() { ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad)); @@ -180,7 +180,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task TarballsHaveCorrectStructure() { var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, @@ -351,7 +351,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st return publishDirectory; } - [DockerAvailableFact()] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task EndToEnd_MultiProjectSolution() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); @@ -441,7 +441,7 @@ public async Task EndToEnd_MultiProjectSolution() /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport /// enabled by default, so the target will be skipped. /// - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)); @@ -509,7 +509,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); } - [DockerAvailableTheory()] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")] [InlineData("webapi", false)] [InlineData("webapi", true)] [InlineData("worker", false)] @@ -685,7 +685,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage privateNuGetAssets.Delete(true); } - [DockerAvailableTheory()] + [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")] [InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNet)] [InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNetDigest)] public void EndToEnd_NoAPI_Console(string baseImage) @@ -768,7 +768,7 @@ public void EndToEnd_NoAPI_Console(string baseImage) privateNuGetAssets.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void EndToEnd_SingleArch_NoRid() { // Create a new console project @@ -860,7 +860,7 @@ public void EndToEndMultiArch_LocalRegistry(string imageName) newProjectDir.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void MultiArchStillAllowsSingleRID() { string imageName = NewImageName(); @@ -912,7 +912,7 @@ public void MultiArchStillAllowsSingleRID() newProjectDir.Delete(true); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties() { string imageName = NewImageName(); @@ -1432,7 +1432,7 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir) } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows() { var loggerFactory = new TestLoggerFactory(_testOutput); From 2919d86a708234df08df06e85e5f5538384b2724 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 8 Jul 2025 10:21:53 -0700 Subject: [PATCH 094/293] skip the theories instead of copying param names we will still find this in search and with the history of test-debt label. Lets just do this temporary workaround --- .../EndToEndTests.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 1bcd97a70096..bcda3e018657 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -801,9 +801,10 @@ public void EndToEnd_SingleArch_NoRid() processResultX64.Should().Pass().And.HaveStdOut("Hello, World!"); } + /** [InlineData("endtoendmultiarch-localregisty")] [InlineData("myteam/endtoendmultiarch-localregisty")] - [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)] + [DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)] public void EndToEndMultiArch_LocalRegistry(string imageName) { string tag = "1.0"; @@ -859,6 +860,7 @@ public void EndToEndMultiArch_LocalRegistry(string imageName) // Cleanup newProjectDir.Delete(true); } + */ [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void MultiArchStillAllowsSingleRID() @@ -985,9 +987,10 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug") => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish"); + /** [InlineData("endtoendmultiarch-archivepublishing")] [InlineData("myteam/endtoendmultiarch-archivepublishing")] - [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)] + [DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)] public void EndToEndMultiArch_ArchivePublishing(string imageName) { string tag = "1.0"; @@ -1054,6 +1057,7 @@ public void EndToEndMultiArch_ArchivePublishing(string imageName) // Cleanup newProjectDir.Delete(true); } + */ [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)] public void EndToEndMultiArch_RemoteRegistry() @@ -1381,7 +1385,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)); From c68e5cc96822ff295b26bb2a6e774ebb3d5516ba Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 7 Jul 2025 22:45:24 -0500 Subject: [PATCH 095/293] use new ACR for registry image --- .../DockerRegistryManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index bf9ae3ff2478..5e3de400ddc3 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -24,6 +24,12 @@ public class DockerRegistryManager public const string FullyQualifiedBaseImageAspNetDigest = $"{BaseImageSource}/{AspNetBaseImage}@{Net9ImageDigest}"; private static string? s_registryContainerId; + private static string SDK_AzureContainerRegistryImage => "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/registry:2"; + private static string Docker_HubRegistryImage => "docker.io/library/registry:2"; + + // TODO: some logic to pivot between this and Docker Hub + private static string RegistryImageToUse => SDK_AzureContainerRegistryImage; + internal class SameArchManifestPicker : IManifestPicker { public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) @@ -61,7 +67,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu { logger.LogInformation("Spawning local registry at '{registry}', attempt #{attempt}.", LocalRegistry, spawnRegistryAttempt); - CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", "docker.io/library/registry:2").Execute(); + CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", RegistryImageToUse).Execute(); processResult.Should().Pass().And.HaveStdOut(); From 328520c31deb3df7ee86523f4cac20d399a95ee2 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 7 Jul 2025 22:45:24 -0500 Subject: [PATCH 096/293] use new ACR for registry image --- .../DockerRegistryManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index da189af4e6df..7e1001911436 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -21,6 +21,12 @@ public class DockerRegistryManager public const string FullyQualifiedBaseImageAspNet = $"{BaseImageSource}/{AspNetBaseImage}:{Net8ImageTag}"; private static string? s_registryContainerId; + private static string SDK_AzureContainerRegistryImage => "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/registry:2"; + private static string Docker_HubRegistryImage => "docker.io/library/registry:2"; + + // TODO: some logic to pivot between this and Docker Hub + private static string RegistryImageToUse => SDK_AzureContainerRegistryImage; + internal class SameArchManifestPicker : IManifestPicker { public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) @@ -58,7 +64,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu { logger.LogInformation("Spawning local registry at '{registry}', attempt #{attempt}.", LocalRegistry, spawnRegistryAttempt); - CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", "docker.io/library/registry:2").Execute(); + CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", RegistryImageToUse).Execute(); processResult.Should().Pass().And.HaveStdOut(); From 42f4431c2c89669d38df8e650d044769f7e329d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 15:31:44 -0500 Subject: [PATCH 097/293] [release/8.0.3xx] Use new ACR for registry image (#49689) Co-authored-by: Chet Husk --- .../DockerRegistryManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index f6648123e6d9..f5d6b96fe770 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -21,6 +21,12 @@ public class DockerRegistryManager public const string FullyQualifiedBaseImageAspNet = $"{BaseImageSource}/{AspNetBaseImage}:{Net8ImageTag}"; private static string? s_registryContainerId; + private static string SDK_AzureContainerRegistryImage => "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/registry:2"; + private static string Docker_HubRegistryImage => "docker.io/library/registry:2"; + + // TODO: some logic to pivot between this and Docker Hub + private static string RegistryImageToUse => SDK_AzureContainerRegistryImage; + internal class SameArchManifestPicker : IManifestPicker { public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) @@ -52,7 +58,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu { logger.LogInformation("Spawning local registry at '{registry}', attempt #{attempt}.", LocalRegistry, spawnRegistryAttempt); - CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", "docker.io/library/registry:2").Execute(); + CommandResult processResult = ContainerCli.RunCommand(testOutput, "--rm", "--publish", "5010:5000", "--detach", RegistryImageToUse).Execute(); processResult.Should().Pass().And.HaveStdOut(); From a670bb9ddd6d6121f03f2942a8d4d225f397e562 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 3 Jul 2025 10:35:43 -0700 Subject: [PATCH 098/293] Update branding to 8.0.413 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 94a966732695..a45b19dcff91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.412 + 8.0.413 8.0.400 true From f143d6268ea939164d6e7b2bc95faf272f7bdc63 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Jul 2025 04:05:29 +0000 Subject: [PATCH 099/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250708.12 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.7-servicing.25317.2 -> To Version 9.0.8-servicing.25358.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2726bd017166..ac2de3e79a54 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd2a6050bb07..54e279f6b657 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a171cdfb07ba2a9c277987402749d99ab7b7f12e + 1481b9105033d52726e7347df719a2a4b2d1e398 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a84280a2028a..457b5e25f7ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 9.0.8 9.0.8 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 - 9.0.8-servicing.25353.6 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 + 9.0.8-servicing.25358.12 From 517b5903a1ad25f46e280382cf8168e07f2ad07e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Jul 2025 05:50:11 +0000 Subject: [PATCH 100/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250708.20 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.7 -> To Version 9.0.8 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.7-servicing.25304.2 -> To Version 9.0.8-servicing.25353.1 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 9 ++-- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++--- 3 files changed, 55 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7e1c5bfe56f..6d431500f593 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,7 @@ - - - - + @@ -41,7 +38,7 @@ - + @@ -88,7 +85,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5b0638aea22..c267cbe732c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - b567cdb6b8b461de79f2a2536a22ca3a67f2f33e + 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://github.com/dotnet/emsdk - b567cdb6b8b461de79f2a2536a22ca3a67f2f33e + 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://github.com/dotnet/emsdk - b567cdb6b8b461de79f2a2536a22ca3a67f2f33e + 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1ff89c7f9999..02aa1470351c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.8 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 9.0.8 @@ -98,8 +98,8 @@ 9.0.8 9.0.8 8.0.0-rc.1.23414.4 - 9.0.8-servicing.25353.13 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 9.0.8 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.7-servicing.25304.2 - 9.0.7 + 9.0.8-servicing.25353.1 + 9.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 20a07f0dbc09bef7595a974d8f51762dc62dd1ba Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Wed, 9 Jul 2025 14:06:24 +0800 Subject: [PATCH 101/293] restore commit --- NuGet.config | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52d8a7e42cfe..d0029dd1d73f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,11 +22,7 @@ - - - - - + From 95c8c1695f32e231bdf770a67865c00d15ed096d Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Wed, 9 Jul 2025 17:25:58 +0800 Subject: [PATCH 102/293] Remove missing conflicting code. --- .../EndToEndTests.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index d513ff89fd45..534961fb6881 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -180,7 +180,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() } } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public async Task TarballsHaveCorrectStructure() { var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, @@ -441,7 +441,7 @@ public async Task EndToEnd_MultiProjectSolution() /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport /// enabled by default, so the target will be skipped. /// - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)); @@ -509,7 +509,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); } - [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableTheory()] [InlineData("webapi", false)] [InlineData("webapi", true)] [InlineData("worker", false)] @@ -768,7 +768,7 @@ public void EndToEnd_NoAPI_Console(string baseImage) privateNuGetAssets.Delete(true); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public void EndToEnd_SingleArch_NoRid() { // Create a new console project @@ -860,7 +860,7 @@ public void EndToEndMultiArch_LocalRegistry(string imageName) newProjectDir.Delete(true); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public void MultiArchStillAllowsSingleRID() { string imageName = NewImageName(); @@ -912,7 +912,7 @@ public void MultiArchStillAllowsSingleRID() newProjectDir.Delete(true); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties() { string imageName = NewImageName(); @@ -1432,7 +1432,7 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir) } } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact] public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows() { var loggerFactory = new TestLoggerFactory(_testOutput); From ee8e0f9bd9e8e5227c6ae6bebb24d8aabc903951 Mon Sep 17 00:00:00 2001 From: Wenwen <53243232+Winniexu01@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:15:52 +0000 Subject: [PATCH 103/293] Upgrade scancode to 32.4.0 and revert pinning of click (#49576) --- eng/install-scancode.sh | 3 +- .../LicenseScanTests/LicenseExclusions.txt | 39 ++++++++++++------- .../Licenses.source-build-externals.json | 2 +- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh index 7cb27c17bbf7..941ffa40cf8b 100755 --- a/eng/install-scancode.sh +++ b/eng/install-scancode.sh @@ -5,13 +5,12 @@ set -euo pipefail # Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip # See latest release at https://github.com/nexB/scancode-toolkit/releases -SCANCODE_VERSION="32.3.3" +SCANCODE_VERSION="32.4.0" pyEnvPath="/tmp/scancode-env" python3 -m venv $pyEnvPath source $pyEnvPath/bin/activate pip install scancode-toolkit==$SCANCODE_VERSION -pip install click==8.1.8 deactivate # Setup a script which executes scancode in the virtual environment diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt index 5ab907fd3387..99fa61859bf6 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt @@ -13,8 +13,9 @@ # # False positive -src/arcade/Documentation/UnifiedBuild/VMR-Permissible-Sources.md|free-unknown -src/arcade/src/Microsoft.DotNet.XUnitAssert/src/README.md|free-unknown +src/arcade/Documentation/UnifiedBuild/VMR-Permissible-Sources.md|free-unknown,unknown-license-reference +src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright|unknown-license-reference +src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright|unknown-license-reference # Doesn't apply to code src/arcade/eng/xcopy-msbuild/msbuild.nuspec|ms-visual-2015-sdk @@ -27,6 +28,9 @@ src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/eula.rtf # aspnetcore # +# False positive +src/aspnetcore/src/Installers/Debian/tools/templates/debian/copyright|unknown-license-reference + # A generic statement about license applicability that is being detected as "unknown" src/aspnetcore/src/Components/THIRD-PARTY-NOTICES.txt|unknown src/aspnetcore/THIRD-PARTY-NOTICES.txt|unknown @@ -37,7 +41,6 @@ src/aspnetcore/src/Installers/Windows/**/*.wxs|unknown-license-reference # License reference used in configuration, but not applying to code src/aspnetcore/src/Mvc/Settings.StyleCop|unknown-license-reference -src/aspnetcore/src/submodules/MessagePack-CSharp/stylecop.json|unknown # # command-line-api @@ -90,17 +93,20 @@ src/msbuild/src/Directory.Build.props|ms-net-library-2018-11 # False positive src/msbuild/documentation/specs/BuildCheck/interactive-package-references.md|unknown-license-reference src/msbuild/src/Build/Instance/ProjectItemInstance.cs|generic-exception +src/msbuild/src/Tasks/XamlRules/ProjectItemsSchema.xaml|unknown-license-reference # # nuget-client # # False positive +src/nuget-client/.editorconfig|unknown-license-reference src/nuget-client/README.md|unknown-license-reference src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs|unknown-license-reference src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Actions/UIActionEngine.cs|unknown-license-reference src/nuget-client/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/Formatters/LicenseMetadataFormatter.cs|proprietary-license src/nuget-client/src/NuGet.Core/NuGet.Packaging/Rules/DefaultManifestValuesRule.cs|unknown-license-reference +src/nuget-client/scripts/utils/UpdateNuGetLicenseSPDXList.ps1|json src/nuget-client/test/TestExtensions/GenerateLicenseList/Program.cs|json # Test data @@ -111,6 +117,7 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValue src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseTests.cs +src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuspecReaderTests.cs|unknown-license-reference src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs @@ -126,7 +133,7 @@ src/roslyn-analyzers/assets/EULA.txt|ms-net-library # # Test data -src/roslyn/src/Analyzers/VisualBasic/Tests/FileHeaders/FileHeaderTests.vb|unknown-license-reference +src/roslyn/src/Analyzers/*/Tests/FileHeaders/FileHeaderTests.*|unknown-license-reference src/roslyn/src/EditorFeatures/CSharpTest2/EmbeddedLanguages/RegularExpressions/Regex_RealWorldPatterns.json # Applicable to installer, not source @@ -153,20 +160,19 @@ src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs|ot src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs|other-permissive src/runtime/src/libraries/System.Reflection.Metadata/tests/Resources/README.md|unknown-license-reference src/runtime/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs|proprietary-license -src/runtime/src/libraries/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs|unknown-license-reference src/runtime/src/mono/mono/mini/mini-posix.c|unknown-license-reference src/runtime/src/mono/mono/mini/mini-windows.c|unknown-license-reference src/runtime/src/native/external/libunwind/doc/libunwind-ia64.*|generic-exception -src/runtime/src/native/external/zlib-ng/cmake/detect-arch.cmake|unknown-license-reference -src/runtime/src/native/external/zlib-ng/cmake/detect-coverage.cmake|other-permissive,tsl-2020,unknown-license-reference -src/runtime/src/native/external/zlib-ng/cmake/detect-sanitizer.cmake|unknown-license-reference +src/runtime/src/native/external/zlib-ng/cmake/detect-*|unknown-license-reference +src/runtime/src/native/external/zlib-ng/cmake/detect-install-dirs.cmake|proprietary-license +src/runtime/src/native/external/zlib-ng/cmake/fallback-macros.cmake|unknown-license-reference src/runtime/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs|unknown-license-reference +src/runtime/src/tools/illink/.editorconfig|unknown-license-reference # Test data src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/InputSpace.cs|other-permissive src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/THIRD-PARTY-NOTICE|other-permissive src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/README.md|unknown-license-reference -src/runtime/src/libraries/System.ServiceModel.Syndication/tests/TestFeeds/AtomFeeds/*.xml # Reference to a license, not applicable to source src/runtime/src/libraries/System.Text.Json/roadmap/images/core-components.txt|unknown-license-reference @@ -178,6 +184,9 @@ src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-component # False positive src/sdk/THIRD-PARTY-NOTICES.TXT|unknown-license-reference +src/sdk/src/Installer/redist-installer/packaging/deb/dotnet-debian_config.json|commercial-license +src/sdk/src/Installer/redist-installer/packaging/rpm/dotnet-config.json|commercial-license +src/sdk/src/Installer/redist-installer/packaging/rpm/templates/copyright|unknown-license-reference # Configuration, doesn't apply to source directly src/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt @@ -187,14 +196,12 @@ src/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt # # False positive -src/source-build-externals/src/abstractions-xunit/README.md|free-unknown -src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown +src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown-license-reference +src/source-build-externals/src/application-insights/WEB/ThirdPartyNotices.txt|unknown-license-reference +src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Validators/AadIssuerValidator/AadIssuerValidatorConstants.cs|cpl-1.0 src/source-build-externals/src/humanizer/NuSpecs/*.nuspec* -src/source-build-externals/src/xunit/README.md|free-unknown -src/source-build-externals/src/xunit/src/xunit.assert/Asserts/README.md|free-unknown # Configuration, doesn't apply to source directly -src/source-build-externals/src/vs-solutionpersistence/stylecop.json # Scanner is identifying the https://github.com/SixLabors/ImageSharp/blob/master/LICENSE license as unknown. But this license is not applicable because we're # relying on the Spectre.Console distribution. @@ -231,6 +238,7 @@ src/sourcelink/docs/GitSpec/GitSpec.md|unknown-license-reference # Not applicable to source src/test-templates/Templates/**/*.vstemplate +src/test-templates/template_feed/Microsoft.DotNet.Test.ProjectTemplates.9.0/content/*/.template.config/localize/templatestrings.fr.json|proprietary-license # # vstest @@ -238,9 +246,9 @@ src/test-templates/Templates/**/*.vstemplate # False positive src/vstest/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs|proprietary-license +src/vstest/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/.editorconfig|unknown-license-reference # Build asset, but not applying to code -src/vstest/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf # # wpf @@ -260,3 +268,4 @@ src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|mpl-2.0 src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/*.xaml|bsd-2-clause-views src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/RightsManagementEncryptionTransform.cs|proprietary-license +src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/UserUseLicenseDictionaryLoader.cs|proprietary-license diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/Licenses.source-build-externals.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/Licenses.source-build-externals.json index 305376292875..1f4ab7b10972 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/Licenses.source-build-externals.json +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/Licenses.source-build-externals.json @@ -2,7 +2,7 @@ "files": [ { "path": "src/application-insights/LOGGING/ThirdPartyNotices.txt", - "detected_license_expression": "unknown AND apache-2.0 AND mit AND bsd-new" + "detected_license_expression": "(unknown-license-reference AND apache-2.0) AND mit AND bsd-new" } ] } \ No newline at end of file From 28e3295269aefe9ac0004ea694c78745e742a8dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Jul 2025 02:02:56 +0000 Subject: [PATCH 104/293] Update dependencies from https://github.com/dotnet/msbuild build 20250709.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.39-preview-25312-03 -> To Version 17.12.41-preview-25359-01 --- 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 7dfb4414f100..40415fc5a5f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a43d10fcf139..dc9f0bde8dd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ e3d8e8ea6df192d864698cdd76984d74135d0d13 - + https://github.com/dotnet/msbuild - 714fcf8f443dc6a34a934f218e7038901f4343c7 + 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 - + https://github.com/dotnet/msbuild - 714fcf8f443dc6a34a934f218e7038901f4343c7 + 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 - + https://github.com/dotnet/msbuild - 714fcf8f443dc6a34a934f218e7038901f4343c7 + 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 diff --git a/eng/Versions.props b/eng/Versions.props index 7dc950b1c6aa..0fd66cb854fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.40 - 17.12.40-preview-25353-01 + 17.12.41 + 17.12.41-preview-25359-01 17.11.31 17.12 From ae4133ac10e25e9f86a91ea240bbc2dcb936433a Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 10 Jul 2025 10:10:28 +0800 Subject: [PATCH 105/293] restore the commit for package sources from dotnet-templating --- NuGet.config | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a1f4aa42fe7..987508af3f59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,11 +25,7 @@ - - - - - + From d38443a8dd2b7900f8a6883670121e34b64a6239 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 10 Jul 2025 13:20:27 +0800 Subject: [PATCH 106/293] update package Sha in Version.Details.xml --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48f03a109efb..69951184583d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + 088027fb4d4b86829fcee3ccba911a932e42642c https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + 088027fb4d4b86829fcee3ccba911a932e42642c https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + 088027fb4d4b86829fcee3ccba911a932e42642c From 79d9062806c031870b078b0da3014ddefe432ecb Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 10 Jul 2025 13:31:16 +0800 Subject: [PATCH 107/293] update package version --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index b481426af99f..24c82b12bbff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69951184583d..48f03a109efb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 https://github.com/dotnet/templating - 088027fb4d4b86829fcee3ccba911a932e42642c + 861f0ec3ba5ef218964c95949818e9f33eacf8f0 From b848248cacd52517a98dc11921442037e8b323f1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 21:31:22 +0000 Subject: [PATCH 108/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250710.7 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.18-servicing.25311.17 -> To Version 8.0.19-servicing.25360.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.18 -> To Version 8.0.19 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 22 ++++++++++++++++++--- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 882772f78930..ed28c6b80398 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,7 @@ - + @@ -14,6 +14,10 @@ + + + + @@ -21,13 +25,17 @@ - + + + + + @@ -52,6 +60,10 @@ + + + + @@ -60,9 +72,13 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42113f2d4a7..1bf9196dd065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ a767f5ab3b1b19ed4ffca966caf040cff2da4c61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://github.com/dotnet/emsdk - 976b101e5539557c20e2ac39885ac879531bcf82 + 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4c382b854cbb..94b763c4882a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ - 8.0.18 - 8.0.18-servicing.25311.17 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.7 + 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.18 - 8.0.18-servicing.25311.17 + 8.0.19 + 8.0.19-servicing.25360.7 8.0.0 8.0.1 8.0.3 8.0.1 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.18 @@ -227,7 +227,7 @@ - 8.0.18 + 8.0.19 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From f9ab11079f006101fb48631b7eb4ae904c880c39 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 21:31:22 +0000 Subject: [PATCH 109/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250710.7 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.18-servicing.25311.17 -> To Version 8.0.19-servicing.25360.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.18 -> To Version 8.0.19 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 22 ++++++++++++++++++--- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 987508af3f59..eddc834e2449 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -15,6 +15,10 @@ + + + + @@ -22,13 +26,17 @@ - + + + + + @@ -55,6 +63,10 @@ + + + + @@ -62,9 +74,13 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8b6ae4d120b..cdf8b2b15873 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ caa21b1109a61dfb867ef1332a76a740894001f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://github.com/dotnet/emsdk - 976b101e5539557c20e2ac39885ac879531bcf82 + 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 672d28f70b6c..da06c5c64dfe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.18 - 8.0.18-servicing.25311.17 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.7 + 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.18 - 8.0.18-servicing.25311.17 + 8.0.19 + 8.0.19-servicing.25360.7 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.18 @@ -231,7 +231,7 @@ - 8.0.18 + 8.0.19 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 31014d75e39a431bd97c7c0a0adcb0804c59f22c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 21:31:23 +0000 Subject: [PATCH 110/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250710.7 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.18-servicing.25311.17 -> To Version 8.0.19-servicing.25360.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.18 -> To Version 8.0.19 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 22 ++++++++++++++++++--- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca9cc0bd85b9..c646e9534e4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -15,6 +15,10 @@ + + + + @@ -22,13 +26,17 @@ - + + + + + @@ -55,6 +63,10 @@ + + + + @@ -65,9 +77,13 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7db67d2a5e3f..de412d13efb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb - + https://github.com/dotnet/emsdk - 976b101e5539557c20e2ac39885ac879531bcf82 + 6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + 653dfdfd75c3e98989361b4154703d13649be4cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b289b6e1d9d2..659da7787171 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.18 - 8.0.18-servicing.25311.17 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.7 + 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.18 - 8.0.18-servicing.25311.17 + 8.0.19 + 8.0.19-servicing.25360.7 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.18 @@ -231,7 +231,7 @@ - 8.0.18 + 8.0.19 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 46e6608bcdb846a3e98a971969e0b05286398d44 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 10 Jul 2025 16:46:07 -0500 Subject: [PATCH 111/293] .NET Source-Build 9.0.108 July 2025 Updates (#49698) Co-authored-by: Nikola Milosavljevic --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 3f8de0e0a97c..39172d5867c9 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 7c471e539267..34016642debc 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.107 - 9.0.107-servicing.25270.1 + 9.0.108 + 9.0.108-servicing.25317.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index f844c8d71a07..559990343e6f 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.108" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2" } } From bf226099b87be79bcc4f95c535668b7379a31d8c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 23:33:33 +0000 Subject: [PATCH 112/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.11 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.7-servicing.25317.2 -> To Version 9.0.8-servicing.25360.11 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac2de3e79a54..da9500941872 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54e279f6b657..3dc49c2e8dce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1481b9105033d52726e7347df719a2a4b2d1e398 + 56eb014ffd938ceed8865dd08ec7799a48ef031f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 457b5e25f7ca..f97d7e492a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 9.0.8 9.0.8 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 - 9.0.8-servicing.25358.12 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 + 9.0.8-servicing.25360.11 From 43a68882a74e9ab2fe82b8f425ff30613c7d2bf5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 23:57:54 +0000 Subject: [PATCH 113/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.10 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.10 --- NuGet.config | 12 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed28c6b80398..071e1c19c7ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,11 +13,7 @@ - - - - - + @@ -60,11 +56,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bf9196dd065..0ade935c0941 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 480ddbb714f16a09b74e75cff57e1da769e9d82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b 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 - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94b763c4882a..690a8b7cd798 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 8.0.19 8.0.0 8.0.0 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.0 @@ -167,13 +167,13 @@ - 8.0.18 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19 From 50304045edb81d02fbf26e9ed66e9638fb684018 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 23:57:54 +0000 Subject: [PATCH 114/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.10 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.10 --- NuGet.config | 12 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index c646e9534e4a..2e2d1fe18ffa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,7 @@ - - - - - + @@ -63,11 +59,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de412d13efb0..29fe1899378a 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 - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 480ddbb714f16a09b74e75cff57e1da769e9d82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b 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 - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 659da7787171..37951d34867b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.19 8.0.0 8.0.0 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.0 @@ -171,13 +171,13 @@ - 8.0.18 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19 From 5a6ef03b0a787aa9cd712b8910a65ed07850f2d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 23:57:54 +0000 Subject: [PATCH 115/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.10 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.10 --- NuGet.config | 12 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index eddc834e2449..3acfea2c48d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,7 @@ - - - - - + @@ -63,11 +59,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdf8b2b15873..76bf566e6f41 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 - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 480ddbb714f16a09b74e75cff57e1da769e9d82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b 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 - cea5fa610dba4e0c024727f4c528a66018b820a3 + 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index da06c5c64dfe..97a00698bd69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.19 8.0.0 8.0.0 - 8.0.18 + 8.0.19 8.0.0 8.0.0 8.0.0 @@ -171,13 +171,13 @@ - 8.0.18 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18-servicing.25317.6 - 8.0.18 + 8.0.19 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.10 + 8.0.19 From bf55bb5e6c860e06e22b4701d9adee903712ad13 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 02:49:29 +0000 Subject: [PATCH 116/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.17 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.17 --- 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 071e1c19c7ce..6da9fecc1d5c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ade935c0941..157d41e66753 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 690a8b7cd798..24dfe911f205 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 8.0.19 From 8619ad2893448c63c9e1e10c8492c7a867a64fa2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 02:49:32 +0000 Subject: [PATCH 117/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.17 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.17 --- 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 2e2d1fe18ffa..7f431cac1b1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29fe1899378a..37effed3e2d0 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 - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 37951d34867b..84e22c372727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 8.0.19 From 3a32e582716e23aa0a87de08bc51bf89022e1d6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 02:49:33 +0000 Subject: [PATCH 118/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250710.17 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25360.17 --- 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 3acfea2c48d6..66171942cd3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76bf566e6f41..1b0ec98d36f8 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 - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8c908687b2a405b7b4fb6c5bb2c8c62c8df3575b + 9268d72a536f6bc2597dea6f731c8323b0d77b49 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 97a00698bd69..e80c7b10ea64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 - 8.0.19-servicing.25360.10 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 + 8.0.19-servicing.25360.17 8.0.19 From 928da715308c8805f424f13af0f9fe023d60fb9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 10:15:35 +0000 Subject: [PATCH 119/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250711.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.7 -> To Version 9.0.8 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.7-rtm.25317.1 -> To Version 9.0.8-rtm.25360.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c875c760847..31fc6e387b01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -45,16 +45,9 @@ - - - - - - - - + @@ -92,10 +85,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abd8aeac4ec5..2d5444b204fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,26 +254,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd9e6e960b9e9f00df0462574638f54e80734b7c + 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd9e6e960b9e9f00df0462574638f54e80734b7c + 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd9e6e960b9e9f00df0462574638f54e80734b7c + 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bd9e6e960b9e9f00df0462574638f54e80734b7c + 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7ac13333cf0a6ba33b4be231673080313e752e6a + 0f52b1010b9f0f8ed38bf50711baebcb74b36446 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 839ce1ed3f4e73f8628ba24f48660ecebd99824e + 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7ac13333cf0a6ba33b4be231673080313e752e6a + 0f52b1010b9f0f8ed38bf50711baebcb74b36446 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8031ca6c1bc1..5979fa1747ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.7-servicing.25316.4 + 9.0.8-servicing.25360.4 @@ -130,10 +130,10 @@ - 9.0.7-servicing.25317.1 - 9.0.7-servicing.25317.1 - 9.0.7 - 9.0.7 + 9.0.8-servicing.25361.1 + 9.0.8-servicing.25361.1 + 9.0.8 + 9.0.8 @@ -237,8 +237,8 @@ - 9.0.7-rtm.25317.1 - 9.0.7-rtm.25317.1 + 9.0.8-rtm.25360.3 + 9.0.8-rtm.25360.3 From c28596ca88ea10bc844f0ebb6766676a7df0e236 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 12:00:47 +0000 Subject: [PATCH 120/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250711.1 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25361.1 --- 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 7f431cac1b1f..76fa7791556e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37effed3e2d0..0ff300ae5628 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 - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 84e22c372727..d5e7a3616799 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 8.0.19 From 1dbcf7353f6b125f415873b1a1b0538483361a9b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 12:00:49 +0000 Subject: [PATCH 121/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250711.1 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25361.1 --- 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 66171942cd3a..08b0c2d7be0d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b0ec98d36f8..a66a90e2800c 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 - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e80c7b10ea64..7dc0ff26d486 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 8.0.19 From c7e22659900da5789dc675db2fb59769dd9edfc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 12:00:50 +0000 Subject: [PATCH 122/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250711.1 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.18-servicing.25317.6 -> To Version 8.0.19-servicing.25361.1 --- 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 6da9fecc1d5c..098f67ea9843 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 157d41e66753..92315c1d5508 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9268d72a536f6bc2597dea6f731c8323b0d77b49 + d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 24dfe911f205..bb6d4461ada0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 - 8.0.19-servicing.25360.17 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 + 8.0.19-servicing.25361.1 8.0.19 From 7e4171ebd745dccaf7bfa849f53eef4e01f2ea5f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 17:54:30 +0000 Subject: [PATCH 123/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250709.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.18 -> To Version 8.0.19 --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76fa7791556e..abd8dd0b9cf3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,11 +28,7 @@ - - - - - + @@ -72,11 +68,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ff300ae5628..35ab6f0dbdf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From 0ea6a1101f715686acf103272738b6991eca5d63 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 17:54:30 +0000 Subject: [PATCH 124/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250709.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.18 -> To Version 8.0.19 --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 08b0c2d7be0d..bce06ed537f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,11 +28,7 @@ - - - - - + @@ -69,11 +65,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a66a90e2800c..9428b2fc1ad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From f54dc77524e99f178eee6822816d6f4ef8f11c7b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 17:54:30 +0000 Subject: [PATCH 125/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250709.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.18 -> To Version 8.0.19 --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 098f67ea9843..e50dc51e1efe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,11 +27,7 @@ - - - - - + @@ -67,11 +63,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92315c1d5508..bb919fa99e07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,21 +228,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a3ad74410330b2a4004886916f56253d88fd1d + 04bde1497476d2742cf41dc93b67fe39f44b4329 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From e1210bec1bf9ef1efb0f2660b0c442d3b4ce59e2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 22:36:58 +0000 Subject: [PATCH 126/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250711.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25317.3 -> To Version 8.0.19-servicing.25361.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 abd8dd0b9cf3..4b896044c7c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ab6f0dbdf8..a788d52f3f2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 480ddbb714f16a09b74e75cff57e1da769e9d82d + 5588eeaad1ae8305c4cf34c4983fc24067af13ec https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d5e7a3616799..4343d25a5412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.18-servicing.25317.3 + 8.0.19-servicing.25361.1 From 5fa8b8b548d86c1a9671ce06927161b5e60a2c8e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 22:36:59 +0000 Subject: [PATCH 127/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250711.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25317.3 -> To Version 8.0.19-servicing.25361.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 e50dc51e1efe..959698db8088 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb919fa99e07..7a5e56004371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 480ddbb714f16a09b74e75cff57e1da769e9d82d + 5588eeaad1ae8305c4cf34c4983fc24067af13ec https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bb6d4461ada0..c2ac0613a8f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -183,7 +183,7 @@ - 8.0.18-servicing.25317.3 + 8.0.19-servicing.25361.1 From 18e0be3f4f1c7ba2fdf52cf784c5195699f9a1d6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Jul 2025 22:36:59 +0000 Subject: [PATCH 128/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250711.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25317.3 -> To Version 8.0.19-servicing.25361.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 bce06ed537f7..0b378f691b48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9428b2fc1ad7..8c532fe1bed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04bde1497476d2742cf41dc93b67fe39f44b4329 + 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 480ddbb714f16a09b74e75cff57e1da769e9d82d + 5588eeaad1ae8305c4cf34c4983fc24067af13ec https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7dc0ff26d486..9c64cf9199d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.18-servicing.25317.3 + 8.0.19-servicing.25361.1 From 2153ce8812e34e3dcf72ab65713328ce53396281 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 14 Jul 2025 11:36:51 -0700 Subject: [PATCH 129/293] add even more tests --- .../CreateImageIndexTests.cs | 2 +- .../CreateNewImageTests.cs | 14 +++++++------- .../DockerDaemonTests.cs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs index 2615b2e178ee..2ceadd1e46b1 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs +++ b/test/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/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index 2cba02b1393a..233289e2b344 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/test/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()); @@ -52,7 +52,7 @@ public void CreateNewImage_Baseline() task.BaseImageTag = "7.0"; task.OutputRegistry = "localhost:5010"; - task.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; + task.LocalRegistry = DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")Attribute.LocalRegistry; task.PublishDirectory = Path.Combine(newProjectDir.FullName, "bin", "Release", ToolsetInfo.CurrentTargetFramework, "linux-arm64", "publish"); task.Repository = "dotnet/create-new-image-baseline"; task.ImageTags = new[] { "latest" }; @@ -70,7 +70,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()); @@ -133,7 +133,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()); @@ -198,7 +198,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() cni.ContainerEnvironmentVariables = pcp.NewContainerEnvironmentVariables; cni.ContainerRuntimeIdentifier = "linux-x64"; cni.RuntimeIdentifierGraphPath = ToolsetUtils.GetRuntimeGraphFilePath(); - cni.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; + cni.LocalRegistry = DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")Attribute.LocalRegistry; Assert.True(cni.Execute(), FormatBuildMessages(errors)); @@ -216,7 +216,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"; @@ -297,7 +297,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()); diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs index 46ac57cca4a3..52848726311a 100644 --- a/test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs +++ b/test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs @@ -41,7 +41,7 @@ public async Task Can_detect_when_no_daemon_is_running() } } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public async Task Can_detect_when_daemon_is_running() { var available = await new DockerCli(_loggerFactory).IsAvailableAsync(default).ConfigureAwait(false); From d798500d96ed5ac3784e1a9fafdabc12898b8f87 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 14 Jul 2025 13:29:30 -0700 Subject: [PATCH 130/293] fix the tests --- .../CreateNewImageTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index 233289e2b344..42749b6d5877 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -52,7 +52,7 @@ public void CreateNewImage_Baseline() task.BaseImageTag = "7.0"; task.OutputRegistry = "localhost:5010"; - task.LocalRegistry = DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")Attribute.LocalRegistry; + task.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; task.PublishDirectory = Path.Combine(newProjectDir.FullName, "bin", "Release", ToolsetInfo.CurrentTargetFramework, "linux-arm64", "publish"); task.Repository = "dotnet/create-new-image-baseline"; task.ImageTags = new[] { "latest" }; @@ -133,7 +133,7 @@ public void ParseContainerProperties_EndToEnd() /// /// Creates a console app that outputs the environment variable added to the image. /// - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")()] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -198,7 +198,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() cni.ContainerEnvironmentVariables = pcp.NewContainerEnvironmentVariables; cni.ContainerRuntimeIdentifier = "linux-x64"; cni.RuntimeIdentifierGraphPath = ToolsetUtils.GetRuntimeGraphFilePath(); - cni.LocalRegistry = DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")Attribute.LocalRegistry; + cni.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; Assert.True(cni.Execute(), FormatBuildMessages(errors)); From c539ad751e48aa5a84c8d82922c43650dc03660a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Jul 2025 21:41:57 +0000 Subject: [PATCH 131/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250714.3 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.8-servicing.25360.11 -> To Version 9.0.8-servicing.25364.3 --- NuGet.config | 24 ++--------------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 386cf82c264b..9d13549359c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,18 +24,10 @@ - - - - - - - - - + @@ -43,10 +35,6 @@ - - - - @@ -80,19 +68,11 @@ - - - - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f4e880332db..9c71d2a905dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56eb014ffd938ceed8865dd08ec7799a48ef031f + 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e72bb4af86c7..f84b348d96a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 9.0.8 9.0.8 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 - 9.0.8-servicing.25360.11 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 + 9.0.8-servicing.25364.3 From 408e44c51c24c262e908947c457def6183ce74b1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 02:12:56 +0000 Subject: [PATCH 132/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250714.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.19-servicing.25361.1 -> To Version 8.0.19-servicing.25364.13 --- 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 959698db8088..5154f6af6054 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a5e56004371..cfbab7432902 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c2ac0613a8f9..9c78b99337a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 8.0.19 From a94e7fdcd301787b66a60de26be7fceddaae3118 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 02:12:59 +0000 Subject: [PATCH 133/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250714.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.19-servicing.25361.1 -> To Version 8.0.19-servicing.25364.13 --- 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 4b896044c7c9..98fe1cc15092 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 a788d52f3f2d..908b96b41d92 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 - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4343d25a5412..2ef0232bdbe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 8.0.19 From 2c04e19edc594d37959e423f4ce1ca60b28810d1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 02:13:00 +0000 Subject: [PATCH 134/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250714.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.19-servicing.25361.1 -> To Version 8.0.19-servicing.25364.13 --- 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 0b378f691b48..20d0bbdef785 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 8c532fe1bed3..a6db22e8aef1 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 - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9c544597655c12c0d6bf164cc72fdf01ffcd9c9 + 177963edcc11dae3b6a6a4685d29be611def97db https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9c64cf9199d6..59ac8582a778 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 + 8.0.19-servicing.25364.13 8.0.19 From bb03d873948e6ec7a95884625d1c7cada098ffd9 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 15 Jul 2025 09:51:56 -0700 Subject: [PATCH 135/293] fix attribute handling --- .../CreateNewImageTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index 42749b6d5877..311057dbd5a3 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -53,6 +53,7 @@ public void CreateNewImage_Baseline() task.OutputRegistry = "localhost:5010"; task.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; + task.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; task.PublishDirectory = Path.Combine(newProjectDir.FullName, "bin", "Release", ToolsetInfo.CurrentTargetFramework, "linux-arm64", "publish"); task.Repository = "dotnet/create-new-image-baseline"; task.ImageTags = new[] { "latest" }; @@ -199,6 +200,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() cni.ContainerRuntimeIdentifier = "linux-x64"; cni.RuntimeIdentifierGraphPath = ToolsetUtils.GetRuntimeGraphFilePath(); cni.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; + cni.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; Assert.True(cni.Execute(), FormatBuildMessages(errors)); From 2137670886c8e068f2b37ed673c68d8b8b0a7a06 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 16:59:59 +0000 Subject: [PATCH 136/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250711.3 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.8 --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d13549359c0..e1e4147319f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c71d2a905dd..e87af3b71fbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f84b348d96a2..e1b95754502e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 @@ -98,8 +98,8 @@ 9.0.8 9.0.8 8.0.0-rc.1.23414.4 - 9.0.8-servicing.25358.20 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 From 3710bf2e768bcf6027baaf49143c0b8bc7f90972 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 15 Jul 2025 10:38:05 -0700 Subject: [PATCH 137/293] fix attribute , why is my merge editor scuffed --- .../CreateNewImageTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index 311057dbd5a3..57262cceba44 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -52,7 +52,6 @@ public void CreateNewImage_Baseline() task.BaseImageTag = "7.0"; task.OutputRegistry = "localhost:5010"; - task.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; task.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; task.PublishDirectory = Path.Combine(newProjectDir.FullName, "bin", "Release", ToolsetInfo.CurrentTargetFramework, "linux-arm64", "publish"); task.Repository = "dotnet/create-new-image-baseline"; @@ -199,7 +198,6 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() cni.ContainerEnvironmentVariables = pcp.NewContainerEnvironmentVariables; cni.ContainerRuntimeIdentifier = "linux-x64"; cni.RuntimeIdentifierGraphPath = ToolsetUtils.GetRuntimeGraphFilePath(); - cni.LocalRegistry = DockerAvailableFactAttribute.Attribute.LocalRegistry; cni.LocalRegistry = DockerAvailableFactAttribute.LocalRegistry; Assert.True(cni.Execute(), FormatBuildMessages(errors)); From 4d5c397dc143b1e6f9ce39372378288810532675 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Tue, 15 Jul 2025 12:10:48 -0700 Subject: [PATCH 138/293] Remove dotnet-benchview group This is an old variable group that is no longer in use. --- eng/build-pr.yml | 3 --- eng/build.yml | 1 - 2 files changed, 4 deletions(-) diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 8cc01a363611..98adf5120a95 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -52,7 +52,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -233,7 +232,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -365,7 +363,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 diff --git a/eng/build.yml b/eng/build.yml index 89002d024451..5329c6c859a4 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -60,7 +60,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs From d1f0f886a131b1a674aeab375a25752e02acd854 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Tue, 15 Jul 2025 12:14:10 -0700 Subject: [PATCH 139/293] Remove dotnet-benchview variable group --- eng/build-pr.yml | 3 --- eng/build.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/eng/build-pr.yml b/eng/build-pr.yml index e86d00ffded0..82869dd68ac0 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -52,7 +52,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -234,7 +233,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -367,7 +365,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 diff --git a/eng/build.yml b/eng/build.yml index c65b75901aba..295e8e59e89c 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -60,7 +60,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs @@ -255,7 +254,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs @@ -401,7 +399,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs From 69d8fa3d1099ddc024806a9c9fee967506d24647 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Tue, 15 Jul 2025 12:16:44 -0700 Subject: [PATCH 140/293] Remove dotnet-benchview variable group --- eng/build-pr.yml | 3 --- eng/build.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/eng/build-pr.yml b/eng/build-pr.yml index cd382c556e48..d50cbd9eb97c 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -43,7 +43,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -225,7 +224,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 @@ -358,7 +356,6 @@ jobs: - group: DotNet-HelixApi-Access - _HelixApiToken: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 diff --git a/eng/build.yml b/eng/build.yml index f835f1316a1d..4a6c2899e427 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -60,7 +60,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs @@ -255,7 +254,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs @@ -401,7 +399,6 @@ jobs: - name: _HelixApiToken value: $(HelixApiAccessToken) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: dotnet-benchview - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignArgs From 69b849b5d958baef7f364a984074b5b0c04c6d86 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 19:21:40 +0000 Subject: [PATCH 141/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250715.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.8 -> To Version 9.0.8 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.8-rtm.25360.3 -> To Version 9.0.8-rtm.25365.1 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1e4147319f7..544b7f492409 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e87af3b71fbd..a8cbcf32a409 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 + e6a31682388b21899b4609e29303a4b516ec8dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 + e6a31682388b21899b4609e29303a4b516ec8dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 + e6a31682388b21899b4609e29303a4b516ec8dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27b4e6ab1eca3b5844c8a31d7c4e27b0a3d64640 + e6a31682388b21899b4609e29303a4b516ec8dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0f52b1010b9f0f8ed38bf50711baebcb74b36446 + 29823af871df23e77bed56c27e05b2b093953ee5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec + 45b6768a08b566fb02b8a00a81dbfc517925e8b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0f52b1010b9f0f8ed38bf50711baebcb74b36446 + 29823af871df23e77bed56c27e05b2b093953ee5 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index e1b95754502e..eab72d32fd9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.8-servicing.25360.4 + 9.0.8-servicing.25364.1 @@ -130,8 +130,8 @@ - 9.0.8-servicing.25361.1 - 9.0.8-servicing.25361.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 9.0.8 9.0.8 @@ -237,8 +237,8 @@ - 9.0.8-rtm.25360.3 - 9.0.8-rtm.25360.3 + 9.0.8-rtm.25365.1 + 9.0.8-rtm.25365.1 From 904a33a6579364281f30b3114de9288e8d2b3d98 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 19:45:06 +0000 Subject: [PATCH 142/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250715.1 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.8-servicing.25364.3 -> To Version 9.0.8-servicing.25365.1 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1e4147319f7..be950204e635 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e87af3b71fbd..7d31f6a48d75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6f4adf57cb99aaf1a983519b42ea801e0eb177a6 + aa2675a4242e642f144641a8d85325c69c4445c5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e1b95754502e..541059770de1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 9.0.8 9.0.8 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 - 9.0.8-servicing.25364.3 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 + 9.0.8-servicing.25365.1 From 98dbc9f702f686bf5387fb0b2f3aebe4a764f2f0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 22:43:49 +0000 Subject: [PATCH 143/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250715.14 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.25360.7 -> To Version 8.0.19-servicing.25365.14 --- 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 20d0bbdef785..fd23e75d7280 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6db22e8aef1..24d0c2878bf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 59ac8582a778..6649f4670e87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From 9aaffdee788525ebab9a603d7e5b728ad828c486 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 22:43:51 +0000 Subject: [PATCH 144/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250715.14 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.25360.7 -> To Version 8.0.19-servicing.25365.14 --- 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 5154f6af6054..e5de353c4fff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfbab7432902..a4f03eeb3cde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9c78b99337a4..fa5021aa6e91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,12 +50,12 @@ 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.0 8.0.1 8.0.3 From bc9d2900b1b7737493aa606a3e77f28b3835abc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 22:43:51 +0000 Subject: [PATCH 145/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250715.14 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.25360.7 -> To Version 8.0.19-servicing.25365.14 --- 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 98fe1cc15092..fd5043912c94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 908b96b41d92..9cf81f3c6655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,32 +16,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://github.com/dotnet/emsdk @@ -202,7 +202,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + fce8ed90dc43047eabec2b32c04ee46b789ad5d1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2ef0232bdbe4..70789d542b9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.19 - 8.0.19-servicing.25360.7 + 8.0.19-servicing.25365.14 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From c088c8fa36ef78db64f8c01c831b8b98fadee5f4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Jul 2025 19:28:23 +0000 Subject: [PATCH 146/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250716.1 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.25364.13 -> To Version 8.0.19-servicing.25366.1 --- NuGet.config | 8 ++++-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index e5de353c4fff..9ad2e2c3ce9b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -13,7 +14,7 @@ - + @@ -25,9 +26,11 @@ + + @@ -52,7 +55,7 @@ - + @@ -63,6 +66,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4f03eeb3cde..de2a88d63a7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fa5021aa6e91..3f30cb688972 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 8.0.19 From a78650dfdcfc730b4d0f37d54fddca775998ed2a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Jul 2025 19:28:23 +0000 Subject: [PATCH 147/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250716.1 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.25364.13 -> To Version 8.0.19-servicing.25366.1 --- NuGet.config | 8 ++++-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd5043912c94..a60a55d35481 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -14,7 +15,7 @@ - + @@ -26,9 +27,11 @@ + + @@ -55,7 +58,7 @@ - + @@ -68,6 +71,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cf81f3c6655..faa839f834da 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 - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 70789d542b9e..3fc275f855e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 8.0.19 From dcac504220a17c4ff2fa5e39af21291ea2392cfd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Jul 2025 19:28:25 +0000 Subject: [PATCH 148/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250716.1 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.25364.13 -> To Version 8.0.19-servicing.25366.1 --- NuGet.config | 8 ++++-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd23e75d7280..49382778a207 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -14,7 +15,7 @@ - + @@ -26,9 +27,11 @@ + + @@ -55,7 +58,7 @@ - + @@ -65,6 +68,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24d0c2878bf4..ecdd026cfc7f 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 - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 177963edcc11dae3b6a6a4685d29be611def97db + e91625cac85f6a8cba847a3da7d5b3c47ce5c66d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6649f4670e87..ecedb0d21f8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 - 8.0.19-servicing.25364.13 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 + 8.0.19-servicing.25366.1 8.0.19 From 6d3c989a5b574137c3512f626219491ea4ddc369 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 20:54:10 +0000 Subject: [PATCH 149/293] Initial plan From f6af26525f71bc58c7eb8f48a34a12aa584e1457 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:04:24 +0000 Subject: [PATCH 150/293] Add .NET 6.0 to EOL frameworks list Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../targets/Microsoft.NET.EolTargetFrameworks.targets | 4 ++-- .../GivenThatWeWantToTargetEolFrameworks.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets index 8608d9f77a33..6f03a1ca4ae3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets @@ -21,10 +21,10 @@ Copyright (c) .NET Foundation. All rights reserved. receive servicing updates and security fixes. --> - <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" /> + <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;6.0;7.0" /> - <_MinimumNonEolSupportedNetCoreTargetFramework>net6.0 + <_MinimumNonEolSupportedNetCoreTargetFramework>net8.0 Date: Tue, 24 Jun 2025 00:01:32 +0000 Subject: [PATCH 151/293] Fix failing tests by suppressing .NET 6.0 EOL warnings Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../GivenThatWeWantToPublishASingleFileApp.cs | 1 + .../GivenThatWeWantToPublishAnAotApp.cs | 1 + test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 2 +- test/dotnet-new.Tests/CommonTemplatesTests.cs | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index bcb21aeb7fec..9ec83219f694 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -744,6 +744,7 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted TargetFrameworks = targetFrameworks }; testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "true"; + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 85a52b580f19..64379c39e4d4 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -646,6 +646,7 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li TargetFrameworks = targetFrameworks }; testProject.AdditionalProperties["IsAotCompatible"] = "true"; + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 6e39fe3c3183..e145919575a2 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -196,7 +196,7 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr var testProject = CreateTestProjectForILLinkTesting(targetFrameworks, projectName); testProject.AdditionalProperties["IsTrimmable"] = "true"; - testProject.AdditionalProperties["NoWarn"] = "NETSDK1138"; // Silence warning about targeting EOL TFMs + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); diff --git a/test/dotnet-new.Tests/CommonTemplatesTests.cs b/test/dotnet-new.Tests/CommonTemplatesTests.cs index 98c86dde4016..008c18b96799 100644 --- a/test/dotnet-new.Tests/CommonTemplatesTests.cs +++ b/test/dotnet-new.Tests/CommonTemplatesTests.cs @@ -420,7 +420,7 @@ public async Task FeaturesSupport( { new DotnetBuildCommand(_log, "MyProject") .WithWorkingDirectory(workingDir) - .Execute() + .Execute("/p:CheckEolTargetFramework=false") .Should() .Pass() .And.NotHaveStdErr(); From b16ca58b776c69ff112f0603bf1d2b30c65ec3eb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 Jun 2025 16:47:43 -0700 Subject: [PATCH 152/293] Disable the EOL check for multiple tests --- .../GivenThatWeWantToPublishASingleFileApp.cs | 3 ++- .../GivenThatWeWantToPublishAnAotApp.cs | 1 + test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 2 ++ test/dotnet-new.Tests/CommonTemplatesTests.cs | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 9ec83219f694..7172150048ec 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -747,7 +747,8 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); - + testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs + var buildCommand = new BuildCommand(testAsset); var resultAssertion = buildCommand.Execute("/bl:my.binlog") .Should().Pass(); diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 64379c39e4d4..e4d40b25c0b8 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -649,6 +649,7 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); + testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var buildCommand = new BuildCommand(testAsset); var resultAssertion = buildCommand.Execute() diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index e145919575a2..a46a8a5c08ec 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -200,6 +200,8 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); + testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs + var buildCommand = new BuildCommand(testAsset); var resultAssertion = buildCommand.Execute() .Should().Pass(); diff --git a/test/dotnet-new.Tests/CommonTemplatesTests.cs b/test/dotnet-new.Tests/CommonTemplatesTests.cs index 008c18b96799..41163757ff8d 100644 --- a/test/dotnet-new.Tests/CommonTemplatesTests.cs +++ b/test/dotnet-new.Tests/CommonTemplatesTests.cs @@ -386,6 +386,7 @@ public async Task FeaturesSupport( string finalProjectName = Path.Combine(projectDir, $"{projName}.{extension}"); Dictionary environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() }; + environmentUnderTest["CheckEolTargetFramework"] = false.ToString(); TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest); TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: name) From 4405f433d95ddeba8d503ee8176d0bb8d861e9a2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 27 Jun 2025 11:46:05 -0700 Subject: [PATCH 153/293] Fix how we set the EOL property for the build --- .../GivenThatWeWantToPublishASingleFileApp.cs | 3 +-- .../GivenThatWeWantToPublishAnAotApp.cs | 3 +-- .../Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 7172150048ec..a180c50c5b9f 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -747,10 +747,9 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); - testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute("/bl:my.binlog") + var resultAssertion = buildCommand.Execute("/bl:my.binlog /p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { // Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index e4d40b25c0b8..90aab45f8e59 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -649,10 +649,9 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); - testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute() + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { resultAssertion diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index a46a8a5c08ec..b437aac683f8 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -200,10 +200,8 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); - testAsset.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs - var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute() + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { resultAssertion From 31f0243acaad4fab0986271b3542f92f656471d8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 27 Jun 2025 15:49:48 -0700 Subject: [PATCH 154/293] Fix the publish tests to expect net8 as the minimum and slightly change the tests run --- .../GivenThatWeWantToPublishASingleFileApp.cs | 7 ++++--- .../GivenThatWeWantToPublishAnAotApp.cs | 5 +++-- .../GivenThatWeWantToRunILLink.cs | 7 ++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index a180c50c5b9f..3a83cf1a441d 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -731,7 +731,8 @@ public void PublishSingleFile_fails_for_unsupported_target_framework(string targ [InlineData("net6.0", false)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file [InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs. + [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file + [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. @@ -749,14 +750,14 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted .WithProjectChanges(AddTargetFrameworkAliases); var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute("/bl:my.binlog /p:CheckEolTargetFramework=false") + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { // Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of // the message gets prefixed with a file path by MSBuild. resultAssertion .And.HaveStdOutContaining($"warning NETSDK1211") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 90aab45f8e59..713a2bab116f 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -630,7 +630,8 @@ public void PublishAot_fails_for_unsupported_target_framework(string targetFrame [InlineData("net7.0", false)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for AOT [InlineData("netstandard2.0;net7.0", false)] // Net7.0 is the min TFM supported for AOT and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for AOT, but leaves a "gap" for the supported net7.0 TFMs. + [InlineData("netstandard2.0;net8.0", false)] // net8.0 is supported for AOT and targeting. + [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for AOT, but leaves a "gap" for the supported net8.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", true)] [InlineData("alias-n7", false)] @@ -658,7 +659,7 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li // Note: can't check for Strings.IsAotCompatibleUnsupported because each line of // the message gets prefixed with a file path by MSBuild. .And.HaveStdOutContaining($"warning NETSDK1210") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index b437aac683f8..08b4407d3e3c 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -183,8 +183,9 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF [InlineData("net5.0", true)] [InlineData("net6.0", false)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for trimming - [InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for trimming and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs. + [InlineData("netstandard2.0;net6.0", false)] // net6.0 is the min TFM supported for trimming and targeting. + [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for trimming and targeting. + [InlineData("netstandard2.0;net9.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. @@ -208,7 +209,7 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr // Note: can't check for Strings.IsTrimmableUnsupported because each line of // the message gets prefixed with a file path by MSBuild. .And.HaveStdOutContaining($"warning NETSDK1212") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } From 214a132b19cddad105c9ccc7df521757a7ec7054 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:04:24 +0000 Subject: [PATCH 155/293] Add .NET 6.0 to EOL frameworks list Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../targets/Microsoft.NET.EolTargetFrameworks.targets | 4 ++-- .../GivenThatWeWantToTargetEolFrameworks.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets index 8608d9f77a33..6f03a1ca4ae3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets @@ -21,10 +21,10 @@ Copyright (c) .NET Foundation. All rights reserved. receive servicing updates and security fixes. --> - <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" /> + <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;6.0;7.0" /> - <_MinimumNonEolSupportedNetCoreTargetFramework>net6.0 + <_MinimumNonEolSupportedNetCoreTargetFramework>net8.0 Date: Thu, 17 Jul 2025 02:02:50 +0000 Subject: [PATCH 156/293] Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2 --- NuGet.config | 8 +------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 882772f78930..5806d746f292 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - @@ -13,7 +12,6 @@ - @@ -21,13 +19,12 @@ - + - @@ -52,7 +49,6 @@ - @@ -60,10 +56,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42113f2d4a7..0b732ce078f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4c382b854cbb..6b3fc8c928bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -211,7 +211,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index ed50dd9fa2e4..ba2c55db56f6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" } } From 31a0660702e15b987753f5b85b41eff8520d1432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:02:53 +0000 Subject: [PATCH 157/293] Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2 --- NuGet.config | 8 +------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca9cc0bd85b9..5a5d9542a4d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,12 @@ - + - @@ -55,7 +52,6 @@ - @@ -65,10 +61,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7db67d2a5e3f..dea2021d72ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b289b6e1d9d2..ed28b2bb5695 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.25326.1 + 8.0.0-beta.25366.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.25326.1 + 8.0.0-beta.25366.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index ed50dd9fa2e4..ba2c55db56f6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" } } From acde7af90346bfb7d73da3f4b8ce0f2c0300c7db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:03:14 +0000 Subject: [PATCH 158/293] Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2 --- NuGet.config | 8 +------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 987508af3f59..612eb42698d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,12 @@ - + - @@ -55,17 +52,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8b6ae4d120b..37a70df5565b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 672d28f70b6c..a414cc2f9232 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.25326.1 + 8.0.0-beta.25366.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.25326.1 + 8.0.0-beta.25366.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index ed50dd9fa2e4..ba2c55db56f6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" } } From 2a60e81502ad9c51c08cab2e6f6b8ba77415b173 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:03:49 +0000 Subject: [PATCH 159/293] Update dependencies from https://github.com/dotnet/arcade build 20250716.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25325.4 -> To Version 9.0.0-beta.25366.1 --- NuGet.config | 8 +------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a888e87574e..ef90911a7280 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,12 @@ - + - @@ -68,15 +65,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63518f4a906..d842c6f86638 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f diff --git a/eng/Versions.props b/eng/Versions.props index 584025091dec..c2fbf8e32c61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d09b..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index bbeb0ca1727a..e2bf9e7a5d5c 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From c7fb642deaee6ff185b66d6f3a914ae461b4b087 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:04:08 +0000 Subject: [PATCH 160/293] Update dependencies from https://github.com/dotnet/arcade build 20250716.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25325.4 -> To Version 9.0.0-beta.25366.1 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a6bd562d04..3d302f58ea1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50132f6a61d..6bdc26650ba8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f diff --git a/eng/Versions.props b/eng/Versions.props index 62f36b3f900f..7ea5ce6edf55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d09b..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index bbeb0ca1727a..e2bf9e7a5d5c 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From df23d5cda6ad62388f9a3156142577afdfaee968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 03:48:41 +0000 Subject: [PATCH 161/293] Update dependencies from https://github.com/dotnet/templating build 20250716.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.109-servicing.25353.8 -> To Version 9.0.109-servicing.25366.5 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a888e87574e..42b955e0fd2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,11 @@ - - + - @@ -68,15 +64,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63518f4a906..2b3f2e2324f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f - + https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f - + https://github.com/dotnet/templating - 861f0ec3ba5ef218964c95949818e9f33eacf8f0 + a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f diff --git a/eng/Versions.props b/eng/Versions.props index 584025091dec..e092fb247662 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.109-servicing.25353.8 + 9.0.109-servicing.25366.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1ebabfce65d5c03ebe1e381f06219e0fbc3fb676 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 03:54:06 +0000 Subject: [PATCH 162/293] Update dependencies from https://github.com/dotnet/templating build 20250716.7 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.304 -> To Version 9.0.304 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a6bd562d04..c02055508fd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50132f6a61d..1f0a036bbbd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 349a1a14fad0af1a3b455c694da7fdc0cec63d60 + 6d8653384fc6557c0774cc75b0c9c03635f7243d - + https://github.com/dotnet/templating - 349a1a14fad0af1a3b455c694da7fdc0cec63d60 + 6d8653384fc6557c0774cc75b0c9c03635f7243d diff --git a/eng/Versions.props b/eng/Versions.props index 62f36b3f900f..c74494b2a477 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.304-servicing.25364.1 + 9.0.304-servicing.25366.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 23bf07ee9eb327fceb860c282a9c0c24627d9da7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 04:18:16 +0000 Subject: [PATCH 163/293] Update dependencies from https://github.com/dotnet/templating build 20250716.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.119-servicing.25353.1 -> To Version 8.0.119-servicing.25366.1 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 882772f78930..8f581500cb1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - @@ -13,7 +12,6 @@ - @@ -21,13 +19,11 @@ - - + - @@ -52,7 +48,6 @@ - @@ -60,10 +55,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42113f2d4a7..6f4420a900c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a767f5ab3b1b19ed4ffca966caf040cff2da4c61 + 2767d6e9a474e2f7600c9201d283804ae72f4c21 - + https://github.com/dotnet/templating - a767f5ab3b1b19ed4ffca966caf040cff2da4c61 + 2767d6e9a474e2f7600c9201d283804ae72f4c21 - + https://github.com/dotnet/templating - a767f5ab3b1b19ed4ffca966caf040cff2da4c61 + 2767d6e9a474e2f7600c9201d283804ae72f4c21 diff --git a/eng/Versions.props b/eng/Versions.props index 4c382b854cbb..1f16fc725a6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.119-servicing.25353.1 + 8.0.119-servicing.25366.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 63ed2a18d112e1a92a5758dd2ca21151864e6ec9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 06:03:33 +0000 Subject: [PATCH 164/293] Update dependencies from https://github.com/dotnet/templating build 20250716.9 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.304 -> To Version 9.0.304 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index c02055508fd2..7d1696cb6ccd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f0a036bbbd0..c5b5ba1997d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 6d8653384fc6557c0774cc75b0c9c03635f7243d + ccb3c7ce02473bb122063bdee6ecd201b0883e62 - + https://github.com/dotnet/templating - 6d8653384fc6557c0774cc75b0c9c03635f7243d + ccb3c7ce02473bb122063bdee6ecd201b0883e62 diff --git a/eng/Versions.props b/eng/Versions.props index c74494b2a477..6ac604f4a297 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.304-servicing.25366.7 + 9.0.304-servicing.25366.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 99096f01f42521bbfb7f1bf7ee970e162d413dca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 06:21:15 +0000 Subject: [PATCH 165/293] Update dependencies from https://github.com/dotnet/templating build 20250716.10 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.109-servicing.25353.8 -> To Version 9.0.109-servicing.25366.10 --- 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 42b955e0fd2e..eae8fdd197db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b3f2e2324f4..a2140263712f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f + 61fb439b15da6a93e411fb3075b6450afd248f63 - + https://github.com/dotnet/templating - a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f + 61fb439b15da6a93e411fb3075b6450afd248f63 - + https://github.com/dotnet/templating - a2ff0690fa109b716f04e17d6dfc84ec3a7fb46f + 61fb439b15da6a93e411fb3075b6450afd248f63 diff --git a/eng/Versions.props b/eng/Versions.props index e092fb247662..205c375251f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.109-servicing.25366.5 + 9.0.109-servicing.25366.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7a4456accf330337d4d686172fe371740040b804 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 07:27:38 +0000 Subject: [PATCH 166/293] Update dependencies from https://github.com/dotnet/templating build 20250716.11 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.304 -> To Version 9.0.304 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d1696cb6ccd..6f107e894b8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5b5ba1997d1..6596c899f1da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - ccb3c7ce02473bb122063bdee6ecd201b0883e62 + 6f9fbbe642bbbc7c30f66f812f68aee36f6bf50e - + https://github.com/dotnet/templating - ccb3c7ce02473bb122063bdee6ecd201b0883e62 + 6f9fbbe642bbbc7c30f66f812f68aee36f6bf50e diff --git a/eng/Versions.props b/eng/Versions.props index 6ac604f4a297..794150bd22e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.304-servicing.25366.9 + 9.0.304-servicing.25366.11 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3debcfd99ecdcf528e4f42f215e5f722d778e853 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 1 Jul 2025 15:29:32 -0500 Subject: [PATCH 167/293] Add .NET 6.0 to End-of-Life frameworks list to generate NETSDK1138 warnings (#49533) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> Co-authored-by: Marc Paine --- .../GivenThatWeWantToPublishASingleFileApp.cs | 10 ++++++---- .../GivenThatWeWantToPublishAnAotApp.cs | 8 +++++--- .../GivenThatWeWantToRunILLink.cs | 10 ++++++---- src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs | 3 ++- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 21a1c24b5ed2..de676f98453c 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -637,7 +637,8 @@ public void ILLink_analyzer_warnings_are_produced_using_EnableSingleFileAnalyzer [InlineData("netstandard2.0", true)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file [InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs. + [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file + [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. @@ -650,18 +651,19 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted TargetFrameworks = targetFrameworks }; testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "true"; + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); - + var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute("/bl:my.binlog") + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { // Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of // the message gets prefixed with a file path by MSBuild. resultAssertion .And.HaveStdOutContaining($"warning NETSDK1211") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index d136a7f9e3d4..325d8e404a60 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -594,7 +594,8 @@ public void IsAotCompatible_implies_enable_analyzers(string targetFramework) [InlineData("netstandard2.0", true)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for AOT [InlineData("netstandard2.0;net7.0", false)] // Net7.0 is the min TFM supported for AOT and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for AOT, but leaves a "gap" for the supported net7.0 TFMs. + [InlineData("netstandard2.0;net8.0", false)] // net8.0 is supported for AOT and targeting. + [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for AOT, but leaves a "gap" for the supported net8.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n7;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. @@ -609,18 +610,19 @@ public void IsAotCompatible_warns_when_expected_for_not_correctly_multitarget_li TargetFrameworks = targetFrameworks }; testProject.AdditionalProperties["IsAotCompatible"] = "true"; + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute() + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { resultAssertion // Note: can't check for Strings.IsAotCompatibleUnsupported because each line of // the message gets prefixed with a file path by MSBuild. .And.HaveStdOutContaining($"warning NETSDK1210") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index bb6bb0e95706..64ec714ff61a 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -169,8 +169,9 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF [InlineData("netstandard2.0", true)] [InlineData("netstandard2.1", true)] [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for trimming - [InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for trimming and targeting. - [InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs. + [InlineData("netstandard2.0;net6.0", false)] // net6.0 is the min TFM supported for trimming and targeting. + [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for trimming and targeting. + [InlineData("netstandard2.0;net9.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. @@ -182,18 +183,19 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr var testProject = CreateTestProjectForILLinkTesting(targetFrameworks, projectName); testProject.AdditionalProperties["IsTrimmable"] = "true"; + testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) .WithProjectChanges(AddTargetFrameworkAliases); var buildCommand = new BuildCommand(testAsset); - var resultAssertion = buildCommand.Execute() + var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false") .Should().Pass(); if (shouldWarn) { resultAssertion // Note: can't check for Strings.IsTrimmableUnsupported because each line of // the message gets prefixed with a file path by MSBuild. .And.HaveStdOutContaining($"warning NETSDK1212") - .And.HaveStdOutContaining($"true"); + .And.HaveStdOutContaining($"true"); } else { resultAssertion.And.NotHaveStdOutContaining($"warning"); } diff --git a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs index aaa2da896b15..6e9dfb27711f 100644 --- a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs +++ b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs @@ -385,6 +385,7 @@ public async void FeaturesSupport( string finalProjectName = Path.Combine(projectDir, $"{projName}.{extension}"); Dictionary environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() }; + environmentUnderTest["CheckEolTargetFramework"] = false.ToString(); TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest); TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: name) @@ -419,7 +420,7 @@ public async void FeaturesSupport( { new DotnetBuildCommand(_log, "MyProject") .WithWorkingDirectory(workingDir) - .Execute() + .Execute("/p:CheckEolTargetFramework=false") .Should() .Pass() .And.NotHaveStdErr(); From a4fd26581b4ffe617d8d3f69a24cdf6afb27fded Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 17:54:06 +0000 Subject: [PATCH 168/293] Update dependencies from https://github.com/dotnet/scenario-tests build 20250717.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25326.1 -> To Version 9.0.0-preview.25367.1 --- NuGet.config | 8 +------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a888e87574e..ef90911a7280 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,12 @@ - + - @@ -68,15 +65,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63518f4a906..11a32822bf20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -631,14 +631,14 @@ https://github.com/dotnet/arcade-services e156e649f28395d9d0ee1e848225a689b59e0fd3 - + https://github.com/dotnet/scenario-tests - 270606f9f338c1c2dfb255b6f18bbcb5f085a06c + 69b4c477e9c37a14583e8852fdb60bc68325da74 - + https://github.com/dotnet/scenario-tests - 270606f9f338c1c2dfb255b6f18bbcb5f085a06c + 69b4c477e9c37a14583e8852fdb60bc68325da74 From aba95b204fcec590395a61637b5a2ba1e422c541 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Jul 2025 19:24:54 +0000 Subject: [PATCH 169/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250717.4 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.25364.13 -> To Version 8.0.19-servicing.25367.4 --- 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 9ad2e2c3ce9b..558b0cfe6f92 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 de2a88d63a7e..f2bb9e219aaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3f30cb688972..8ff4f22b662f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 8.0.19 From 1ad80ea77886206232445c6ee0238c02aad1b97a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Jul 2025 19:24:56 +0000 Subject: [PATCH 170/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250717.4 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.25364.13 -> To Version 8.0.19-servicing.25367.4 --- 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 a60a55d35481..bacdc28790ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index faa839f834da..67028140250f 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 - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3fc275f855e1..4f44637c950f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 8.0.19 From ad591152f46d63ec94b7254ada1a27ec08854ebf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Jul 2025 19:24:59 +0000 Subject: [PATCH 171/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250717.4 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.25366.1 -> To Version 8.0.19-servicing.25367.4 --- 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 49382778a207..5ccefe0177e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecdd026cfc7f..820e3f5de575 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 - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e91625cac85f6a8cba847a3da7d5b3c47ce5c66d + 1c8c188d1edb82b93a3976580fd344da051a29bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ecedb0d21f8f..868f5b432606 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 - 8.0.19-servicing.25366.1 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 + 8.0.19-servicing.25367.4 8.0.19 From 79adce010940978da3ba96c3b6f4068562e907e8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 01:17:40 +0000 Subject: [PATCH 172/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250717.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.8 -> To Version 9.0.8 --- NuGet.config | 10 ++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33378caf18c8..8173223fffef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,11 @@ + + @@ -36,12 +38,14 @@ + + - + @@ -68,15 +72,17 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8b725278a6..d8319a0ad1e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,20 +256,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e6a31682388b21899b4609e29303a4b516ec8dc3 + 231ec1df54109ee18cd883615006931cccb18c8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e6a31682388b21899b4609e29303a4b516ec8dc3 + 231ec1df54109ee18cd883615006931cccb18c8d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e6a31682388b21899b4609e29303a4b516ec8dc3 + 231ec1df54109ee18cd883615006931cccb18c8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e6a31682388b21899b4609e29303a4b516ec8dc3 + 231ec1df54109ee18cd883615006931cccb18c8d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index f0df35bc9ae9..981905a0a43d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,8 +130,8 @@ - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 + 9.0.8-servicing.25367.1 + 9.0.8-servicing.25367.1 9.0.8 9.0.8 From a1b823b5c407b851804582cdee7268dfd70d16de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jul 2025 02:02:28 +0000 Subject: [PATCH 173/293] Update dependencies from https://github.com/dotnet/scenario-tests build 20250717.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25326.1 -> To Version 9.0.0-preview.25367.1 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a6bd562d04..3d302f58ea1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50132f6a61d..93fe15b0557a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -597,14 +597,14 @@ https://github.com/dotnet/arcade-services e156e649f28395d9d0ee1e848225a689b59e0fd3 - + https://github.com/dotnet/scenario-tests - 270606f9f338c1c2dfb255b6f18bbcb5f085a06c + 69b4c477e9c37a14583e8852fdb60bc68325da74 - + https://github.com/dotnet/scenario-tests - 270606f9f338c1c2dfb255b6f18bbcb5f085a06c + 69b4c477e9c37a14583e8852fdb60bc68325da74 From 09eac40b1bf3baa8de83760631dc82e4a89570bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jul 2025 02:02:41 +0000 Subject: [PATCH 174/293] Update dependencies from https://github.com/dotnet/templating build 20250716.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.316-servicing.25353.6 -> To Version 8.0.316-servicing.25366.2 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca9cc0bd85b9..9dd9b2d627fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,11 @@ - - + - @@ -55,7 +51,6 @@ - @@ -65,10 +60,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7db67d2a5e3f..8ca1cc9991fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f + d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 - + https://github.com/dotnet/templating - fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f + d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 - + https://github.com/dotnet/templating - fc618ad8fe04640a7bb0cb8d7b6f3fec2b90c75f + d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 diff --git a/eng/Versions.props b/eng/Versions.props index b289b6e1d9d2..40a84fc8e0c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.316-servicing.25353.6 + 8.0.316-servicing.25366.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4d5185f6333dfbcbae2cefa5d5aff670a701f5f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jul 2025 02:02:55 +0000 Subject: [PATCH 175/293] Update dependencies from https://github.com/dotnet/templating build 20250716.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.413-servicing.25353.7 -> To Version 8.0.413-servicing.25366.8 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 987508af3f59..2fbcb6cbcbbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,11 @@ - - + - @@ -55,17 +51,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8b6ae4d120b..72f1c38ed2d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - caa21b1109a61dfb867ef1332a76a740894001f7 + 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 - + https://github.com/dotnet/templating - caa21b1109a61dfb867ef1332a76a740894001f7 + 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 - + https://github.com/dotnet/templating - caa21b1109a61dfb867ef1332a76a740894001f7 + 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 diff --git a/eng/Versions.props b/eng/Versions.props index 672d28f70b6c..8e81377ed9b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.413-servicing.25353.7 + 8.0.413-servicing.25366.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8e93d6ce410a12b493357f60b89ad14b55f9ad62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 02:25:20 +0000 Subject: [PATCH 176/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250715.11 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.8 --- NuGet.config | 10 ++++-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33378caf18c8..4202bce32515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,11 @@ + + @@ -35,13 +37,15 @@ - + + + @@ -68,14 +72,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8b725278a6..b5c22eea57bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f0df35bc9ae9..c91b403b90bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 @@ -98,8 +98,8 @@ 9.0.8 9.0.8 8.0.0-rc.1.23414.4 - 9.0.8-servicing.25361.3 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 From 3520eb2b5d7300b8c06b00d7e4120a1f59dbba7e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 18:39:39 +0000 Subject: [PATCH 177/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250718.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.8-servicing.25365.1 -> To Version 9.0.8-servicing.25368.5 --- NuGet.config | 14 ++-------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 92e5e01489ea..b0bb58a14549 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,8 +28,7 @@ - - + @@ -38,16 +37,12 @@ - - - - @@ -75,19 +70,14 @@ - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05fc741d28c0..aa96c7e88444 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa2675a4242e642f144641a8d85325c69c4445c5 + a23b32cde2155d0d5427aa63d648051c6eacbc47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b9ced54cf33b..d6b548cbac67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 9.0.8 9.0.8 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 - 9.0.8-servicing.25365.1 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.5 From c3628f38b09f3656839e7bfa54941326e9413594 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 18 Jul 2025 13:51:15 -0700 Subject: [PATCH 178/293] Remove the net9.0 tests that were added in the cherry-pick --- .../GivenThatWeWantToPublishASingleFileApp.cs | 1 - .../GivenThatWeWantToPublishAnAotApp.cs | 1 - .../Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs | 1 - 3 files changed, 3 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index de676f98453c..6d9779120140 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -638,7 +638,6 @@ public void ILLink_analyzer_warnings_are_produced_using_EnableSingleFileAnalyzer [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file [InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting. [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file - [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 325d8e404a60..352421de7803 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -595,7 +595,6 @@ public void IsAotCompatible_implies_enable_analyzers(string targetFramework) [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for AOT [InlineData("netstandard2.0;net7.0", false)] // Net7.0 is the min TFM supported for AOT and targeting. [InlineData("netstandard2.0;net8.0", false)] // net8.0 is supported for AOT and targeting. - [InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for AOT, but leaves a "gap" for the supported net8.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n7;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 64ec714ff61a..6c30ccf2701e 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -171,7 +171,6 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF [InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for trimming [InlineData("netstandard2.0;net6.0", false)] // net6.0 is the min TFM supported for trimming and targeting. [InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for trimming and targeting. - [InlineData("netstandard2.0;net9.0", true)] // Net8.0 is supported for trimming, but leaves a "gap" for the supported net6.0/net7.0 TFMs. [InlineData("alias-ns2", true)] [InlineData("alias-n6", false)] [InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases. From bca69c1b40c1a923b4c85bc84eacc8e7cefbae87 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 21:42:06 +0000 Subject: [PATCH 179/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250718.8 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.8-servicing.25365.1 -> To Version 9.0.8-servicing.25368.8 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index b0bb58a14549..660699b3f637 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa96c7e88444..e81054af4277 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a23b32cde2155d0d5427aa63d648051c6eacbc47 + 215a587e52efa710de84138b0a3374b860b924d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d6b548cbac67..a6b3b5d573df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.8 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 9.0.8 9.0.8 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 - 9.0.8-servicing.25368.5 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 + 9.0.8-servicing.25368.8 From cb74e3422a4aafd3c850f45f89e153ad11e2c154 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 23:33:03 +0000 Subject: [PATCH 180/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250718.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.8 -> To Version 9.0.8 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.8-rtm.25365.1 -> To Version 9.0.8-rtm.25368.9 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 660699b3f637..475afac500c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,7 +43,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e81054af4277..3f81717ccfe0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 231ec1df54109ee18cd883615006931cccb18c8d + 1d6033e36c17c6c496302306563689885e416f48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 231ec1df54109ee18cd883615006931cccb18c8d + 1d6033e36c17c6c496302306563689885e416f48 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 231ec1df54109ee18cd883615006931cccb18c8d + 1d6033e36c17c6c496302306563689885e416f48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 231ec1df54109ee18cd883615006931cccb18c8d + 1d6033e36c17c6c496302306563689885e416f48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29823af871df23e77bed56c27e05b2b093953ee5 + c83d78f58cbe40d4f5cd847461a233e5c85f5300 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 45b6768a08b566fb02b8a00a81dbfc517925e8b7 + dfa9922eb72e517011ad36ed7318242bbe9f9005 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29823af871df23e77bed56c27e05b2b093953ee5 + c83d78f58cbe40d4f5cd847461a233e5c85f5300 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a6b3b5d573df..7bcaba196050 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.8-servicing.25364.1 + 9.0.8-servicing.25368.1 @@ -130,8 +130,8 @@ - 9.0.8-servicing.25367.1 - 9.0.8-servicing.25367.1 + 9.0.8-servicing.25368.1 + 9.0.8-servicing.25368.1 9.0.8 9.0.8 @@ -237,8 +237,8 @@ - 9.0.8-rtm.25365.1 - 9.0.8-rtm.25365.1 + 9.0.8-rtm.25368.9 + 9.0.8-rtm.25368.9 From d58251030823b5724421b49f324e66c32c6b2987 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 23:59:21 +0000 Subject: [PATCH 181/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250718.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.19-servicing.25361.1 -> To Version 8.0.19-servicing.25368.11 (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 558b0cfe6f92..0d399a8b5848 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,8 +29,7 @@ - - + @@ -66,8 +65,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2bb9e219aaf..123939bc5a83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5588eeaad1ae8305c4cf34c4983fc24067af13ec + 43d1a9a5f6207405244e36ac6a2950c8050442f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8ff4f22b662f..e01b148505a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -183,7 +183,7 @@ - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25368.11 From 1313ad780b17a9ba25266938f153459cd909d55c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 23:59:47 +0000 Subject: [PATCH 182/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250718.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.19-servicing.25361.1 -> To Version 8.0.19-servicing.25368.11 (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 bacdc28790ee..70bfde96b6fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,8 +30,7 @@ - - + @@ -71,8 +70,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67028140250f..f5674a5338cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5588eeaad1ae8305c4cf34c4983fc24067af13ec + 43d1a9a5f6207405244e36ac6a2950c8050442f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4f44637c950f..0fd41713c5b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25368.11 From b6dc4f80ac992ab00f0d5811747052a6c9db62e2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 19 Jul 2025 00:00:01 +0000 Subject: [PATCH 183/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250718.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.19 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.19-servicing.25361.1 -> To Version 8.0.19-servicing.25368.11 (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 5ccefe0177e4..efe8ae4ea4ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,8 +30,7 @@ - - + @@ -68,8 +67,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 820e3f5de575..bd07c2aa70ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 04e974a9aad6cd2cfec104bbae913c9ce7b3c7b5 + 5fa74c83c4592ebe947aa4ca5302db1ffbb1dd4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5588eeaad1ae8305c4cf34c4983fc24067af13ec + 43d1a9a5f6207405244e36ac6a2950c8050442f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 868f5b432606..2a8ae7f543c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,7 +187,7 @@ - 8.0.19-servicing.25361.1 + 8.0.19-servicing.25368.11 From 0477da8de058d23b8fd65e7b980a7701635bf7bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Jul 2025 11:36:43 +0000 Subject: [PATCH 184/293] Update dependencies from https://github.com/dotnet/msbuild build 20250721.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.32-servicing-25352-05 -> To Version 17.8.33-servicing-25371-04 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 882772f78930..9b49f5f88f26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - @@ -13,21 +12,19 @@ - - + - + - @@ -52,7 +49,6 @@ - @@ -60,10 +56,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42113f2d4a7..336e7d2bb1bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - 74df0b3f5a40864840fb8d7d597631ffcfd5215a + 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e - + https://github.com/dotnet/msbuild - 74df0b3f5a40864840fb8d7d597631ffcfd5215a + 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e - + https://github.com/dotnet/msbuild - 74df0b3f5a40864840fb8d7d597631ffcfd5215a + 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e diff --git a/eng/Versions.props b/eng/Versions.props index 4c382b854cbb..8f070b2fd626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,7 +123,7 @@ - 17.8.32 + 17.8.33 $(MicrosoftBuildPackageVersion) - @@ -14,21 +13,19 @@ - - + - + - @@ -55,7 +52,6 @@ - @@ -65,10 +61,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7db67d2a5e3f..29e5de39bf8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - dbc02fd53b9594bf912231e2955694827ed18884 + 15234f77a6483703b639123549a36bceebc8f8d2 - + https://github.com/dotnet/msbuild - dbc02fd53b9594bf912231e2955694827ed18884 + 15234f77a6483703b639123549a36bceebc8f8d2 - + https://github.com/dotnet/msbuild - dbc02fd53b9594bf912231e2955694827ed18884 + 15234f77a6483703b639123549a36bceebc8f8d2 diff --git a/eng/Versions.props b/eng/Versions.props index b289b6e1d9d2..a60141fd3841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.33 + 17.10.34 $(MicrosoftBuildPackageVersion) - - - + - + + - @@ -68,15 +66,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63518f4a906..17520973e653 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://github.com/dotnet/msbuild - 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 + b22f419b0d4d4f3df90f7498809b30498d79ce30 - + https://github.com/dotnet/msbuild - 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 + b22f419b0d4d4f3df90f7498809b30498d79ce30 - + https://github.com/dotnet/msbuild - 9dcc26a5fd6a7449e6c1dc1d99c332141aeae361 + b22f419b0d4d4f3df90f7498809b30498d79ce30 diff --git a/eng/Versions.props b/eng/Versions.props index 584025091dec..de62bda9ff05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.41 - 17.12.41-preview-25359-01 + 17.12.42 + 17.12.42-preview-25371-13 17.11.31 17.12 From 8019854687b512547eae9811079ad92338a78da8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Jul 2025 02:02:53 +0000 Subject: [PATCH 187/293] Update dependencies from https://github.com/dotnet/roslyn build 20250721.14 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25359.3 -> To Version 4.14.0-3.25371.14 --- NuGet.config | 2 ++ eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a6bd562d04..1e5c184a1776 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50132f6a61d..f4592f8fa31d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 6dbcfd2f553ef1ef0ac48878ab17d18c1360735d + 68fb8b219ba741534744b0dbe6ede181c3d46cf4 diff --git a/eng/Versions.props b/eng/Versions.props index 62f36b3f900f..cb7dd8757996 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25359.3 + 3.12.0-beta1.25371.14 @@ -206,14 +206,14 @@ - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 - 4.14.0-3.25359.3 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 + 4.14.0-3.25371.14 From c6432feffa1a25c4e4c300295ce7663e2d7ac7e8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 04:38:25 +0000 Subject: [PATCH 188/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250721.9 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.25367.4 -> To Version 8.0.19-servicing.25371.9 --- 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 0d399a8b5848..04af8403620c 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 123939bc5a83..fc2f8dcb7ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e01b148505a1..1de9c339f6d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 8.0.19 From 019cb5a5bf9e3df95dbb92e6cf635db72c5d4da5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 04:38:26 +0000 Subject: [PATCH 189/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250721.9 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.25367.4 -> To Version 8.0.19-servicing.25371.9 --- 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 efe8ae4ea4ca..77b711662a18 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd07c2aa70ed..c763221ffe32 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 - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a8ae7f543c0..e3295c014b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 8.0.19 From dbf38460ed8c14dbda01cb3c1857f666cdf6b435 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 04:38:26 +0000 Subject: [PATCH 190/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250721.9 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.25367.4 -> To Version 8.0.19-servicing.25371.9 --- 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 70bfde96b6fd..eb71dbafe158 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5674a5338cf..ba1f33410d82 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 - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1c8c188d1edb82b93a3976580fd344da051a29bc + 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0fd41713c5b8..8b94e49e26e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 - 8.0.19-servicing.25367.4 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 + 8.0.19-servicing.25371.9 8.0.19 From c0eb3d68e9ddda9073ef6fedeec032e76cf6cf47 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 20:58:48 +0000 Subject: [PATCH 191/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250722.4 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.25371.9 -> To Version 8.0.19-servicing.25372.4 --- 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 04af8403620c..e5643d1fd66c 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 fc2f8dcb7ed5..9c085c9e7ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1de9c339f6d1..5ce63bb9e319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 8.0.19 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 + 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 From 1d33c87418874b62280c9da11326d41730ccc360 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 20:59:13 +0000 Subject: [PATCH 192/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250722.4 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.25371.9 -> To Version 8.0.19-servicing.25372.4 --- 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 eb71dbafe158..aea3279953e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba1f33410d82..ac9239c8244c 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 - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8b94e49e26e1..c28f5e667934 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 + 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 From 2eef30703ac2a488fc3513ad4c2aab2f9e8a259d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Jul 2025 20:59:27 +0000 Subject: [PATCH 193/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250722.4 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.25371.9 -> To Version 8.0.19-servicing.25372.4 --- 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 77b711662a18..ab2625c1dafa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c763221ffe32..816d06309e49 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 - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b19b21d7c88cbe4607c4de48b3692bbf968c7c4 + 277e317dd5cab9859ceea4c8ebae218522c2c173 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e3295c014b94..e1554c2ae412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,11 +172,11 @@ 8.0.19 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 - 8.0.19-servicing.25371.9 + 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 From be70b90a08fbf8d5670ecee30503fddc49a0d125 Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Tue, 22 Jul 2025 23:05:17 +0000 Subject: [PATCH 194/293] Updated Version.Details.xml - Revert 8.0.6 system.text.json sha to released version. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c085c9e7ff4..b77b594cffc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From e0244e7e860b525a2b5dc3ea5733225d3ec2e7bd Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Tue, 22 Jul 2025 23:05:17 +0000 Subject: [PATCH 195/293] Updated Version.Details.xml - Revert 8.0.6 system.text.json sha to released version. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac9239c8244c..f6055c67395d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 270953afd11e229d14cb0423c59de7957dd35152 Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Tue, 22 Jul 2025 23:05:17 +0000 Subject: [PATCH 196/293] Updated Version.Details.xml - Revert 8.0.6 system.text.json sha to released version. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 816d06309e49..83869dff1122 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 653dfdfd75c3e98989361b4154703d13649be4cb + ef853a71052646a42abf17e888ec6d9a69614ad9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 0998f6e61a276e14e12ba521c3d4559fe19ee2b0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 22 Jul 2025 16:43:03 -0700 Subject: [PATCH 197/293] Switch back to using the unofficial templates for PRs They want us to split the PRs out into a separate pipeline that will have different capabilities (ie we can't sign from a PR pipeline). That needs to run on unofficial 1ES templates so the easiest way to do this is just add the conditional back. --- .vsts-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index dcc5b77d1b9e..df58ec2eb3aa 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -54,7 +54,10 @@ resources: ref: refs/tags/release extends: - template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: sdl: sourceAnalysisPool: From 6fd5ff21bef782a64227cb26284f83bcc09f72f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Jul 2025 02:03:32 +0000 Subject: [PATCH 198/293] Update dependencies from https://github.com/dotnet/roslyn build 20250724.20 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25374.20 --- NuGet.config | 9 ++------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a888e87574e..dcbc4acd760a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,13 @@ - + + - @@ -68,15 +66,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63518f4a906..3f605a986391 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 584025091dec..e793a024d6b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 + 4.12.0-3.25374.20 From cb13273f863d4159f777d4e98405fc7e5fad01a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Jul 2025 09:11:30 +0000 Subject: [PATCH 199/293] Update dependencies from https://github.com/dotnet/razor build 20250727.8 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25329.5 -> To Version 7.0.0-preview.25377.8 --- NuGet.config | 9 ++------- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 882772f78930..f777395124cf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - @@ -13,7 +12,6 @@ - @@ -21,13 +19,13 @@ - + + - @@ -52,7 +50,6 @@ - @@ -60,10 +57,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42113f2d4a7..ea4103d9b337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 diff --git a/eng/Versions.props b/eng/Versions.props index 4c382b854cbb..6f69c8fedd58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,9 +177,9 @@ - 7.0.0-preview.25329.5 - 7.0.0-preview.25329.5 - 7.0.0-preview.25329.5 + 7.0.0-preview.25377.8 + 7.0.0-preview.25377.8 + 7.0.0-preview.25377.8 From cc2a6b4eb1462d07fb944eb44e5471091ee6572e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Jul 2025 02:02:12 +0000 Subject: [PATCH 200/293] Update dependencies from https://github.com/dotnet/razor build 20250727.7 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25329.2 -> To Version 7.0.0-preview.25377.7 --- NuGet.config | 9 ++------- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca9cc0bd85b9..e99ad729887d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,13 @@ - + + - @@ -55,7 +53,6 @@ - @@ -65,10 +62,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7db67d2a5e3f..1147d78b5772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cea5fa610dba4e0c024727f4c528a66018b820a3 - + 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 b289b6e1d9d2..d02b00a79e01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -181,9 +181,9 @@ - 7.0.0-preview.25329.2 - 7.0.0-preview.25329.2 - 7.0.0-preview.25329.2 + 7.0.0-preview.25377.7 + 7.0.0-preview.25377.7 + 7.0.0-preview.25377.7 From 40fddfe5c3ec3436d2fe722ca4113cd159f0398f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Jul 2025 02:02:30 +0000 Subject: [PATCH 201/293] Update dependencies from https://github.com/dotnet/razor build 20250727.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25329.3 -> To Version 9.0.0-preview.25377.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0a6bd562d04..1e5c184a1776 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d50132f6a61d..ea4723031b85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://github.com/dotnet/razor 3372435431977e91904a23ceb1eab689badc1bd9 - + https://github.com/dotnet/razor 3372435431977e91904a23ceb1eab689badc1bd9 - + https://github.com/dotnet/razor 3372435431977e91904a23ceb1eab689badc1bd9 - + https://github.com/dotnet/razor 3372435431977e91904a23ceb1eab689badc1bd9 diff --git a/eng/Versions.props b/eng/Versions.props index 62f36b3f900f..db07b7b78129 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -233,9 +233,9 @@ - 9.0.0-preview.25329.3 - 9.0.0-preview.25329.3 - 9.0.0-preview.25329.3 + 9.0.0-preview.25377.2 + 9.0.0-preview.25377.2 + 9.0.0-preview.25377.2 From 8755c302ae5b0568504d6171b757576e8ddde27e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Jul 2025 02:02:39 +0000 Subject: [PATCH 202/293] Update dependencies from https://github.com/dotnet/roslyn build 20250727.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25377.4 --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f605a986391..f238cd0436a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,41 +97,41 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e - + https://github.com/dotnet/roslyn 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e diff --git a/eng/Versions.props b/eng/Versions.props index e793a024d6b1..7d8737cc8ec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 - 4.12.0-3.25374.20 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 From 6c883a58e5a3e4ecf7ca7539f72fbe01d8105472 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Jul 2025 02:03:03 +0000 Subject: [PATCH 203/293] Update dependencies from https://github.com/dotnet/roslyn build 20250727.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25359.3 -> To Version 4.14.0-3.25377.9 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4592f8fa31d..36d64d32ec41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,41 +93,41 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 @@ -378,7 +378,7 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn 68fb8b219ba741534744b0dbe6ede181c3d46cf4 diff --git a/eng/Versions.props b/eng/Versions.props index cb7dd8757996..3277b5ca290d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25371.14 + 3.12.0-beta1.25377.9 @@ -206,14 +206,14 @@ - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 - 4.14.0-3.25371.14 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 + 4.14.0-3.25377.9 From 5dda552ce2a1af8c70149e58dfc10ded26b82171 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jul 2025 02:02:57 +0000 Subject: [PATCH 204/293] Update dependencies from https://github.com/dotnet/arcade build 20250728.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25378.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 10 ++++++---- global.json | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5806d746f292..45db965dde9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,6 +22,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b732ce078f6..b65c5fbfb939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6b3fc8c928bc..b34679920c0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25366.2 + 8.0.0-beta.25378.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -211,7 +211,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25366.2 + 8.0.0-beta.25378.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9713e93c84cd..b98f6a6505d3 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -21,6 +21,7 @@ parameters: # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -135,10 +136,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index ba2c55db56f6..2c2724864523 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1" } } From 4246be83f7373b9fddef6b596f76e7bf7e87ab48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jul 2025 02:03:07 +0000 Subject: [PATCH 205/293] Update dependencies from https://github.com/dotnet/arcade build 20250728.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25378.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 10 ++++++---- global.json | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5a5d9542a4d4..e2448e23fa74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dea2021d72ef..da881b4f78f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ed28b2bb5695..a789f4ca0565 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.25366.2 + 8.0.0-beta.25378.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.25366.2 + 8.0.0-beta.25378.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9713e93c84cd..b98f6a6505d3 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -21,6 +21,7 @@ parameters: # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -135,10 +136,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index ba2c55db56f6..2c2724864523 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1" } } From a2164b28e82a88ebc5fef732a141195d775074ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jul 2025 02:03:16 +0000 Subject: [PATCH 206/293] Update dependencies from https://github.com/dotnet/arcade build 20250728.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25378.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 10 ++++++---- global.json | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 612eb42698d2..5daeda9091ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37a70df5565b..dc7ae5aab1b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f - + https://github.com/dotnet/arcade - a73c08ec0de5a6e5e2a8668837df67edecb3a3da + 8dca4f8ae100b102230287f8cc1b75264c9f1a6f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a414cc2f9232..41267fcf07b1 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.25366.2 + 8.0.0-beta.25378.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.25366.2 + 8.0.0-beta.25378.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9713e93c84cd..b98f6a6505d3 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -21,6 +21,7 @@ parameters: # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -135,10 +136,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index ba2c55db56f6..2c2724864523 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1" } } From eb7f9818bc86c3f0dc4a5ca2c06adc3d61b21536 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Jul 2025 02:03:28 +0000 Subject: [PATCH 207/293] Update dependencies from https://github.com/dotnet/roslyn build 20250729.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25379.5 --- NuGet.config | 1 + eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index dcbc4acd760a..d7884070654b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f238cd0436a1..28a5d6e6be3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + ae8d611804d8606d3449bcc5ac4c55b3812d0497 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7d8737cc8ec0..59d764707386 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 + 4.12.0-3.25379.5 From 1a72b8e9ca4f2235add6e587d946e7740c06eef4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Jul 2025 02:03:38 +0000 Subject: [PATCH 208/293] Update dependencies from https://github.com/dotnet/arcade build 20250730.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25325.4 -> To Version 9.0.0-beta.25380.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef90911a7280..d7884070654b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d842c6f86638..7aa6f24d0447 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 diff --git a/eng/Versions.props b/eng/Versions.props index c2fbf8e32c61..d703b7d6d2c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 diff --git a/global.json b/global.json index e2bf9e7a5d5c..17c4517aadab 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From e0d81bee9313592242cfd7590795c90fa22d3504 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Jul 2025 02:03:48 +0000 Subject: [PATCH 209/293] Update dependencies from https://github.com/dotnet/arcade build 20250730.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25325.4 -> To Version 9.0.0-beta.25380.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d302f58ea1f..23f18d565696 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bdc26650ba8..2e77b2561486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 diff --git a/eng/Versions.props b/eng/Versions.props index 7ea5ce6edf55..494c7f8be37e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 diff --git a/global.json b/global.json index e2bf9e7a5d5c..17c4517aadab 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From cf6d0be9c2551e21b221bf29b215f504a79302a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Jul 2025 13:48:48 +0000 Subject: [PATCH 210/293] Update dependencies from https://github.com/dotnet/scenario-tests build 20250731.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25326.1 -> To Version 9.0.0-preview.25381.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef90911a7280..d7884070654b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11a32822bf20..2ffe98186c78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -631,14 +631,14 @@ https://github.com/dotnet/arcade-services e156e649f28395d9d0ee1e848225a689b59e0fd3 - + https://github.com/dotnet/scenario-tests - 69b4c477e9c37a14583e8852fdb60bc68325da74 + 0898abbb5899ef400b8372913c2320295798a687 - + https://github.com/dotnet/scenario-tests - 69b4c477e9c37a14583e8852fdb60bc68325da74 + 0898abbb5899ef400b8372913c2320295798a687 From 186a40479d58b19e15260e5b59884b034f79bb83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Aug 2025 02:03:02 +0000 Subject: [PATCH 211/293] Update dependencies from https://github.com/dotnet/scenario-tests build 20250731.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25326.1 -> To Version 9.0.0-preview.25381.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d302f58ea1f..23f18d565696 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93fe15b0557a..a03b8f877474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -597,14 +597,14 @@ https://github.com/dotnet/arcade-services e156e649f28395d9d0ee1e848225a689b59e0fd3 - + https://github.com/dotnet/scenario-tests - 69b4c477e9c37a14583e8852fdb60bc68325da74 + 0898abbb5899ef400b8372913c2320295798a687 - + https://github.com/dotnet/scenario-tests - 69b4c477e9c37a14583e8852fdb60bc68325da74 + 0898abbb5899ef400b8372913c2320295798a687 From b0449a47f29ac985f6d8128f7378cb45cf110f63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 09:05:24 +0000 Subject: [PATCH 212/293] Update dependencies from https://github.com/dotnet/msbuild build 20250804.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.32-servicing-25352-05 -> To Version 17.8.34-servicing-25404-06 --- NuGet.config | 4 +++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9b49f5f88f26..7095bcc39e6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -22,6 +22,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 336e7d2bb1bb..0d4d1a3b152e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e + a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 - + https://github.com/dotnet/msbuild - 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e + a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 - + https://github.com/dotnet/msbuild - 9cec38ae1c3ab6cbf54738cc2e1e27872a317d0e + a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 diff --git a/eng/Versions.props b/eng/Versions.props index 8f070b2fd626..4b679bf6cb56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,7 +123,7 @@ - 17.8.33 + 17.8.34 $(MicrosoftBuildPackageVersion) - 8.0.119 + 8.0.120 true release From 4cfe4e69af15371b97d8a565910dfa014c0f5d4b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:46:00 -0700 Subject: [PATCH 214/293] Update branding to 8.0.317 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b289b6e1d9d2..cdda02b2f35d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.316 + 8.0.317 8.0.300 true From d8ac5a8934584ccbcce02921b6c7590da89a6718 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:46:11 -0700 Subject: [PATCH 215/293] Update branding to 8.0.414 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 672d28f70b6c..464c1f580ba3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.413 + 8.0.414 8.0.400 true From c221a3b92ffea03b12ca55c1647953c720c99aad Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:46:29 -0700 Subject: [PATCH 216/293] Update branding to 9.0.110 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 584025091dec..a904bb22fae4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 09 + 10 From 166ef15d27ff59cb6aaff8f3737fd8b43ac3eece Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:46:36 -0700 Subject: [PATCH 217/293] Update branding to 9.0.305 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 62f36b3f900f..f313b7a26cb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 3 - 04 + 05 From 0f8c68251504a9f8f6f04d9acdd99fedec598690 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 21:18:21 +0000 Subject: [PATCH 218/293] Update dependencies from https://github.com/dotnet/templating build 20250804.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.109-servicing.25353.8 -> To Version 9.0.110-servicing.25404.5 --- 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 eae8fdd197db..9ec61a243c32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2140263712f..cf88c5a2bfd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 61fb439b15da6a93e411fb3075b6450afd248f63 + 4a9deb242de86b1d27062324c8f4a6a15314e440 - + https://github.com/dotnet/templating - 61fb439b15da6a93e411fb3075b6450afd248f63 + 4a9deb242de86b1d27062324c8f4a6a15314e440 - + https://github.com/dotnet/templating - 61fb439b15da6a93e411fb3075b6450afd248f63 + 4a9deb242de86b1d27062324c8f4a6a15314e440 diff --git a/eng/Versions.props b/eng/Versions.props index 205c375251f4..8debc929d67a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,13 +187,13 @@ - 9.0.109 + 9.0.110 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.109-servicing.25366.10 + 9.0.110-servicing.25404.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From dd972388b5071ada91220152dd2c89d7905b9510 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 21:23:46 +0000 Subject: [PATCH 219/293] Update dependencies from https://github.com/dotnet/templating build 20250804.6 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.304 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f107e894b8c..cd436b654a21 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6596c899f1da..1250af7a4464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 6f9fbbe642bbbc7c30f66f812f68aee36f6bf50e + c504bcae0ffac7ff542e662c0073a9831b7ca3db - + https://github.com/dotnet/templating - 6f9fbbe642bbbc7c30f66f812f68aee36f6bf50e + c504bcae0ffac7ff542e662c0073a9831b7ca3db diff --git a/eng/Versions.props b/eng/Versions.props index 794150bd22e2..dc89a7ba1362 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,13 +189,13 @@ - 9.0.304 + 9.0.305 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.304-servicing.25366.11 + 9.0.305-servicing.25404.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 76c09293a76829b2dee51f2fe16acfca70505bfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 21:42:08 +0000 Subject: [PATCH 220/293] Update dependencies from https://github.com/dotnet/templating build 20250804.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.119-servicing.25353.1 -> To Version 8.0.120-servicing.25404.2 --- 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 8f581500cb1b..508d5013d1fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f4420a900c8..98ff60ac4143 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 2767d6e9a474e2f7600c9201d283804ae72f4c21 + 89975fb00452ecf3d6b7fe5de4134a32805116f8 - + https://github.com/dotnet/templating - 2767d6e9a474e2f7600c9201d283804ae72f4c21 + 89975fb00452ecf3d6b7fe5de4134a32805116f8 - + https://github.com/dotnet/templating - 2767d6e9a474e2f7600c9201d283804ae72f4c21 + 89975fb00452ecf3d6b7fe5de4134a32805116f8 diff --git a/eng/Versions.props b/eng/Versions.props index 1f16fc725a6d..85f950afb5b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,13 +139,13 @@ - 8.0.119 + 8.0.120 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.119-servicing.25366.1 + 8.0.120-servicing.25404.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7b9abb458922385d345f4377107dfaec19d2042b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 23:01:19 +0000 Subject: [PATCH 221/293] Update dependencies from https://github.com/dotnet/templating build 20250804.7 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.109-servicing.25353.8 -> To Version 9.0.110-servicing.25404.7 --- 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 9ec61a243c32..28ca330f57cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf88c5a2bfd4..328f0b65e578 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 4a9deb242de86b1d27062324c8f4a6a15314e440 + 337d94593960e5baee080de92cd46830c3a6de2d - + https://github.com/dotnet/templating - 4a9deb242de86b1d27062324c8f4a6a15314e440 + 337d94593960e5baee080de92cd46830c3a6de2d - + https://github.com/dotnet/templating - 4a9deb242de86b1d27062324c8f4a6a15314e440 + 337d94593960e5baee080de92cd46830c3a6de2d diff --git a/eng/Versions.props b/eng/Versions.props index 8debc929d67a..b23ea1e9eebe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.110-servicing.25404.5 + 9.0.110-servicing.25404.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 69a6000e4847e9ff80bed387f69660bbb5db7a1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 23:26:45 +0000 Subject: [PATCH 222/293] Update dependencies from https://github.com/dotnet/templating build 20250804.9 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.119-servicing.25353.1 -> To Version 8.0.120-servicing.25404.9 --- 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 508d5013d1fb..0c9826ce6bdb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98ff60ac4143..cfd586a34f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 89975fb00452ecf3d6b7fe5de4134a32805116f8 + 855483d28bd60fcb6e1f1f155828e8da8a46dee7 - + https://github.com/dotnet/templating - 89975fb00452ecf3d6b7fe5de4134a32805116f8 + 855483d28bd60fcb6e1f1f155828e8da8a46dee7 - + https://github.com/dotnet/templating - 89975fb00452ecf3d6b7fe5de4134a32805116f8 + 855483d28bd60fcb6e1f1f155828e8da8a46dee7 diff --git a/eng/Versions.props b/eng/Versions.props index 85f950afb5b0..a96c8586110e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.120-servicing.25404.2 + 8.0.120-servicing.25404.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 62139aa9bd0a429def770d00cb7dae22dc208b12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:02:33 +0000 Subject: [PATCH 223/293] Update dependencies from https://github.com/dotnet/msbuild build 20250804.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.33-servicing-25353-02 -> To Version 17.10.35-servicing-25404-02 --- NuGet.config | 4 +++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7da1de707634..70b993ec80e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29e5de39bf8b..84ffb0f741da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - 15234f77a6483703b639123549a36bceebc8f8d2 + cac01d670cd054af080c4b696a8e8261549146e1 - + https://github.com/dotnet/msbuild - 15234f77a6483703b639123549a36bceebc8f8d2 + cac01d670cd054af080c4b696a8e8261549146e1 - + https://github.com/dotnet/msbuild - 15234f77a6483703b639123549a36bceebc8f8d2 + cac01d670cd054af080c4b696a8e8261549146e1 diff --git a/eng/Versions.props b/eng/Versions.props index a60141fd3841..6aa4675203c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.34 + 17.10.35 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ca1cc9991fe..a657589a9138 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 + 3dbc33c97987d0d612800d322c24e342ca25f520 - + https://github.com/dotnet/templating - d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 + 3dbc33c97987d0d612800d322c24e342ca25f520 - + https://github.com/dotnet/templating - d0157dbedbbacd5360f5a4248785eae4d5b4b3d5 + 3dbc33c97987d0d612800d322c24e342ca25f520 diff --git a/eng/Versions.props b/eng/Versions.props index 40a84fc8e0c8..7e48d28554db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.316 + 8.0.317 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.316-servicing.25366.2 + 8.0.317-servicing.25404.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0744bde5652cdb3d0101800d26718fb52d2c4b8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:02:42 +0000 Subject: [PATCH 225/293] Update dependencies from https://github.com/dotnet/templating build 20250804.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.413-servicing.25353.7 -> To Version 8.0.414-servicing.25404.4 --- 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 2fbcb6cbcbbf..89048911b8d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72f1c38ed2d2..c45a5e7e6083 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 + 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 - + https://github.com/dotnet/templating - 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 + 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 - + https://github.com/dotnet/templating - 2acb67a23dd3bcd9a10018430cd9f61d2d1db293 + 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 diff --git a/eng/Versions.props b/eng/Versions.props index 8e81377ed9b8..2c8f64c742ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.413 + 8.0.414 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.413-servicing.25366.8 + 8.0.414-servicing.25404.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From dfca5038ed7d6f4820246f8dc3c87457a31576d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:03:03 +0000 Subject: [PATCH 226/293] Update dependencies from https://github.com/dotnet/msbuild build 20250804.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.41-preview-25359-01 -> To Version 17.12.43-preview-25404-04 --- 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 91fee88e7602..52baeddd64e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17520973e653..da0f4053da28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://github.com/dotnet/msbuild - b22f419b0d4d4f3df90f7498809b30498d79ce30 + 481b855f7315f967f9c14b83d4391ae05b7be1af - + https://github.com/dotnet/msbuild - b22f419b0d4d4f3df90f7498809b30498d79ce30 + 481b855f7315f967f9c14b83d4391ae05b7be1af - + https://github.com/dotnet/msbuild - b22f419b0d4d4f3df90f7498809b30498d79ce30 + 481b855f7315f967f9c14b83d4391ae05b7be1af diff --git a/eng/Versions.props b/eng/Versions.props index 8a8f4d2ee024..1b01cd2aa334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.42 - 17.12.42-preview-25371-13 + 17.12.43 + 17.12.43-preview-25404-04 17.11.31 17.12 From a0e44f6fa34904ff214c13d27390df3063565fab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:03:09 +0000 Subject: [PATCH 227/293] Update dependencies from https://github.com/dotnet/roslyn build 20250804.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25404.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28a5d6e6be3c..0a56755494ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 - + https://github.com/dotnet/roslyn - ae8d611804d8606d3449bcc5ac4c55b3812d0497 + 4d68ef53bf037528cbe2066696b872aaa8b4fe36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3522945813b0..b8e96bc7180a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 - 4.12.0-3.25379.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 + 4.12.0-3.25404.5 From dbaec2030fca1cfeb84c34704e03d9d9adc64f5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:03:56 +0000 Subject: [PATCH 228/293] Update dependencies from https://github.com/dotnet/roslyn build 20250804.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25359.3 -> To Version 4.14.0-3.25404.3 --- NuGet.config | 1 + eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e5c184a1776..23f18d565696 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,6 +36,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36d64d32ec41..4801494e1430 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 68fb8b219ba741534744b0dbe6ede181c3d46cf4 + 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 diff --git a/eng/Versions.props b/eng/Versions.props index 9d1c6a1f1245..1374ca22065f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25377.9 + 3.12.0-beta1.25404.3 @@ -206,14 +206,14 @@ - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 - 4.14.0-3.25377.9 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 + 4.14.0-3.25404.3 From 72aac59a57cc7e18bf7b02b05833c31dbbca5a47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 07:36:47 +0000 Subject: [PATCH 229/293] Update dependencies from https://github.com/dotnet/templating build 20250804.13 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.109-servicing.25353.8 -> To Version 9.0.110-servicing.25404.13 --- NuGet.config | 5 +---- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7884070654b..fbe907235e4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,10 +35,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fbcdd821449..0262c4cb1987 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 337d94593960e5baee080de92cd46830c3a6de2d + d18ec5e163f56adb143321ca1c63b054ab66a623 - + https://github.com/dotnet/templating - 337d94593960e5baee080de92cd46830c3a6de2d + d18ec5e163f56adb143321ca1c63b054ab66a623 - + https://github.com/dotnet/templating - 337d94593960e5baee080de92cd46830c3a6de2d + d18ec5e163f56adb143321ca1c63b054ab66a623 diff --git a/eng/Versions.props b/eng/Versions.props index da230a2cb33f..fbfe800feb46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.110-servicing.25404.7 + 9.0.110-servicing.25404.13 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 797d0745309836352dc91c69ccc0b8c217f3e8d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 07:42:25 +0000 Subject: [PATCH 230/293] Update dependencies from https://github.com/dotnet/templating build 20250804.14 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd436b654a21..7a8e8f9aa346 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1250af7a4464..fcf1f5b7ad66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - c504bcae0ffac7ff542e662c0073a9831b7ca3db + 657f35a4cb4e148fc87ae0f1fa3bf29901b32b0c - + https://github.com/dotnet/templating - c504bcae0ffac7ff542e662c0073a9831b7ca3db + 657f35a4cb4e148fc87ae0f1fa3bf29901b32b0c diff --git a/eng/Versions.props b/eng/Versions.props index 7c8b7f4b8c21..78e58e92dab6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25404.6 + 9.0.305-servicing.25404.14 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 189f0228d2c9037a9132cc56aa396c9fd2bf5fe4 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Tue, 5 Aug 2025 15:42:40 +0800 Subject: [PATCH 231/293] Revert the change for NuGet.config --- NuGet.config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70b993ec80e8..6a36b8895068 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,10 +22,7 @@ - - - - + From 23eae154ff43be902db84f65665b36efe64cf295 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 08:45:10 +0000 Subject: [PATCH 232/293] [release/9.0.3xx] Update dependencies from dotnet/msbuild (#49890) [release/9.0.3xx] Update dependencies from dotnet/msbuild - Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-a7097fd5-3dcb-44a3-a96c-36bb9bbed988 - Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-a7097fd5-3dcb-44a3-a96c-36bb9bbed988 --- 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 7a8e8f9aa346..245e1fd037a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcf1f5b7ad66..1aa7ca3acaa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://github.com/dotnet/msbuild - 5d8159c5fa474b60b0c1e5159b0dd054a102ee8a + 3e6a44deac638c77abe57022eab4ae9db4cf442c - + https://github.com/dotnet/msbuild - 5d8159c5fa474b60b0c1e5159b0dd054a102ee8a + 3e6a44deac638c77abe57022eab4ae9db4cf442c - + https://github.com/dotnet/msbuild - 5d8159c5fa474b60b0c1e5159b0dd054a102ee8a + 3e6a44deac638c77abe57022eab4ae9db4cf442c diff --git a/eng/Versions.props b/eng/Versions.props index 78e58e92dab6..4fa4e81dfc36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,8 +182,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.16 - 17.14.16-servicing-25360-01 + 17.14.20 + 17.14.20-servicing-25404-05 17.11.31 17.12 From d4508f11407fbd1f161df489f4737ecbb5aead4b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 5 Aug 2025 15:46:27 -0700 Subject: [PATCH 233/293] Switch to the shipped version to be compatible with templating --- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 24 ++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0262c4cb1987..49f7166cdf2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,72 +143,72 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore f6b3a5da75eb405046889a5447ec9b14cc29d285 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 diff --git a/eng/Versions.props b/eng/Versions.props index fbfe800feb46..b0a68f721961 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,18 +137,18 @@ - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 - 6.12.4-rc.9 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 From 269bbc4ccc87b41c32ca315f6142bd43fe8cd231 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Aug 2025 02:02:45 +0000 Subject: [PATCH 234/293] Update dependencies from https://github.com/dotnet/templating build 20250804.11 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.317-servicing.25404.10 -> To Version 8.0.317-servicing.25404.11 --- 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 6a36b8895068..969660583191 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e634ccaea22..19b3ae7212db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 3dbc33c97987d0d612800d322c24e342ca25f520 + 774ec0649c4f62160b4728944c97897d6fb4ac9c - + https://github.com/dotnet/templating - 3dbc33c97987d0d612800d322c24e342ca25f520 + 774ec0649c4f62160b4728944c97897d6fb4ac9c - + https://github.com/dotnet/templating - 3dbc33c97987d0d612800d322c24e342ca25f520 + 774ec0649c4f62160b4728944c97897d6fb4ac9c diff --git a/eng/Versions.props b/eng/Versions.props index 4875fa583cb0..ef29b600cbf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.317-servicing.25404.10 + 8.0.317-servicing.25404.11 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f49bff1f23f7cb2d8046668f1f9aae874aca9dc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Aug 2025 02:02:46 +0000 Subject: [PATCH 235/293] Update dependencies from https://github.com/dotnet/templating build 20250804.12 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.414-servicing.25404.4 -> To Version 8.0.414-servicing.25404.12 --- 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 89048911b8d3..d5c10e77e75e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a79a6c554944..7103fe2818de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 + 99c37009221081cb8ba4edc41411f81532cf6554 - + https://github.com/dotnet/templating - 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 + 99c37009221081cb8ba4edc41411f81532cf6554 - + https://github.com/dotnet/templating - 7af6f77c604d9420f5e4b39c112d7f56ff6b3d56 + 99c37009221081cb8ba4edc41411f81532cf6554 diff --git a/eng/Versions.props b/eng/Versions.props index 024db3416c81..799464715740 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.414-servicing.25404.4 + 8.0.414-servicing.25404.12 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1a7abbf443b01b27468f64fcd8495f7c2f47a53e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Aug 2025 02:02:49 +0000 Subject: [PATCH 236/293] Update dependencies from https://github.com/dotnet/msbuild build 20250805.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.38-servicing-25354-03 -> To Version 17.11.40-servicing-25405-01 --- 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 89048911b8d3..6db66b9adb65 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a79a6c554944..2532997766be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - 901dc04e451b05d9d583d4cedd50c3db605dab8c + 286d1713528913f2d14de72a5824c6b79eba1655 - + https://github.com/dotnet/msbuild - 901dc04e451b05d9d583d4cedd50c3db605dab8c + 286d1713528913f2d14de72a5824c6b79eba1655 - + https://github.com/dotnet/msbuild - 901dc04e451b05d9d583d4cedd50c3db605dab8c + 286d1713528913f2d14de72a5824c6b79eba1655 diff --git a/eng/Versions.props b/eng/Versions.props index 024db3416c81..d61020d9accb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.11.38 + 17.11.40 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49f7166cdf2a..e028fda33cb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - d18ec5e163f56adb143321ca1c63b054ab66a623 + 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda - + https://github.com/dotnet/templating - d18ec5e163f56adb143321ca1c63b054ab66a623 + 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda - + https://github.com/dotnet/templating - d18ec5e163f56adb143321ca1c63b054ab66a623 + 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda diff --git a/eng/Versions.props b/eng/Versions.props index b0a68f721961..ede180e1b361 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.110-servicing.25404.13 + 9.0.110-servicing.25405.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From e8e1973136b7befb6380dfdaad36ff9fd16a3a65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Aug 2025 03:43:22 +0000 Subject: [PATCH 238/293] Update dependencies from https://github.com/dotnet/templating build 20250805.4 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 245e1fd037a5..cc3a4cc20577 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d944f72d1ec4..35ca2caa344a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 657f35a4cb4e148fc87ae0f1fa3bf29901b32b0c + 1b303bd6aa2dcae0b6442e1e68b24e41a6abc861 - + https://github.com/dotnet/templating - 657f35a4cb4e148fc87ae0f1fa3bf29901b32b0c + 1b303bd6aa2dcae0b6442e1e68b24e41a6abc861 diff --git a/eng/Versions.props b/eng/Versions.props index 1386e025f92c..c2382db2e91d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25404.14 + 9.0.305-servicing.25405.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 01874aec82f25e5b42e3c98854a8899a6ed2dfe7 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 6 Aug 2025 14:55:53 -0500 Subject: [PATCH 239/293] .NET Source-Build 9.0.109 August 2025 Updates (#50060) --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 39172d5867c9..8cffcf1211e0 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 34016642debc..df48b03f7ed0 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.108 - 9.0.108-servicing.25317.1 + 9.0.109 + 9.0.109-servicing.25368.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 559990343e6f..51de65b5f486 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.108" + "dotnet": "9.0.109" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4" } } From 113b073e692c2ec7144301ff8d2348d34aee81b5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Aug 2025 13:33:09 -0700 Subject: [PATCH 240/293] Switch nugetsdkresolver back to the unstable version --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42d8897e528c..0ffae1cfa753 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,7 +143,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 215a587e52efa710de84138b0a3374b860b924d8 - + https://github.com/nuget/nuget.client 42bfb4554167e1d2fc2b950728d9bd8164f806c1 diff --git a/eng/Versions.props b/eng/Versions.props index 48147b5a26e8..c5fbd38f8663 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ 6.12.4 6.12.4 6.12.4 - 6.12.4 + 6.12.4-rc.9 6.12.4 6.12.4 6.12.4 From d088aa7c7ecb4d45233c7038fa1dc58c92aac16e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Aug 2025 13:43:02 -0700 Subject: [PATCH 241/293] switch back to prior templating nuget --- NuGet.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f8a5f114728..d0d8ffad5c08 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,8 +25,7 @@ - - + From 9a329ef4cd90aab0fe5c5844846858fd75a1e455 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Aug 2025 13:43:57 -0700 Subject: [PATCH 242/293] switch back to prior templating nuget --- NuGet.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b7ae3083252..83473b5d13f4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,8 +26,7 @@ - - + From 3a960aea49e2b1185d01a0ae6643905d8a30473e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Aug 2025 13:44:29 -0700 Subject: [PATCH 243/293] switch back to prior templating nuget --- NuGet.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 971a671083d7..a3041e590d17 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,8 +26,7 @@ - - + From 15d1f6a2382684a1361a37ece0fcc6e2c57d8ccb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 6 Aug 2025 13:45:21 -0700 Subject: [PATCH 244/293] switch back to prior templating nuget --- NuGet.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41343dfcb93b..23198e87684e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -39,8 +39,7 @@ - - + From 5f8b41df024f3d2abd9e7e5c2d1726f21f4d9298 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 02:02:12 +0000 Subject: [PATCH 245/293] Update dependencies from https://github.com/dotnet/templating build 20250805.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.414-servicing.25404.12 -> To Version 8.0.414-servicing.25405.2 --- 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 88256ac40b5b..b2ac9ddc5c5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7879be7d8a6..9a27ae0a6e43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 99c37009221081cb8ba4edc41411f81532cf6554 + 0050b44fc3b0a75dd0f6831c55182a9d37a810ac - + https://github.com/dotnet/templating - 99c37009221081cb8ba4edc41411f81532cf6554 + 0050b44fc3b0a75dd0f6831c55182a9d37a810ac - + https://github.com/dotnet/templating - 99c37009221081cb8ba4edc41411f81532cf6554 + 0050b44fc3b0a75dd0f6831c55182a9d37a810ac diff --git a/eng/Versions.props b/eng/Versions.props index f4e0585e951c..b1dd2ac63d33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.414-servicing.25404.12 + 8.0.414-servicing.25405.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From ece80d5383ab3dfd41531604cb48b2954684b7fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 02:02:57 +0000 Subject: [PATCH 246/293] Update dependencies from https://github.com/dotnet/arcade build 20250806.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25380.1 -> To Version 9.0.0-beta.25406.1 --- eng/Version.Details.xml | 28 +++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/core-templates/job/job.yml | 10 ++++++---- global.json | 4 ++-- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ca2caa344a..af5094eedd32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 diff --git a/eng/Versions.props b/eng/Versions.props index c2382db2e91d..87137e0e4aed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09..8947ea3f0593 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index 17c4517aadab..3d10e8b4be0b 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 2c7be5671c1c3d3087d1a7417927f86804fc2a02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 02:02:59 +0000 Subject: [PATCH 247/293] Update dependencies from https://github.com/dotnet/arcade build 20250806.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25380.1 -> To Version 9.0.0-beta.25406.1 --- NuGet.config | 16 +++++++++++++++ eng/Version.Details.xml | 28 +++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/core-templates/job/job.yml | 10 ++++++---- global.json | 4 ++-- 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0659b37d1d47..89e874e2908d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,10 +25,14 @@ + + + + @@ -37,13 +41,19 @@ + + + + + + @@ -70,14 +80,20 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d91e4411497..ed0296c9cc87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 diff --git a/eng/Versions.props b/eng/Versions.props index b1ddad24146e..ec46990e16bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09..8947ea3f0593 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index 17c4517aadab..3d10e8b4be0b 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From bf55b9c026ef9a02738ffbadeb71cd0101acc6e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 04:19:46 +0000 Subject: [PATCH 248/293] Update dependencies from https://github.com/dotnet/templating build 20250806.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc3a4cc20577..24cbaf1c7a08 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ca2caa344a..649b39ba51d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 1b303bd6aa2dcae0b6442e1e68b24e41a6abc861 + 7c94526e3424f096ad6c236dd2e403d1f5be7618 - + https://github.com/dotnet/templating - 1b303bd6aa2dcae0b6442e1e68b24e41a6abc861 + 7c94526e3424f096ad6c236dd2e403d1f5be7618 diff --git a/eng/Versions.props b/eng/Versions.props index c2382db2e91d..01d593cbcb2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25405.4 + 9.0.305-servicing.25406.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1a4cd3d25178189d76a99ffff326e1d52cdb69f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 04:25:18 +0000 Subject: [PATCH 249/293] Update dependencies from https://github.com/dotnet/templating build 20250806.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.110-servicing.25405.3 -> To Version 9.0.110-servicing.25406.2 --- NuGet.config | 16 +++++++++++++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0974d4604a2..d6cf98dd53ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,10 +25,14 @@ + + + + @@ -37,12 +41,16 @@ + + - + + + @@ -69,14 +77,20 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ffae1cfa753..47862e0df79a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda + 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 - + https://github.com/dotnet/templating - 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda + 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 - + https://github.com/dotnet/templating - 2fc4beb0693bb53e83c73e7ce4cf37dd74991fda + 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 diff --git a/eng/Versions.props b/eng/Versions.props index c5fbd38f8663..47d231a70889 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.110-servicing.25405.3 + 9.0.110-servicing.25406.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From d2481279a19a7b1fa9b1c1d7eab613e88f92a750 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 06:11:37 +0000 Subject: [PATCH 250/293] Update dependencies from https://github.com/dotnet/templating build 20250806.4 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 24cbaf1c7a08..774aaf83dbb7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089133057fa6..d1872640a646 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 7c94526e3424f096ad6c236dd2e403d1f5be7618 + 8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9 - + https://github.com/dotnet/templating - 7c94526e3424f096ad6c236dd2e403d1f5be7618 + 8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9 diff --git a/eng/Versions.props b/eng/Versions.props index 9376d1072530..03b7d26ce756 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25406.3 + 9.0.305-servicing.25406.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fa27fee81fa6242e2acc9de5165ff88317e80a2f Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 7 Aug 2025 14:41:22 +0800 Subject: [PATCH 251/293] Revert changes on NuGet.config --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 5fb7d667885a..06b4d3246534 100644 --- a/NuGet.config +++ b/NuGet.config @@ -77,6 +77,9 @@ + + + From b30d1992e54f0f0efc5f51730247c8d3abb4725e Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Thu, 7 Aug 2025 15:10:14 +0800 Subject: [PATCH 252/293] upgrade MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion from 9.0.7 to 9.0.8 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d12d730549bd..f20e0d682468 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -319,7 +319,7 @@ 15.0.9617 18.0.9617 - 9.0.7 + 9.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 9e062e4dc05a84a56c2531081bb406e925e18b93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 09:41:54 +0000 Subject: [PATCH 253/293] Update dependencies from https://github.com/dotnet/msbuild build 20250807.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.34-servicing-25404-06 -> To Version 17.8.35-servicing-25407-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 671ee8b88c16..68e0d5f74510 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 168ed1ead21c..33684a50375e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 + fe4b4c2c710f9ffdc4db980d1a2a4cb62fdd3c67 - + https://github.com/dotnet/msbuild - a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 + fe4b4c2c710f9ffdc4db980d1a2a4cb62fdd3c67 - + https://github.com/dotnet/msbuild - a0194b4a44352e26cd9fcbdb97c80a2158d1d3d9 + fe4b4c2c710f9ffdc4db980d1a2a4cb62fdd3c67 diff --git a/eng/Versions.props b/eng/Versions.props index a1bdd926990c..5bea6acf879e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,7 +123,7 @@ - 17.8.34 + 17.8.35 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19b3ae7212db..92434ff42c79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 976b101e5539557c20e2ac39885ac879531bcf82 - + https://github.com/dotnet/msbuild - cac01d670cd054af080c4b696a8e8261549146e1 + b8adc522ee7d5037466b4a6a79cef640357b5ace - + https://github.com/dotnet/msbuild - cac01d670cd054af080c4b696a8e8261549146e1 + b8adc522ee7d5037466b4a6a79cef640357b5ace - + https://github.com/dotnet/msbuild - cac01d670cd054af080c4b696a8e8261549146e1 + b8adc522ee7d5037466b4a6a79cef640357b5ace diff --git a/eng/Versions.props b/eng/Versions.props index ef29b600cbf7..7d2d4eeb4a16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.35 + 17.10.36 $(MicrosoftBuildPackageVersion) - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 diff --git a/eng/Versions.props b/eng/Versions.props index 2da952286a79..d08135c05a88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 diff --git a/global.json b/global.json index 3d10e8b4be0b..6f0774463856 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.107", + "dotnet": "9.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 4dbee6975dc0d17f8584452922f57fa33e5b7a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:04:20 +0000 Subject: [PATCH 258/293] Update dependencies from https://github.com/dotnet/arcade build 20250807.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25406.1 -> To Version 9.0.0-beta.25407.2 --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 6 +++--- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index b936b613df46..54bb2bd0c3b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,13 @@ + + + + @@ -37,12 +41,16 @@ + + + + @@ -73,12 +81,18 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d232d6f4ecc9..88b5091b3139 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 diff --git a/eng/Versions.props b/eng/Versions.props index 46d5d8377b34..55523fd1d50b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 diff --git a/global.json b/global.json index 3d10e8b4be0b..6f0774463856 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.107", + "dotnet": "9.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 18e167de6799ec20bf2e04bef2cc1adb7ef1cb37 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Fri, 8 Aug 2025 10:19:58 +0800 Subject: [PATCH 259/293] Add darc-int-dotnet-windowsdesktop-5fa74c8 to disabledPackageSources --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index f9ee465de8cc..07260dd3ac4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -70,6 +70,7 @@ + From c470d0b2013c97a5f1e26553df1685e5f82bc004 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 03:27:08 +0000 Subject: [PATCH 260/293] Update dependencies from https://github.com/dotnet/templating build 20250807.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.110-servicing.25406.2 -> To Version 9.0.110-servicing.25407.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 d6cf98dd53ce..842f54dd01ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0fa0c188396..2fb766f169c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 + 2a6351f11c4a527a0e095c5ed749f56e75efc8e9 - + https://github.com/dotnet/templating - 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 + 2a6351f11c4a527a0e095c5ed749f56e75efc8e9 - + https://github.com/dotnet/templating - 5892e3ec4f807e8d86bfa99fde533ebd4abd2a24 + 2a6351f11c4a527a0e095c5ed749f56e75efc8e9 diff --git a/eng/Versions.props b/eng/Versions.props index 2da952286a79..d3c5730a76e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.110-servicing.25406.2 + 9.0.110-servicing.25407.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From cd017ef8f52bcde5702de5339b1d103d14d3f8c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 03:34:36 +0000 Subject: [PATCH 261/293] Update dependencies from https://github.com/dotnet/templating build 20250807.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 16 +++++++++++++++- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b936b613df46..109f0f3c0e7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,9 +25,13 @@ + + + + @@ -37,12 +41,16 @@ + + - + + + @@ -73,12 +81,18 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d232d6f4ecc9..3c186fa71409 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9 + 3167f8a7b18894ad05c54f937d67ed7da8e41a90 - + https://github.com/dotnet/templating - 8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9 + 3167f8a7b18894ad05c54f937d67ed7da8e41a90 diff --git a/eng/Versions.props b/eng/Versions.props index 46d5d8377b34..4e41ba670204 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25406.4 + 9.0.305-servicing.25407.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c53f2e77e5b9de828c2ef9845b42e1b372551160 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 04:24:08 +0000 Subject: [PATCH 262/293] Update dependencies from https://github.com/dotnet/templating build 20250807.8 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 109f0f3c0e7d..feff1aa4289b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c186fa71409..4033f72e17fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 3167f8a7b18894ad05c54f937d67ed7da8e41a90 + 53394f71a3061f4a0aa1c1197026d65b3efe308b - + https://github.com/dotnet/templating - 3167f8a7b18894ad05c54f937d67ed7da8e41a90 + 53394f71a3061f4a0aa1c1197026d65b3efe308b diff --git a/eng/Versions.props b/eng/Versions.props index 4e41ba670204..569565c84a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25407.5 + 9.0.305-servicing.25407.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fc4a80a2467bed3920c1b131fefdd64d33d668d3 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Fri, 8 Aug 2025 16:34:36 +0800 Subject: [PATCH 263/293] Add darc-int-dotnet-aspnetcore-277e317 to disabledPackageSources. --- NuGet.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index f83f7d6f71b2..d0f0238a74a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -56,11 +56,12 @@ + + - From 2d611307ede8b170e5853e016d4a6c7725378ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 14:53:43 +0000 Subject: [PATCH 264/293] Update dependencies from https://github.com/dotnet/templating build 20250807.9 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.317-servicing.25404.11 -> To Version 8.0.317-servicing.25407.9 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07260dd3ac4a..65020faa23bb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -16,6 +18,8 @@ + + @@ -24,12 +28,16 @@ + + - + + + @@ -56,6 +64,8 @@ + + @@ -66,11 +76,15 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da12e56d8262..ff44c26b0666 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 774ec0649c4f62160b4728944c97897d6fb4ac9c + 6c7fa94364cae917ec8ce37e65e442cea2258041 - + https://github.com/dotnet/templating - 774ec0649c4f62160b4728944c97897d6fb4ac9c + 6c7fa94364cae917ec8ce37e65e442cea2258041 - + https://github.com/dotnet/templating - 774ec0649c4f62160b4728944c97897d6fb4ac9c + 6c7fa94364cae917ec8ce37e65e442cea2258041 diff --git a/eng/Versions.props b/eng/Versions.props index 68f5eda7c6eb..25c09ef02b82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.317-servicing.25404.11 + 8.0.317-servicing.25407.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From e0076f75a8dbb7307045f82b56f04f7289eb4c95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 14:54:08 +0000 Subject: [PATCH 265/293] Update dependencies from https://github.com/dotnet/templating build 20250807.10 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.414-servicing.25405.2 -> To Version 8.0.414-servicing.25407.10 --- 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 b2ac9ddc5c5b..6d5d781d33ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebb3ddafef61..82c5c2de320b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 0050b44fc3b0a75dd0f6831c55182a9d37a810ac + 9b452ddd4f2c1e62e373bfe6530f7970f24401d9 - + https://github.com/dotnet/templating - 0050b44fc3b0a75dd0f6831c55182a9d37a810ac + 9b452ddd4f2c1e62e373bfe6530f7970f24401d9 - + https://github.com/dotnet/templating - 0050b44fc3b0a75dd0f6831c55182a9d37a810ac + 9b452ddd4f2c1e62e373bfe6530f7970f24401d9 diff --git a/eng/Versions.props b/eng/Versions.props index 50943e64a869..e45d3d16b4fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.414-servicing.25405.2 + 8.0.414-servicing.25407.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From cac70b100488b94181f1d517069a169e05202c1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Aug 2025 02:02:15 +0000 Subject: [PATCH 266/293] Update dependencies from https://github.com/dotnet/msbuild build 20250808.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.36-servicing-25407-05 -> To Version 17.10.37-servicing-25408-07 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5546fb78243..354604893547 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -16,20 +18,26 @@ + + - + + + + + @@ -56,6 +64,8 @@ + + @@ -66,11 +76,15 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fa54a1196f0..563830919409 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 - b8adc522ee7d5037466b4a6a79cef640357b5ace + da89d7e734ee4174f5a95703b2cdd4ea592f4f69 - + https://github.com/dotnet/msbuild - b8adc522ee7d5037466b4a6a79cef640357b5ace + da89d7e734ee4174f5a95703b2cdd4ea592f4f69 - + https://github.com/dotnet/msbuild - b8adc522ee7d5037466b4a6a79cef640357b5ace + da89d7e734ee4174f5a95703b2cdd4ea592f4f69 diff --git a/eng/Versions.props b/eng/Versions.props index 526875f79b35..a77b262959de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.36 + 17.10.37 $(MicrosoftBuildPackageVersion) - - - - @@ -17,27 +13,18 @@ - - - - + - - - - - - @@ -64,9 +51,6 @@ - - - @@ -76,14 +60,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 563830919409..164a22949e60 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 - da89d7e734ee4174f5a95703b2cdd4ea592f4f69 + 02960019913e12a2a104a41249c9f8df2c2aa20d - + https://github.com/dotnet/msbuild - da89d7e734ee4174f5a95703b2cdd4ea592f4f69 + 02960019913e12a2a104a41249c9f8df2c2aa20d - + https://github.com/dotnet/msbuild - da89d7e734ee4174f5a95703b2cdd4ea592f4f69 + 02960019913e12a2a104a41249c9f8df2c2aa20d diff --git a/eng/Versions.props b/eng/Versions.props index a77b262959de..372f9e502b3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,7 +126,7 @@ - 17.10.37 + 17.10.38 $(MicrosoftBuildPackageVersion) - - - - - - - - + - - - - - - @@ -77,21 +64,12 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 825149a8e880..cecaf9957740 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://github.com/dotnet/msbuild - 481b855f7315f967f9c14b83d4391ae05b7be1af + db5c766a7b07e0d1bb073757f8893c4e02200644 - + https://github.com/dotnet/msbuild - 481b855f7315f967f9c14b83d4391ae05b7be1af + db5c766a7b07e0d1bb073757f8893c4e02200644 - + https://github.com/dotnet/msbuild - 481b855f7315f967f9c14b83d4391ae05b7be1af + db5c766a7b07e0d1bb073757f8893c4e02200644 diff --git a/eng/Versions.props b/eng/Versions.props index 2ecff6eb10ed..de24fab38e54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.43 - 17.12.43-preview-25404-04 + 17.12.44 + 17.12.44-preview-25411-07 17.11.31 17.12 From f75c7da33600b9be8a87dbc56ee404b7805b4c73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 02:02:38 +0000 Subject: [PATCH 269/293] Update dependencies from https://github.com/microsoft/vstest build 20250811.2 Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.14.1-release-25302-01 -> To Version 17.14.1-release-25411-02 --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index feff1aa4289b..9a8103ca0be7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,15 +24,8 @@ - - - - - - - @@ -40,17 +33,11 @@ - - - - - - @@ -81,19 +68,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e46b7bc801..ec4959594ead 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,22 +208,22 @@ https://github.com/nuget/nuget.client 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - 490850ae3fdc1b470e3804ceab4f6a41cf89ae51 + 4ac9f0d4d2df494076374c8f8943155e1b24fef3 - + https://github.com/microsoft/vstest - 490850ae3fdc1b470e3804ceab4f6a41cf89ae51 + 4ac9f0d4d2df494076374c8f8943155e1b24fef3 - + https://github.com/microsoft/vstest - 490850ae3fdc1b470e3804ceab4f6a41cf89ae51 + 4ac9f0d4d2df494076374c8f8943155e1b24fef3 - + https://github.com/microsoft/vstest - 490850ae3fdc1b470e3804ceab4f6a41cf89ae51 + 4ac9f0d4d2df494076374c8f8943155e1b24fef3 diff --git a/eng/Versions.props b/eng/Versions.props index aedf18c639b3..a855509e1de4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,9 +154,9 @@ - 17.14.1-release-25302-01 - 17.14.1-release-25302-01 - 17.14.1-release-25302-01 + 17.14.1-release-25411-02 + 17.14.1-release-25411-02 + 17.14.1-release-25411-02 From 4b30440d7a2e5899b6aba1e00c8bee152c3425d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 02:02:49 +0000 Subject: [PATCH 270/293] Update dependencies from https://github.com/dotnet/msbuild build 20250811.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.20-servicing-25404-05 -> To Version 17.14.21-servicing-25411-08 --- NuGet.config | 24 +----------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index feff1aa4289b..849f424efdc6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,33 +24,20 @@ - - - - - - - - + - - - - - - @@ -81,19 +68,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e46b7bc801..b6f1aba32d21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://github.com/dotnet/msbuild - 3e6a44deac638c77abe57022eab4ae9db4cf442c + 8929ca9e34d7643e05f10739daf87fe70ae42ae7 - + https://github.com/dotnet/msbuild - 3e6a44deac638c77abe57022eab4ae9db4cf442c + 8929ca9e34d7643e05f10739daf87fe70ae42ae7 - + https://github.com/dotnet/msbuild - 3e6a44deac638c77abe57022eab4ae9db4cf442c + 8929ca9e34d7643e05f10739daf87fe70ae42ae7 diff --git a/eng/Versions.props b/eng/Versions.props index aedf18c639b3..c75411cac8b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,8 +182,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.20 - 17.14.20-servicing-25404-05 + 17.14.21 + 17.14.21-servicing-25411-08 17.11.31 17.12 From 321c473565b6af4c06c6857db78250ea009927e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 02:03:26 +0000 Subject: [PATCH 271/293] Update dependencies from https://github.com/dotnet/roslyn build 20250811.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25404.3 -> To Version 4.14.0-3.25411.5 --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 29 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index feff1aa4289b..9a8103ca0be7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,15 +24,8 @@ - - - - - - - @@ -40,17 +33,11 @@ - - - - - - @@ -81,19 +68,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e46b7bc801..cd4d842f243d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 22348b23fcd770362ca1ed60c5ec3db22c9cabc7 + e7629a643c9f36df4a8aae72eecf1abf56e0cc42 diff --git a/eng/Versions.props b/eng/Versions.props index aedf18c639b3..f5009e1d1622 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25404.3 + 3.12.0-beta1.25411.5 @@ -206,14 +206,14 @@ - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 - 4.14.0-3.25404.3 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 + 4.14.0-3.25411.5 From 92f3c773efbd907af71978d657af5191c0126867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Tue, 12 Aug 2025 18:03:04 +0200 Subject: [PATCH 272/293] [release/9.0.3xx] Fix forwarding DOTNET_ROOT (#50185) --- .../dotnet/commands/dotnet-test/Program.cs | 6 ++--- .../dotnet-test/VSTestForwardingApp.cs | 23 +++++++++++-------- .../Tests.cs | 2 +- ...stForwardDotnetRootEnvironmentVariables.cs | 3 ++- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-test/Program.cs b/src/Cli/dotnet/commands/dotnet-test/Program.cs index 6714489eae66..6116e515235e 100644 --- a/src/Cli/dotnet/commands/dotnet-test/Program.cs +++ b/src/Cli/dotnet/commands/dotnet-test/Program.cs @@ -238,10 +238,8 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings } } - // Set DOTNET_PATH if it isn't already set in the environment as it is required - // by the testhost which uses the apphost feature (Windows only). - (bool hasRootVariable, string rootVariableName, string rootValue) = VSTestForwardingApp.GetRootVariable(); - if (!hasRootVariable) + Dictionary variables = VSTestForwardingApp.GetVSTestRootVariables(); + foreach (var (rootVariableName, rootValue) in variables) { testCommand.EnvironmentVariable(rootVariableName, rootValue); VSTestTrace.SafeWriteTrace(() => $"Root variable set {rootVariableName}:{rootValue}"); diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs b/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs index ab62b1d84466..7df945556841 100644 --- a/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs +++ b/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs @@ -13,8 +13,8 @@ public class VSTestForwardingApp : ForwardingApp public VSTestForwardingApp(IEnumerable argsToForward) : base(GetVSTestExePath(), argsToForward) { - (bool hasRootVariable, string rootVariableName, string rootValue) = GetRootVariable(); - if (!hasRootVariable) + Dictionary variables = GetVSTestRootVariables(); + foreach (var (rootVariableName, rootValue) in variables) { WithEnvironmentVariable(rootVariableName, rootValue); VSTestTrace.SafeWriteTrace(() => $"Root variable set {rootVariableName}:{rootValue}"); @@ -37,15 +37,18 @@ private static string GetVSTestExePath() return Path.Combine(AppContext.BaseDirectory, VstestAppName); } - internal static (bool hasRootVariable, string rootVariableName, string rootValue) GetRootVariable() + internal static Dictionary GetVSTestRootVariables() { - string rootVariableName = Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)"; - bool hasRootVariable = Environment.GetEnvironmentVariable(rootVariableName) != null; - string rootValue = hasRootVariable ? null : Path.GetDirectoryName(new Muxer().MuxerPath); - - // We rename env variable to support --arch switch that relies on DOTNET_ROOT/DOTNET_ROOT(x86) - // We provide VSTEST_WINAPPHOST_ only in case of testhost*.exe removing VSTEST_WINAPPHOST_ prefix and passing as env vars. - return (hasRootVariable, $"VSTEST_WINAPPHOST_{rootVariableName}", rootValue); + // Gather the current .NET SDK dotnet.exe location and forward it to vstest.console.dll so it can use it + // to setup DOTNET_ROOT for testhost.exe, to find the same installation of NET SDK that is running `dotnet test`. + // This way if we have private installation of .NET SDK, the testhost.exe will be able to use the same private installation. + // The way to set the environment is complicated and depends on the version of testhost, so we leave that implementation to vstest console, + // we just tell it where the current .net SDK is located, and what is the architecture of it. We don't have more information than that here. + return new() + { + ["VSTEST_DOTNET_ROOT_PATH"] = Path.GetDirectoryName(new Muxer().MuxerPath), + ["VSTEST_DOTNET_ROOT_ARCHITECTURE"] = RuntimeInformation.ProcessArchitecture.ToString() + }; } } } diff --git a/test/TestAssets/TestProjects/VSTestForwardDotnetRootEnvironmentVariables/Tests.cs b/test/TestAssets/TestProjects/VSTestForwardDotnetRootEnvironmentVariables/Tests.cs index 3de940ec7980..bd56746713c5 100644 --- a/test/TestAssets/TestProjects/VSTestForwardDotnetRootEnvironmentVariables/Tests.cs +++ b/test/TestAssets/TestProjects/VSTestForwardDotnetRootEnvironmentVariables/Tests.cs @@ -16,7 +16,7 @@ public void TestForwardDotnetRootEnvironmentVariables() // This project is compiled, and executed by the tests in "test/dotnet-test.Tests/GivenDotnetTestForwardDotnetRootEnvironmentVariables.cs" foreach (DictionaryEntry env in Environment.GetEnvironmentVariables()) { - if (env.Key.ToString().Contains("VSTEST_WINAPPHOST_")) + if (env.Key.ToString().Contains("VSTEST_")) { Console.WriteLine($"{env.Key.ToString()}={env.Value.ToString()}"); } diff --git a/test/dotnet-test.Tests/GivenDotnetTestForwardDotnetRootEnvironmentVariables.cs b/test/dotnet-test.Tests/GivenDotnetTestForwardDotnetRootEnvironmentVariables.cs index ec1c34a8d2dc..e7f6a68e8fbd 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestForwardDotnetRootEnvironmentVariables.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestForwardDotnetRootEnvironmentVariables.cs @@ -33,7 +33,8 @@ public void ShouldForwardDotnetRootEnvironmentVariablesIfNotProvided() .Should().Contain("Total tests: 1") .And.Contain("Passed: 1") .And.Contain("Passed TestForwardDotnetRootEnvironmentVariables") - .And.Contain("VSTEST_WINAPPHOST_"); + .And.Contain("VSTEST_DOTNET_ROOT_PATH") + .And.Contain("VSTEST_DOTNET_ROOT_ARCHITECTURE"); } result.ExitCode.Should().Be(0); From 01267916e9b39ca6a2b5af9bd431a85b2c9f6337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Aug 2025 02:03:16 +0000 Subject: [PATCH 273/293] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250812.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25312.2 -> To Version 9.0.0-alpha.1.25412.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cecaf9957740..5cfba743174f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -451,9 +451,9 @@ - + https://github.com/dotnet/source-build-reference-packages - cbafdd754f3cd645081e32d30cb6a82300163288 + debb7d95fdef37a06bee91a09b5246a690b76087 From 30a96ca22a80203b3943c4a2b4bf8c2f9e222953 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Aug 2025 02:04:14 +0000 Subject: [PATCH 274/293] Update dependencies from https://github.com/dotnet/roslyn build 20250812.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25411.5 -> To Version 4.14.0-3.25412.6 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66dbf21d1d8d..1fef8af6e8e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - e7629a643c9f36df4a8aae72eecf1abf56e0cc42 + c167adef821b9ba2f1c44c227a5e79ca11876461 diff --git a/eng/Versions.props b/eng/Versions.props index c4e7fa8cb863..96d22040707d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25411.5 + 3.12.0-beta1.25412.6 @@ -206,14 +206,14 @@ - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 - 4.14.0-3.25411.5 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 + 4.14.0-3.25412.6 From 30bdcdc263a00fede022e88e612569daa89201d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 16:37:45 +0000 Subject: [PATCH 275/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250812.11 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.9 --- NuGet.config | 2 + eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++---------- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/NuGet.config b/NuGet.config index 849f424efdc6..53b6c7cb07ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -33,6 +33,7 @@ + @@ -70,6 +71,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fef8af6e8e1..126ae11272a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ b73682307aa0128c5edbec94c2e6a070d13ae6bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 @@ -226,29 +226,29 @@ 4ac9f0d4d2df494076374c8f8943155e1b24fef3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -469,89 +469,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 @@ -585,9 +585,9 @@ e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 96d22040707d..a4c38cff3898 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,50 +85,50 @@ - 9.0.8 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 8.0.0-rc.1.23414.4 - 9.0.8-servicing.25365.11 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9-servicing.25412.11 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 2.1.0 - 9.0.8 + 9.0.9 8.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 8.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 4.5.1 4.5.5 8.0.5 4.5.4 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 From e18a994b815902b15a3bab58368cdd56bf1540cb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 18:39:27 +0000 Subject: [PATCH 276/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250813.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.8 -> To Version 9.0.9 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.8-rtm.25368.9 -> To Version 9.0.9-rtm.25413.4 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53b6c7cb07ee..65556938e4b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -39,6 +39,7 @@ + @@ -74,6 +75,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 126ae11272a5..5e2f8354be10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1d6033e36c17c6c496302306563689885e416f48 + 94ceefcec814c6a2111b867e40573b45e99c4086 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1d6033e36c17c6c496302306563689885e416f48 + 94ceefcec814c6a2111b867e40573b45e99c4086 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1d6033e36c17c6c496302306563689885e416f48 + 94ceefcec814c6a2111b867e40573b45e99c4086 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1d6033e36c17c6c496302306563689885e416f48 + 94ceefcec814c6a2111b867e40573b45e99c4086 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c83d78f58cbe40d4f5cd847461a233e5c85f5300 + 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ 215a587e52efa710de84138b0a3374b860b924d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dfa9922eb72e517011ad36ed7318242bbe9f9005 + bf01a861ada639dedbe15ac4aa5f1b95b98767e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c83d78f58cbe40d4f5cd847461a233e5c85f5300 + 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a4c38cff3898..2ff27b750fc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 9.0.8-servicing.25368.1 + 9.0.9-servicing.25412.4 @@ -132,10 +132,10 @@ - 9.0.8-servicing.25368.1 - 9.0.8-servicing.25368.1 - 9.0.8 - 9.0.8 + 9.0.9-servicing.25413.1 + 9.0.9-servicing.25413.1 + 9.0.9 + 9.0.9 @@ -239,8 +239,8 @@ - 9.0.8-rtm.25368.9 - 9.0.8-rtm.25368.9 + 9.0.9-rtm.25413.4 + 9.0.9-rtm.25413.4 From 9c402da6027d6231e99ed6531c12ac8935a796c0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 19:40:33 +0000 Subject: [PATCH 277/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250813.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.8-servicing.25368.8 -> To Version 9.0.9-servicing.25413.5 --- NuGet.config | 2 ++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65556938e4b2..30ecf9e4eefb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -70,6 +71,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e2f8354be10..a6a94f0ce421 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn c167adef821b9ba2f1c44c227a5e79ca11876461 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 @@ -339,21 +339,21 @@ 3372435431977e91904a23ceb1eab689badc1bd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 @@ -505,9 +505,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 215a587e52efa710de84138b0a3374b860b924d8 + cf6afa15cfbb3f8a844f0a6f94494b4928c06778 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2ff27b750fc7..884d82a9e1d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,19 +217,19 @@ - 9.0.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 - 9.0.8-servicing.25368.8 + 9.0.9 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 + 9.0.9-servicing.25413.5 From b11375c25efd025607aeb29d489d9a6d5002b167 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Aug 2025 02:03:35 +0000 Subject: [PATCH 278/293] Update dependencies from https://github.com/dotnet/roslyn build 20250813.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.25404.5 -> To Version 4.12.0-3.25413.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cfba743174f..ab98fd3657e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c - + https://github.com/dotnet/roslyn - 4d68ef53bf037528cbe2066696b872aaa8b4fe36 + c216ec2e7afe169f936c7bfcb9e3bfb66391825c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index de24fab38e54..68108994bb98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 - 4.12.0-3.25404.5 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 + 4.12.0-3.25413.4 From 28f606e7c5fe6e6515a75c158732412a772e815f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Aug 2025 02:04:43 +0000 Subject: [PATCH 279/293] Update dependencies from https://github.com/dotnet/roslyn build 20250813.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25412.6 -> To Version 4.14.0-3.25413.5 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fef8af6e8e1..dbd646dbe901 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - c167adef821b9ba2f1c44c227a5e79ca11876461 + b828a8df198e360ec03e3f1fb9f6d149eb563ddc diff --git a/eng/Versions.props b/eng/Versions.props index 96d22040707d..6490bb3cf89e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25412.6 + 3.12.0-beta1.25413.5 @@ -206,14 +206,14 @@ - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 - 4.14.0-3.25412.6 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 + 4.14.0-3.25413.5 From 1d2484c29e94e568a80947b1aaf1082b917f38cb Mon Sep 17 00:00:00 2001 From: Wenwen <53243232+Winniexu01@users.noreply.github.com> Date: Thu, 14 Aug 2025 14:52:29 +0000 Subject: [PATCH 280/293] Retry all errors to handle curl (18) (#50259) --- src/SourceBuild/content/prep-source-build.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/prep-source-build.sh b/src/SourceBuild/content/prep-source-build.sh index 1af4fe06cf94..875d7995dfa2 100755 --- a/src/SourceBuild/content/prep-source-build.sh +++ b/src/SourceBuild/content/prep-source-build.sh @@ -166,7 +166,23 @@ function DownloadArchive { archiveUrl="https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.$archiveType.$archiveVersion.$archiveRid.tar.gz" echo " Downloading source-built $archiveType from $archiveUrl..." - (cd "$packagesArchiveDir" && curl -f --retry 5 -O "$archiveUrl") + ( + cd "$packagesArchiveDir" && + for i in {1..5}; do + if curl -f --retry 5 -O "$archiveUrl"; then + exit 0 + else + case $? in + 18) + sleep 3 + ;; + *) + exit 1 + ;; + esac + fi + done + ) elif [ "$isRequired" == true ]; then echo " ERROR: $notFoundMessage" exit 1 From 6bddf4b5743d8db8c5117dec51383653e490b6d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Aug 2025 06:12:31 +0000 Subject: [PATCH 281/293] Update dependencies from https://github.com/dotnet/templating build 20250814.6 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 849f424efdc6..9fcb94b8eba3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbd646dbe901..2d73b2c11655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 53394f71a3061f4a0aa1c1197026d65b3efe308b + 7020b4ee25543f6a6a90ae2e92cdd55bace02737 - + https://github.com/dotnet/templating - 53394f71a3061f4a0aa1c1197026d65b3efe308b + 7020b4ee25543f6a6a90ae2e92cdd55bace02737 diff --git a/eng/Versions.props b/eng/Versions.props index 6490bb3cf89e..1864c45e144e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25407.8 + 9.0.305-servicing.25414.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 9614b68f6d3f55afdbbbb8f6dcc6df1c0aaf3fc5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Aug 2025 23:41:29 +0000 Subject: [PATCH 282/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250815.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.9 -> To Version 9.0.9 --- NuGet.config | 8 +++-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 50 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d2ea01eb354..760b6f3917f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,6 +25,7 @@ + @@ -34,13 +35,14 @@ - + + @@ -71,12 +73,14 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99ff4fc31bf8..a5af11748b82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb @@ -228,27 +228,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -471,39 +471,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -511,47 +511,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb @@ -587,7 +587,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 646ed91b0e44..c2423fcbc9c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,10 +86,10 @@ 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 @@ -97,8 +97,8 @@ 9.0.9 9.0.9 8.0.0-rc.1.23414.4 - 9.0.9-servicing.25412.11 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 From 2a9511acf13cd0d817919c18447f1bbe21943e59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 02:05:04 +0000 Subject: [PATCH 283/293] Update dependencies from https://github.com/dotnet/arcade build 20250815.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25407.2 -> To Version 9.0.0-beta.25415.3 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- eng/common/SetupNugetSources.ps1 | 4 +-- eng/common/SetupNugetSources.sh | 4 +-- eng/common/core-templates/job/job.yml | 8 +++--- eng/common/core-templates/job/onelocbuild.yml | 6 ++-- .../job/publish-build-assets.yml | 10 ++++--- .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 ++ .../core-templates/post-build/post-build.yml | 8 +++--- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 ++++---- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 +++++----- .../core-templates/steps/source-build.yml | 4 +-- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +-- global.json | 4 +-- 21 files changed, 67 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d73b2c11655..8b50ec1c8c3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 diff --git a/eng/Versions.props b/eng/Versions.props index 1864c45e144e..bbdb821e72bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f..792b60b49d42 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,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 4604b61b0323..facb415ca6ff 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8947ea3f0593..8da43d3b5837 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -166,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -189,7 +189,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 @@ -200,7 +200,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 @@ -244,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8ebbc3..edefa789d360 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-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 @@ -68,7 +68,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 }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - 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/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31967..b103b7ee1686 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,7 +95,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' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +115,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +144,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 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b3ee..662b9fcce154 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,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/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252cc65..4571a7864df6 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,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/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be4341c6..3129670b3380 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + 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. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9214..2ee8bbfff545 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,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/ - job: @@ -206,7 +206,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: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,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) @@ -311,7 +311,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 }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe7..a7abd58c4bb6 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,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/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3c..4085512b6909 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds 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: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094824..7f5b84c4cb82 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c523191..0623ac6e1123 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ 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: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b754..730f7ab2b674 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -97,7 +97,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +126,5 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba..4bf4cf41bd7c 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505aa6..81ea7a261f2d 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml 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 d1aeb92fcea5..5bdd3dd85fd2 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index 6f0774463856..6612de79b2b8 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 3186d555efb40db7e13c78faa7bbd3a907ee553c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 03:32:24 +0000 Subject: [PATCH 284/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250815.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.9 -> To Version 9.0.9 --- NuGet.config | 6 ++---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 760b6f3917f1..872aaede928b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,8 +41,7 @@ - - + @@ -80,8 +79,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5af11748b82..50ffdb041920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -252,20 +252,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94ceefcec814c6a2111b867e40573b45e99c4086 + 6f83b16be99847f20ef8401745b698569d23d27a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94ceefcec814c6a2111b867e40573b45e99c4086 + 6f83b16be99847f20ef8401745b698569d23d27a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94ceefcec814c6a2111b867e40573b45e99c4086 + 6f83b16be99847f20ef8401745b698569d23d27a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 94ceefcec814c6a2111b867e40573b45e99c4086 + 6f83b16be99847f20ef8401745b698569d23d27a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index c2423fcbc9c2..db37d9d56ba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,8 +132,8 @@ - 9.0.9-servicing.25413.1 - 9.0.9-servicing.25413.1 + 9.0.9-servicing.25415.5 + 9.0.9-servicing.25415.5 9.0.9 9.0.9 From 678239ee3ad225d1e6372fb49633bcd65f86dd9b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 05:36:21 +0000 Subject: [PATCH 285/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250815.20 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25413.5 -> To Version 9.0.9-servicing.25415.20 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 872aaede928b..61cf50954225 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,7 @@ - - + @@ -72,8 +71,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50ffdb041920..51bf7e39a034 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf6afa15cfbb3f8a844f0a6f94494b4928c06778 + 5940cb136422b6ae653e7d72915412fbb8145f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index db37d9d56ba6..7b5feb8d55d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.9 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 9.0.9 9.0.9 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 - 9.0.9-servicing.25413.5 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 + 9.0.9-servicing.25415.20 From a9aac9b939c513145f7bf98dc143f1be2811d2ea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 23:13:58 +0000 Subject: [PATCH 286/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250816.1 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25413.5 -> To Version 9.0.9-servicing.25416.1 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61cf50954225..353f10aaba3d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51bf7e39a034..717283caffc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5940cb136422b6ae653e7d72915412fbb8145f36 + e1115709958513afcb1e1f1e6a75f0abcd741cac https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7b5feb8d55d4..ea5ca89f0e53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.9 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 9.0.9 9.0.9 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 - 9.0.9-servicing.25415.20 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 + 9.0.9-servicing.25416.1 From c30deaea3856fc0436ae3a67c9b721baf4015149 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 17 Aug 2025 09:18:15 +0000 Subject: [PATCH 287/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250817.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.9 -> To Version 9.0.9 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.9-rtm.25413.4 -> To Version 9.0.9-rtm.25416.1 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 353f10aaba3d..2eb3010af1c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -40,7 +40,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 717283caffc2..0ce7a9ebb0d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -252,24 +252,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6f83b16be99847f20ef8401745b698569d23d27a + 20260e1697993bcce6ea69407ae49e0688c5818e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6f83b16be99847f20ef8401745b698569d23d27a + 20260e1697993bcce6ea69407ae49e0688c5818e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6f83b16be99847f20ef8401745b698569d23d27a + 20260e1697993bcce6ea69407ae49e0688c5818e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6f83b16be99847f20ef8401745b698569d23d27a + 20260e1697993bcce6ea69407ae49e0688c5818e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 + 5b68f33bac6923c53bc6de197a4783b773c2902d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ e1115709958513afcb1e1f1e6a75f0abcd741cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf01a861ada639dedbe15ac4aa5f1b95b98767e9 + c0ddfbb0e411edff04fc669eb7d264b17269d312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 + 5b68f33bac6923c53bc6de197a4783b773c2902d https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ea5ca89f0e53..c2f3735f8bec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 9.0.9-servicing.25412.4 + 9.0.9-servicing.25415.5 @@ -132,8 +132,8 @@ - 9.0.9-servicing.25415.5 - 9.0.9-servicing.25415.5 + 9.0.9-servicing.25417.1 + 9.0.9-servicing.25417.1 9.0.9 9.0.9 @@ -239,8 +239,8 @@ - 9.0.9-rtm.25413.4 - 9.0.9-rtm.25413.4 + 9.0.9-rtm.25416.1 + 9.0.9-rtm.25416.1 From 0cb5fd8540eabc6cea30adb62cfde6a7a3cb22de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Aug 2025 02:49:12 +0000 Subject: [PATCH 288/293] Update dependencies from https://github.com/dotnet/templating build 20250817.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcb94b8eba3..7682fb233a5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b50ec1c8c3b..e9c4cf3cc128 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 7020b4ee25543f6a6a90ae2e92cdd55bace02737 + d2470150e821b873481c81350aae9a6832e09c68 - + https://github.com/dotnet/templating - 7020b4ee25543f6a6a90ae2e92cdd55bace02737 + d2470150e821b873481c81350aae9a6832e09c68 diff --git a/eng/Versions.props b/eng/Versions.props index bbdb821e72bc..8ecfbe849e19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25414.6 + 9.0.305-servicing.25417.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From cc678ea1790067fd41076986f3e401d61a3e15fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Aug 2025 05:40:20 +0000 Subject: [PATCH 289/293] Update dependencies from https://github.com/dotnet/templating build 20250817.11 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.305 -> To Version 9.0.305 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7682fb233a5d..880e5ebdedbd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9c4cf3cc128..f5311617eb55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - d2470150e821b873481c81350aae9a6832e09c68 + 813004f34facff303de42c491635dc8820c495b5 - + https://github.com/dotnet/templating - d2470150e821b873481c81350aae9a6832e09c68 + 813004f34facff303de42c491635dc8820c495b5 diff --git a/eng/Versions.props b/eng/Versions.props index 8ecfbe849e19..8f403f545d50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.305-servicing.25417.3 + 9.0.305-servicing.25417.11 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From ef945a6ebb9e96d04bd4b899ea513633f46daec8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 03:18:55 +0000 Subject: [PATCH 290/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250819.16 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , 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.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.9 -> To Version 9.0.9 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.8 -> To Version 9.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 10 ++++- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 57 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 92cfb7de070e..1f34cf3cbd0a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,8 +25,10 @@ + + @@ -34,13 +36,15 @@ - + + + @@ -71,12 +75,14 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd825f75fe39..816bc5db3be5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 @@ -228,27 +228,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -471,39 +471,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -511,47 +511,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 @@ -587,7 +587,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 92544535e4a0..24d93affe841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,10 +86,10 @@ 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -97,8 +97,8 @@ 9.0.9 9.0.9 8.0.0-rc.1.23414.4 - 9.0.9-servicing.25415.12 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -319,7 +319,7 @@ 15.0.9617 18.0.9617 - 9.0.8 + 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From c488a9f0a201dd18d472663e745048abbf9ca1e0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 08:10:52 +0000 Subject: [PATCH 291/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250819.12 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25416.1 -> To Version 9.0.9-servicing.25419.12 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f34cf3cbd0a..8b2c001f1141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,7 @@ - - + @@ -75,8 +74,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 816bc5db3be5..9537590ed6e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e1115709958513afcb1e1f1e6a75f0abcd741cac + 2e58f4d00189448d0d2e8b3944d423695217c8bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 24d93affe841..e4e070b57ee2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.9 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 9.0.9 9.0.9 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 - 9.0.9-servicing.25416.1 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 + 9.0.9-servicing.25419.12 From b2ce46997de2b44e42b4fc3cc84ca53b449d22a0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 11:08:32 +0000 Subject: [PATCH 292/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250820.3 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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.9-servicing.25416.1 -> To Version 9.0.9-servicing.25420.3 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b2c001f1141..0498b3077994 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9537590ed6e7..83153d497b82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn b828a8df198e360ec03e3f1fb9f6d149eb563ddc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2e58f4d00189448d0d2e8b3944d423695217c8bc + ff66c263be7ed395794bdaf616322977b8ec897c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e4e070b57ee2..fee2f1e84e9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.9 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 9.0.9 9.0.9 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 - 9.0.9-servicing.25419.12 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 + 9.0.9-servicing.25420.3 From 940254fb61f7507f445fc086b36ff64c8306def2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Aug 2025 20:42:36 +0000 Subject: [PATCH 293/293] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250821.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.9 -> To Version 9.0.9 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.9-rtm.25416.1 -> To Version 9.0.9-rtm.25421.1 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 6 ++---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0498b3077994..49de8691cd94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -42,8 +42,7 @@ - - + @@ -80,8 +79,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83153d497b82..1839dd5c4ba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -252,24 +252,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20260e1697993bcce6ea69407ae49e0688c5818e + 36322cf85c30a14acb5da40397df03216c44bced - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20260e1697993bcce6ea69407ae49e0688c5818e + 36322cf85c30a14acb5da40397df03216c44bced https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20260e1697993bcce6ea69407ae49e0688c5818e + 36322cf85c30a14acb5da40397df03216c44bced - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 20260e1697993bcce6ea69407ae49e0688c5818e + 36322cf85c30a14acb5da40397df03216c44bced - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5b68f33bac6923c53bc6de197a4783b773c2902d + 56176690719670a63582850619ed7d33e13083e3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ ff66c263be7ed395794bdaf616322977b8ec897c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c0ddfbb0e411edff04fc669eb7d264b17269d312 + 9dc841c74ab937e3a19c3d81590136067b3a15ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5b68f33bac6923c53bc6de197a4783b773c2902d + 56176690719670a63582850619ed7d33e13083e3 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index fee2f1e84e9f..a41bcc588421 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 9.0.9-servicing.25415.5 + 9.0.9-servicing.25419.3 @@ -132,8 +132,8 @@ - 9.0.9-servicing.25417.1 - 9.0.9-servicing.25417.1 + 9.0.9-servicing.25421.5 + 9.0.9-servicing.25421.5 9.0.9 9.0.9 @@ -239,8 +239,8 @@ - 9.0.9-rtm.25416.1 - 9.0.9-rtm.25416.1 + 9.0.9-rtm.25421.1 + 9.0.9-rtm.25421.1