From c6198ba9536ed293b89d3c81bc798a127b1bf0b4 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 00:17:06 +0000 Subject: [PATCH 01/80] Merged PR 46808: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:471db9b4-49ec-4921-de46-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 471db9b4-49ec-4921-de46-08dc11e85c3a - **Build**: 20250116.9 - **Date Produced**: January 16, 2025 11:17:27 PM UTC - **Commit**: eba546b0f0d448e0176a2222548fd7a2fbf464c0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.3][1] - **Microsoft.NET.HostModel**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.Platforms**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **System.Formats.Asn1**: [from 8.0.1 to 8.0.2][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2aade6beb02ea367fd97c4070a4198802fe61c03&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:471db9b4-49ec-4921-de46-08dc11e85c3a) --- NuGet.config | 19 ++++++++++++++++-- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e4099f6c0bb..4e88b23af0f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,9 @@ + + + @@ -20,6 +23,9 @@ + + + @@ -27,13 +33,16 @@ - + + + + @@ -60,6 +69,9 @@ + + + @@ -76,9 +88,12 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52058ec692bf..d449f143694d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,42 +14,42 @@ 499f473f00b21f4d2cb2a979769cba765032cb8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://github.com/dotnet/emsdk @@ -200,13 +200,13 @@ https://github.com/microsoft/vstest c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -406,9 +406,9 @@ 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + eba546b0f0d448e0176a2222548fd7a2fbf464c0 diff --git a/eng/Versions.props b/eng/Versions.props index 1903941d62b9..f5435c695521 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.12 - 8.0.12-servicing.24603.5 - 8.0.12 + 8.0.13 + 8.0.13-servicing.25066.9 + 8.0.13 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.12 - 8.0.12-servicing.24603.5 + 8.0.13 + 8.0.13-servicing.25066.9 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 - 8.0.2 + 8.0.3 8.0.1 - 8.0.12 + 8.0.13 8.0.0 8.0.0 8.0.12 @@ -82,7 +82,7 @@ 8.0.1 8.0.5 8.0.0 - 8.0.1 + 8.0.2 From ed92d2b3eba1a38a75ef3b5b26c905c25916188b Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 00:17:06 +0000 Subject: [PATCH 02/80] Merged PR 46810: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604 - **Build**: 20250116.9 - **Date Produced**: January 16, 2025 11:17:27 PM UTC - **Commit**: eba546b0f0d448e0176a2222548fd7a2fbf464c0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.3][1] - **Microsoft.NET.HostModel**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.Platforms**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **System.Formats.Asn1**: [from 8.0.1 to 8.0.2][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2aade6beb02ea367fd97c4070a4198802fe61c03&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604) --- NuGet.config | 19 ++++++++++++++++-- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87b35fa2c9b0..97f002d88ef6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,9 @@ + + + @@ -20,6 +23,9 @@ + + + @@ -27,13 +33,16 @@ - + + + + @@ -60,6 +69,9 @@ + + + @@ -74,9 +86,12 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 225eaa82522f..1621cec83dfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,42 +14,42 @@ 8e2a201983cf06110302014a4c4592da13419cb5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://github.com/dotnet/emsdk @@ -200,13 +200,13 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -406,9 +406,9 @@ 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + eba546b0f0d448e0176a2222548fd7a2fbf464c0 diff --git a/eng/Versions.props b/eng/Versions.props index 260951b02f1e..6746e05da5ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.12 - 8.0.12-servicing.24603.5 - 8.0.12 + 8.0.13 + 8.0.13-servicing.25066.9 + 8.0.13 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.12 - 8.0.12-servicing.24603.5 + 8.0.13 + 8.0.13-servicing.25066.9 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 - 8.0.2 + 8.0.3 8.0.1 - 8.0.12 + 8.0.13 8.0.0 8.0.0 8.0.12 @@ -82,7 +82,7 @@ 8.0.1 8.0.5 8.0.0 - 8.0.1 + 8.0.2 From 42dd52fdc052c69d09c22c682d48f845c1a77020 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 16:48:14 +0000 Subject: [PATCH 03/80] Merged PR 46844: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.5 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 11ffd28b-eb51-469a-d3fb-08dca292067e - **Build**: 20250117.2 - **Date Produced**: January 17, 2025 9:47:37 AM UTC - **Commit**: e43b37de7d5916352702dda1b65d98dd66f5f9f4 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.12 to 8.0.13][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24604.2 to 8.0.13-servicing.25067.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.12-servicing.24604.2 to 8.0.13-servicing.25067.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0dad47b40c489631d0d3e7c6cc10f0035590a17c&targetVersion=GCe43b37de7d5916352702dda1b65d98dd66f5f9f4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC6a2a510ae56ff16665d95b96a0920e2fd45e1d2b&targetVersion=GCb7c5b2dd5e9b61459c7ba2e58f306029ec791c0d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e) [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50 - **Build**: 20250116.10 - **Date Produced**: January 17, 2025 9:15:39 AM UTC - **Commit**: 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **dotnet-user-jwts**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **dotnet-user-secrets**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.12 to 8.0.13][3] - **Microsoft.AspNetCore.App.... --- NuGet.config | 20 ++------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++---- 3 files changed, 59 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97f002d88ef6..e1b964a97102 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,10 +22,7 @@ - - - - + @@ -39,10 +36,7 @@ - - - - + @@ -69,10 +63,7 @@ - - - - + @@ -89,10 +80,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0ab60a202a2..731b1c8feee1 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 - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://github.com/nuget/nuget.client @@ -228,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b + b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf 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 - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e748f23f731a..62739af7569e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.13 8.0.0 8.0.0 - 8.0.12 + 8.0.13 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12 + 8.0.13 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13 @@ -185,7 +185,7 @@ - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.5 From 7418f78035bbce8017722f85047c345b748b2342 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 16:48:16 +0000 Subject: [PATCH 04/80] Merged PR 46843: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.5 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2 - **Build**: 20250117.2 - **Date Produced**: January 17, 2025 9:47:37 AM UTC - **Commit**: e43b37de7d5916352702dda1b65d98dd66f5f9f4 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.12 to 8.0.13][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24604.2 to 8.0.13-servicing.25067.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.12-servicing.24604.2 to 8.0.13-servicing.25067.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0dad47b40c489631d0d3e7c6cc10f0035590a17c&targetVersion=GCe43b37de7d5916352702dda1b65d98dd66f5f9f4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC6a2a510ae56ff16665d95b96a0920e2fd45e1d2b&targetVersion=GCb7c5b2dd5e9b61459c7ba2e58f306029ec791c0d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2) [marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a - **Build**: 20250116.10 - **Date Produced**: January 17, 2025 9:15:39 AM UTC - **Commit**: 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **dotnet-user-jwts**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **dotnet-user-secrets**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.12-servicing.24603.12 to 8.0.13-servicing.25066.10][3] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.12 to 8.0.13][3] - **Microsoft.AspNetCore.App.... --- NuGet.config | 20 ++------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++---- 3 files changed, 59 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e88b23af0f9..f4ac8ca5ab56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,10 +22,7 @@ - - - - + @@ -39,10 +36,7 @@ - - - - + @@ -69,10 +63,7 @@ - - - - + @@ -91,10 +82,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e0b929bf742..b96231ab139e 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 - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://github.com/nuget/nuget.client @@ -228,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0dad47b40c489631d0d3e7c6cc10f0035590a17c + e43b37de7d5916352702dda1b65d98dd66f5f9f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b + b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 47a3872a73899ff683dc9593e587e539a1264233 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf 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 - 31d685b2d9a86ca1243014d175a3da813f78e428 + 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a560e6d96578..96f10d26b318 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.13 8.0.0 8.0.0 - 8.0.12 + 8.0.13 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12-servicing.24603.12 - 8.0.12 + 8.0.13 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13-servicing.25066.10 + 8.0.13 @@ -185,7 +185,7 @@ - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.5 From d8311205458922b2bc18014377560e8cd128604f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Feb 2025 05:02:02 +0000 Subject: [PATCH 05/80] Update dependencies from https://github.com/dotnet/templating build 20250205.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.309-servicing.25066.9 -> To Version 8.0.310-servicing.25105.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 085a142ed279..76daf6466e23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6e5e78ff95a..a54dd55e259b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 6ede63a60b3426dad74a95eb1bcddf5669d067c2 + 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb - + https://github.com/dotnet/templating - 6ede63a60b3426dad74a95eb1bcddf5669d067c2 + 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb - + https://github.com/dotnet/templating - 6ede63a60b3426dad74a95eb1bcddf5669d067c2 + 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb diff --git a/eng/Versions.props b/eng/Versions.props index 93f6d24ae51e..64a0820b9c96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.309 + 8.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.309-servicing.25066.9 + 8.0.310-servicing.25105.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 209e5648716760dce56e630b2410c2b4fba6ee56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Feb 2025 05:01:42 +0000 Subject: [PATCH 06/80] Update dependencies from https://github.com/dotnet/templating build 20250206.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.309-servicing.25066.9 -> To Version 8.0.310-servicing.25106.2 --- NuGet.config | 11 +---------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2e25e95d38a..4cc2443ca9bb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,16 +37,7 @@ - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f99d47c08fb..77afe8c99735 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb + d7198dd0cfdd966baac897418a7147f7758cb10a - + https://github.com/dotnet/templating - 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb + d7198dd0cfdd966baac897418a7147f7758cb10a - + https://github.com/dotnet/templating - 52ff56dbe1b77028d2f2f60a5e2892d87ecc39eb + d7198dd0cfdd966baac897418a7147f7758cb10a diff --git a/eng/Versions.props b/eng/Versions.props index 357cbc7099ab..729b33a263ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.310-servicing.25105.1 + 8.0.310-servicing.25106.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c549b5e52fe1f0a36d52d0515877cfbf657d7c3a Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 10 Feb 2025 21:30:15 -0600 Subject: [PATCH 07/80] [Backport to 8.0.1xx] Workflows: Don't allow merge if pr in lockdown (#46663) (#46695) Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> --- .github/workflows/pr-analysis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/pr-analysis.yml diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml new file mode 100644 index 000000000000..b74a99c9799b --- /dev/null +++ b/.github/workflows/pr-analysis.yml @@ -0,0 +1,14 @@ +name: PR Analysis +on: + pull_request: + types: [opened, synchronize, labeled, unlabeled] +permissions: + contents: read + pull-requests: read +jobs: + allowed-labels: + runs-on: ubuntu-latest + steps: + - name: Return error if branch is in lockdown or 'do not merge' label is present + run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1 + if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }} From fcf9e7f6d185b143b0054632a2b9eb20b5a98eab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2025 05:01:32 +0000 Subject: [PATCH 08/80] Update dependencies from https://github.com/dotnet/msbuild build 20250211.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.19-preview-25071-10 -> To Version 17.10.21-preview-25111-03 --- NuGet.config | 50 ++++++++++++++++++++++++++++------------- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 384ef9dee816..d8f1ea0b33e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,34 +14,37 @@ + + + + + + + + - + + - - - - - - - - - - - - - - + + + + + + + + @@ -68,6 +71,14 @@ + + + + + + + + @@ -75,9 +86,18 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a1e4654848e..38962de3db56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/msbuild - 939cc332cc357d59cc6cfdde70ddc03372e22c26 + 0e18be81c1881b24619dd1239afca022aeff1eef - + https://github.com/dotnet/msbuild - 939cc332cc357d59cc6cfdde70ddc03372e22c26 + 0e18be81c1881b24619dd1239afca022aeff1eef - + https://github.com/dotnet/msbuild - 939cc332cc357d59cc6cfdde70ddc03372e22c26 + 0e18be81c1881b24619dd1239afca022aeff1eef diff --git a/eng/Versions.props b/eng/Versions.props index 30a6ff196a73..4688acfe2df2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.19 + 17.10.21 $(MicrosoftBuildPackageVersion) + + + + + + + + @@ -22,26 +30,21 @@ + - - - - - - - - - - - - - - + + + + + + + + @@ -68,6 +71,14 @@ + + + + + + + + @@ -75,9 +86,18 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a1e4654848e..cd373a92e41a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 30a6ff196a73..2ee108bb20c7 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.25105.2 + 8.0.0-beta.25111.4 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.25105.2 + 8.0.0-beta.25111.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 2822f1b3cfa8..ba40e5c7d5b5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.112", + "dotnet": "8.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4" } } From 187b72fe9c1227b2dc86d1855b28c10a13f01a70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2025 05:01:43 +0000 Subject: [PATCH 10/80] Update dependencies from https://github.com/dotnet/msbuild build 20250211.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.24-servicing-25072-01 -> To Version 17.11.26-servicing-25111-04 --- NuGet.config | 16 +--------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index d00403e2a50e..e201daa389a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -29,20 +29,6 @@ - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0d8b2d661f5..03c5c951a3fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/msbuild - 89b58924da213679505c63060e5c84786865000f + 2b19be476c8b86077deb82788563d7f7cc53468b - + https://github.com/dotnet/msbuild - 89b58924da213679505c63060e5c84786865000f + 2b19be476c8b86077deb82788563d7f7cc53468b - + https://github.com/dotnet/msbuild - 89b58924da213679505c63060e5c84786865000f + 2b19be476c8b86077deb82788563d7f7cc53468b diff --git a/eng/Versions.props b/eng/Versions.props index 9394d0576e44..d35dd056c48f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.24 + 17.11.26 $(MicrosoftBuildPackageVersion) - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0d8b2d661f5..88f3478a182b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca - + https://github.com/dotnet/arcade - f9e274e2269d2cda748e78344afe681411748157 + a319ada170a54ee87c7a81e3309948e3d3ea7aca https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9394d0576e44..87caab4cf055 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.25105.2 + 8.0.0-beta.25111.4 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.25105.2 + 8.0.0-beta.25111.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 2822f1b3cfa8..ba40e5c7d5b5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.112", + "dotnet": "8.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4" } } From 7b568df2d929574d27f6040463405f1dae670884 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 05:02:48 +0000 Subject: [PATCH 12/80] Merged PR 47533: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.2-servicing.25061.2 to 9.0.3-servicing.25105.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.2 to 9.0.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.2-servicing.25061.2 to 9.0.3-servicing.25105.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22 - **Build**: 20250211.13 - **Date Produced**: February 12, 2025 3:59:19 AM UTC - **Commit**: 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.2 to 9.0.3][1] - **Microsoft.NET.HostModel**: [from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13][1] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.2 to 9.0.3][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.2 to 9.0.3][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.2 to 9.0.3][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.2 to 9.0.3][1] - **Microsoft.NETCore.Platforms**: [from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13][1] - **Microsoft.Win32.SystemEvents**: [from 9.0.2 to 9.0.3][1] - **System.CodeDom**: [from 9.0.2 to 9.0.3][1] - **System.Composition.AttributedModel**: [from 9.0.2 to 9.0.3][1] - **System.Composition.Convention**: [from 9.0.2 to 9.0.3][1] - **System.Composition.Hosting**: [from 9.0.2 to 9.0.3][1] - **System.Composition.Runtime**: [from 9.0.2 to 9.0.3][1] - **System.Composition.TypedParts**: [from 9.0.2 to 9.0.3][1] - **System.Configuration.ConfigurationManager**: [from 9.0.2 to 9.0.3][1] - **System.Formats.Asn1**: [from 9.0.2 to 9.0.3][1] - **System.Reflection.MetadataLo... --- NuGet.config | 88 ++++++++++++++++------- eng/Version.Details.xml | 152 ++++++++++++++++++++-------------------- eng/Versions.props | 72 +++++++++---------- 3 files changed, 175 insertions(+), 137 deletions(-) diff --git a/NuGet.config b/NuGet.config index b0d7c59274f0..2f7addf77ded 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,6 @@ - - - @@ -27,10 +24,25 @@ - + + + + + + + + + + + + + + + + @@ -38,32 +50,28 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -90,12 +98,42 @@ + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b0e64c87e63..bd61e78e6ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 5936acfcfd47d64eaadd59a15c33d0de07db171b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 2c27e405e17595694d91892159593d6dd10e61e2 + dad5528e5bdf92a05a5a404c5f7939523390b96d - + https://github.com/dotnet/emsdk - 2c27e405e17595694d91892159593d6dd10e61e2 + dad5528e5bdf92a05a5a404c5f7939523390b96d - + https://github.com/dotnet/emsdk - 2c27e405e17595694d91892159593d6dd10e61e2 + dad5528e5bdf92a05a5a404c5f7939523390b96d @@ -230,29 +230,29 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 @@ -619,9 +619,9 @@ bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4bc5ca94dec1..ec786415777d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,47 +86,47 @@ - 9.0.2 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 8.0.0-rc.1.23414.4 - 9.0.2-servicing.25066.10 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3-servicing.25111.13 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 2.1.0 - 9.0.2 + 9.0.3 8.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 8.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 8.0.4 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.2-servicing.25061.2 - 9.0.2 + 9.0.3-servicing.25105.2 + 9.0.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 00f16bf32c92c922f609331f41ac5c57f4db699c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2025 08:19:57 +0000 Subject: [PATCH 13/80] Update dependencies from https://github.com/dotnet/templating build 20250211.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.114-servicing.25105.10 -> To Version 8.0.114-servicing.25111.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 f6258642d5c1..1b1737a302a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c39629392b06..c5d8f190134f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 47dd92889cc7783ecc6683a8cb447b02a751870b + a977119e0201a0270ac119b429661bbd71993221 - + https://github.com/dotnet/templating - 47dd92889cc7783ecc6683a8cb447b02a751870b + a977119e0201a0270ac119b429661bbd71993221 - + https://github.com/dotnet/templating - 47dd92889cc7783ecc6683a8cb447b02a751870b + a977119e0201a0270ac119b429661bbd71993221 diff --git a/eng/Versions.props b/eng/Versions.props index 2512c7b42f29..7689a1ea9bd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.114-servicing.25105.10 + 8.0.114-servicing.25111.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 869279cf63ddea528d2dd79aafdf07b91f29f13e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Feb 2025 05:02:05 +0000 Subject: [PATCH 14/80] Update dependencies from https://github.com/dotnet/templating build 20250212.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.407-servicing.25105.9 -> To Version 8.0.407-servicing.25112.2 --- NuGet.config | 36 +++++++++++++++++++++++++++++++++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index f164dc156d90..e55f3ce30908 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,14 @@ + + + + + + + + @@ -22,12 +30,21 @@ + - + + + + + + + + + @@ -54,14 +71,31 @@ + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 356d5ae2b811..5bd89b043b17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 5d99405601e2672cd496087efc51611f1fc0d860 + 0d7c16316a4eb3036a5483ee67bc5607cfb22254 - + https://github.com/dotnet/templating - 5d99405601e2672cd496087efc51611f1fc0d860 + 0d7c16316a4eb3036a5483ee67bc5607cfb22254 - + https://github.com/dotnet/templating - 5d99405601e2672cd496087efc51611f1fc0d860 + 0d7c16316a4eb3036a5483ee67bc5607cfb22254 diff --git a/eng/Versions.props b/eng/Versions.props index 16924d0e0ede..a65136a81700 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.407-servicing.25105.9 + 8.0.407-servicing.25112.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f8e6eef94c5aa36cd6d24022bbdfccc30475d63d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 07:56:54 +0000 Subject: [PATCH 15/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250212.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.2-rtm.25067.4 -> To Version 9.0.3-servicing.25112.20 --- NuGet.config | 34 ++---------------- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 53 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2f7addf77ded..918e3d4ca0f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,22 +27,7 @@ - - - - - - - - - - - - - - - - + @@ -98,22 +83,7 @@ - - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd61e78e6ab1..4865bd9adbba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 @@ -343,21 +343,21 @@ 36abdce12db3b9c9360e8c7711d489204a4eac71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 704f7cb1d2cea33afb00c2097731216f121c2c73 + b96167fbfe8bd45d94e4dcda42c7d09eb5745459 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ec786415777d..eb30547bc29d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,19 +215,19 @@ - 9.0.2 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2 - 9.0.2 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 - 9.0.2-rtm.25067.4 + 9.0.3 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 + 9.0.3-servicing.25112.20 From a659cf1a316ae1730048bf49747b319d022bddf1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 08:00:15 +0000 Subject: [PATCH 16/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250212.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.2 -> To Version 9.0.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.2-rtm.25067.2 -> To Version 9.0.3-rtm.25112.4 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 34 ++-------------------------------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 918e3d4ca0f0..c6536d1e1aed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,22 +41,7 @@ - - - - - - - - - - - - - - - - + @@ -89,22 +74,7 @@ - - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4865bd9adbba..bf8bf5155499 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,26 +254,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f971ec245a9aa0e7677b2fe6a565e2979cc59fde + 97524695e33f328f45ae21009e7287d1c378ed66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f971ec245a9aa0e7677b2fe6a565e2979cc59fde + 97524695e33f328f45ae21009e7287d1c378ed66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f971ec245a9aa0e7677b2fe6a565e2979cc59fde + 97524695e33f328f45ae21009e7287d1c378ed66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f971ec245a9aa0e7677b2fe6a565e2979cc59fde + 97524695e33f328f45ae21009e7287d1c378ed66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 + 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f15a0b2339942cc52d7c24cb82739d8401ead77f + a0c1376228b4ce7378393ab29c33c9d76125a052 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 + 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index eb30547bc29d..3ac5c7182da6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.2-servicing.25066.8 + 9.0.3-servicing.25111.6 @@ -130,10 +130,10 @@ - 9.0.2-servicing.25067.4 - 9.0.2-servicing.25067.4 - 9.0.2 - 9.0.2 + 9.0.3-servicing.25112.2 + 9.0.3-servicing.25112.2 + 9.0.3 + 9.0.3 @@ -237,8 +237,8 @@ - 9.0.2-rtm.25067.2 - 9.0.2-rtm.25067.2 + 9.0.3-rtm.25112.4 + 9.0.3-rtm.25112.4 From 1671004eb01cfa40044e5c87da19fd4e6ace8a9e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 22:12:27 +0000 Subject: [PATCH 17/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250213.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.3 -> To Version 9.0.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.3-rtm.25112.4 -> To Version 9.0.3-rtm.25113.4 (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 c6536d1e1aed..db371b54f478 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf8bf5155499..61f31daf011d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 97524695e33f328f45ae21009e7287d1c378ed66 + 1c33258cdd6220239735d6a7a18ef6adc082038c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 97524695e33f328f45ae21009e7287d1c378ed66 + 1c33258cdd6220239735d6a7a18ef6adc082038c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 97524695e33f328f45ae21009e7287d1c378ed66 + 1c33258cdd6220239735d6a7a18ef6adc082038c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 97524695e33f328f45ae21009e7287d1c378ed66 + 1c33258cdd6220239735d6a7a18ef6adc082038c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 + f58f709bc102a0d15aa6ffe4d9a7435bebd3079e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0c1376228b4ce7378393ab29c33c9d76125a052 + 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 + f58f709bc102a0d15aa6ffe4d9a7435bebd3079e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 3ac5c7182da6..c74ed82e86cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.3-servicing.25111.6 + 9.0.3-servicing.25112.2 @@ -130,8 +130,8 @@ - 9.0.3-servicing.25112.2 - 9.0.3-servicing.25112.2 + 9.0.3-servicing.25113.2 + 9.0.3-servicing.25113.2 9.0.3 9.0.3 @@ -237,8 +237,8 @@ - 9.0.3-rtm.25112.4 - 9.0.3-rtm.25112.4 + 9.0.3-rtm.25113.4 + 9.0.3-rtm.25113.4 From c024499dcf8617e8d1530698729edf6efcfad120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Feb 2025 02:32:11 +0000 Subject: [PATCH 18/80] Update dependencies from https://github.com/dotnet/razor build 20250213.3 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.25078.1 -> To Version 9.0.0-preview.25113.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..f424101c1cad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor - 90f580c3fa0908ad7d593a4ca7622e78a61aa927 + 2405f884fd9c848997c6be0607b18b55544f526a - + https://github.com/dotnet/razor - 90f580c3fa0908ad7d593a4ca7622e78a61aa927 + 2405f884fd9c848997c6be0607b18b55544f526a - + https://github.com/dotnet/razor - 90f580c3fa0908ad7d593a4ca7622e78a61aa927 + 2405f884fd9c848997c6be0607b18b55544f526a - + https://github.com/dotnet/razor - 90f580c3fa0908ad7d593a4ca7622e78a61aa927 + 2405f884fd9c848997c6be0607b18b55544f526a diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..908487bcf4f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25078.1 - 9.0.0-preview.25078.1 - 9.0.0-preview.25078.1 + 9.0.0-preview.25113.3 + 9.0.0-preview.25113.3 + 9.0.0-preview.25113.3 From 6c4510c30583dd1ee9301b2b3ee158646dcc0dea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Feb 2025 05:02:05 +0000 Subject: [PATCH 19/80] Update dependencies from https://github.com/dotnet/msbuild build 20250211.15 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.29-preview-25111-06 -> To Version 17.12.30-preview-25111-15 --- 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 8057371b87e4..4a136ab8c692 100644 --- a/NuGet.config +++ b/NuGet.config @@ -60,7 +60,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f5458bacfd..842bffe5335d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - 990a07ed6852e478b0c05599154c3a28c124cdeb + 66286d576d5a4dec11eca10ac95ab08a7117bb75 - + https://github.com/dotnet/msbuild - 990a07ed6852e478b0c05599154c3a28c124cdeb + 66286d576d5a4dec11eca10ac95ab08a7117bb75 - + https://github.com/dotnet/msbuild - 990a07ed6852e478b0c05599154c3a28c124cdeb + 66286d576d5a4dec11eca10ac95ab08a7117bb75 diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..d2b881983a82 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.29 - 17.12.29-preview-25111-06 + 17.12.30 + 17.12.30-preview-25111-15 17.11.4 17.12 From bd24d1a8bdac97ef0dbf30fdc0112cc9e57c5921 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 20:57:23 +0000 Subject: [PATCH 20/80] [release/9.0.1xx] Allow users to set a specific ContainerImageFormat to force OCI support (#46138) Co-authored-by: Chet Husk Co-authored-by: Chet Husk --- .../Resources/Strings.Designer.cs | 1 - .../Tasks/CreateNewImage.cs | 18 ++++++++++++++++++ .../Microsoft.NET.Build.Containers.targets | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs index ec4966caaa27..6a4c5f63a1e5 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs @@ -654,7 +654,6 @@ internal static string NormalizedContainerName { } } - /// /// Looks up a localized string similar to Unable to create tarball for oci image with multiple tags.. /// diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 4c01694e7604..f981281448c7 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -143,6 +143,24 @@ internal async Task ExecuteAsync(CancellationToken cancellationToken) } } + // forcibly change the media type if required + if (ImageFormat is not null) + { + if (Enum.TryParse(ImageFormat, out var imageFormat)) + { + imageBuilder.ManifestMediaType = imageFormat switch + { + KnownImageFormats.Docker => SchemaTypes.DockerManifestV2, + KnownImageFormats.OCI => SchemaTypes.OciManifestV1, + _ => imageBuilder.ManifestMediaType // should be impossible unless we add to the enum + }; + } + else + { + Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidContainerImageFormat), ImageFormat, string.Join(",", Enum.GetValues())); + } + } + Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType); imageBuilder.AddLayer(newLayer); imageBuilder.SetWorkingDirectory(WorkingDirectory); diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index 694e1dc8372f..e2176eae697c 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -255,8 +255,8 @@ BaseRegistry="$(ContainerBaseRegistry)" BaseImageName="$(ContainerBaseName)" BaseImageTag="$(ContainerBaseTag)" - ImageFormat="$(ContainerImageFormat)" BaseImageDigest="$(ContainerBaseDigest)" + ImageFormat="$(ContainerImageFormat)" LocalRegistry="$(LocalRegistry)" OutputRegistry="$(ContainerRegistry)" ArchiveOutputPath="$(ContainerArchiveOutputPath)" From 4e9565d6aa738b03ceff979ac40b5a441bd67686 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Fri, 14 Feb 2025 16:10:58 -0600 Subject: [PATCH 21/80] Add test case for adding projects outside solution dir descendants (#46835) --- .../Dir/App.sln | 5 ++++ .../Dir/App.slnx | 1 + .../Lib/Lib.csproj | 7 ++++++ .../Lib/Library.cs | 15 ++++++++++++ test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 23 +++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.sln create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.slnx create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Lib.csproj create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Library.cs diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.sln b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.sln new file mode 100644 index 000000000000..8eca2536691f --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.sln @@ -0,0 +1,5 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26006.2 +MinimumVisualStudioVersion = 10.0.40219.1 diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.slnx b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.slnx new file mode 100644 index 000000000000..4e2253ddceed --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.slnx @@ -0,0 +1 @@ + diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Lib.csproj b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Lib.csproj new file mode 100644 index 000000000000..c350d4032840 --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Lib.csproj @@ -0,0 +1,7 @@ + + + + netstandard1.4 + + + diff --git a/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Library.cs b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Library.cs new file mode 100644 index 000000000000..71a4d48322c7 --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Library.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace Lib +{ + public class Library + { + public static string GetMessage() + { + return "Message from Lib"; + } + } +} diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 6009f9c04b97..e22f2f979cda 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -1096,6 +1096,29 @@ public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCor .Should().BeVisuallyEquivalentTo(expectedSlnContents); } + [Theory] + [InlineData("sln", ".sln")] + [InlineData("sln", ".slnx")] + [InlineData("solution", ".sln")] + [InlineData("solution", ".slnx")] + public async Task WhenAddingProjectOutsideDirectoryItShouldNotAddSolutionFolders(string solutionCommand, string solutionExtension) + { + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnAndCsprojInParentDir", identifier: $"GivenDotnetSlnAdd-{solutionCommand}{solutionExtension}") + .WithSource() + .Path; + var projectToAdd = Path.Combine("..", "Lib", "Lib.csproj"); + var cmd = new DotnetCommand(Log) + .WithWorkingDirectory(Path.Join(projectDirectory, "Dir")) + .Execute(solutionCommand, $"App{solutionExtension}", "add", projectToAdd); + cmd.Should().Pass(); + // Should have no solution folders + ISolutionSerializer serializer = SolutionSerializers.GetSerializerByMoniker(Path.Join(projectDirectory, "Dir", $"App{solutionExtension}")); + SolutionModel solution = await serializer.OpenAsync(Path.Join(projectDirectory, "Dir", $"App{solutionExtension}"), CancellationToken.None); + solution.SolutionProjects.Count.Should().Be(1); + solution.SolutionFolders.Count.Should().Be(0); + } + private string GetExpectedSlnContents( string slnPath, string slnTemplateName, From 1973066cf6057d519a31b960d5c05b7e7df9d449 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Feb 2025 03:50:53 +0000 Subject: [PATCH 22/80] Update dependencies from https://github.com/dotnet/roslyn build 20250218.3 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.13.0-3.25112.7 -> To Version 4.13.0-3.25118.3 --- NuGet.config | 33 +-------------------------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 27 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..cbe68fa70166 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,22 +24,6 @@ - - - - - - - - - - - - - - - - @@ -74,6 +58,7 @@ + @@ -118,22 +103,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..e46356b764bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 - + https://github.com/dotnet/roslyn - afe5bc4a827030229ab79ec596b3cb91d4e87872 + ca8f173459936d2f105e66ab601d384aea970f43 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..3cd09f2f2af2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 - 4.13.0-3.25112.7 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 + 4.13.0-3.25118.3 From 5b1cc30ee41e83abffcf7cd1d0e511984f612d6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Feb 2025 19:25:44 +0000 Subject: [PATCH 23/80] Update dependencies from https://github.com/dotnet/razor build 20250219.1 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.25104.3 -> To Version 9.0.0-preview.25119.1 --- NuGet.config | 32 -------------------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8057371b87e4..00be8ce273d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -42,22 +42,6 @@ - - - - - - - - - - - - - - - - @@ -118,22 +102,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f5458bacfd..01cfc35ed997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor - 36abdce12db3b9c9360e8c7711d489204a4eac71 + b950e5bb7cbbdf2bde035feb9b15bf252565a07d - + https://github.com/dotnet/razor - 36abdce12db3b9c9360e8c7711d489204a4eac71 + b950e5bb7cbbdf2bde035feb9b15bf252565a07d - + https://github.com/dotnet/razor - 36abdce12db3b9c9360e8c7711d489204a4eac71 + b950e5bb7cbbdf2bde035feb9b15bf252565a07d - + https://github.com/dotnet/razor - 36abdce12db3b9c9360e8c7711d489204a4eac71 + b950e5bb7cbbdf2bde035feb9b15bf252565a07d diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..d8f5237edec7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25104.3 - 9.0.0-preview.25104.3 - 9.0.0-preview.25104.3 + 9.0.0-preview.25119.1 + 9.0.0-preview.25119.1 + 9.0.0-preview.25119.1 From 26b17ba3ab0d3f98018d6763867c8b3f8438a3f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Feb 2025 23:16:36 +0000 Subject: [PATCH 24/80] Update dependencies from https://github.com/dotnet/roslyn build 20250219.2 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.13.0-3.25112.7 -> To Version 4.13.0-3.25119.2 --- 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 e46356b764bb..2f6056967415 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c - + https://github.com/dotnet/roslyn - ca8f173459936d2f105e66ab601d384aea970f43 + f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3cd09f2f2af2..2805909216b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 - 4.13.0-3.25118.3 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 + 4.13.0-3.25119.2 From d54b6e1c5be8ff73ec1f27c1614226db85a923d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Feb 2025 19:10:16 +0000 Subject: [PATCH 25/80] Update dependencies from https://github.com/dotnet/razor build 20250220.1 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.25078.1 -> To Version 9.0.0-preview.25120.1 --- NuGet.config | 33 +-------------------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..cbe68fa70166 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,22 +24,6 @@ - - - - - - - - - - - - - - - - @@ -74,6 +58,7 @@ + @@ -118,22 +103,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f424101c1cad..c52874b0ad16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor - 2405f884fd9c848997c6be0607b18b55544f526a + 251a2f975c29844699126279833d66cea1478ccd - + https://github.com/dotnet/razor - 2405f884fd9c848997c6be0607b18b55544f526a + 251a2f975c29844699126279833d66cea1478ccd - + https://github.com/dotnet/razor - 2405f884fd9c848997c6be0607b18b55544f526a + 251a2f975c29844699126279833d66cea1478ccd - + https://github.com/dotnet/razor - 2405f884fd9c848997c6be0607b18b55544f526a + 251a2f975c29844699126279833d66cea1478ccd diff --git a/eng/Versions.props b/eng/Versions.props index 908487bcf4f5..d110fe8b99ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25113.3 - 9.0.0-preview.25113.3 - 9.0.0-preview.25113.3 + 9.0.0-preview.25120.1 + 9.0.0-preview.25120.1 + 9.0.0-preview.25120.1 From 02c16de93f546f8c8bff84cd80b85e176120c426 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Feb 2025 02:17:12 +0000 Subject: [PATCH 26/80] Update dependencies from https://github.com/dotnet/roslyn build 20250220.11 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.13.0-3.25112.7 -> To Version 4.13.0-3.25120.11 --- 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 2f6056967415..316f691865e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn - f8f04dd41cc8dd3ab1ae755e9046eb7a7e46968c + 75e79dace86b274327a1afe479228d82a06051a4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2805909216b1..82eea1969916 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 - 4.13.0-3.25119.2 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 + 4.13.0-3.25120.11 From 7d1a3cd424d8b7411ae94c9648656c3d6e2b3efc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Feb 2025 23:46:46 +0000 Subject: [PATCH 27/80] Update dependencies from https://github.com/dotnet/razor build 20250221.3 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.25078.1 -> To Version 9.0.0-preview.25121.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c52874b0ad16..67c4336e75a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor - 251a2f975c29844699126279833d66cea1478ccd + 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor - 251a2f975c29844699126279833d66cea1478ccd + 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor - 251a2f975c29844699126279833d66cea1478ccd + 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor - 251a2f975c29844699126279833d66cea1478ccd + 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac diff --git a/eng/Versions.props b/eng/Versions.props index d110fe8b99ee..79a32151095c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25120.1 - 9.0.0-preview.25120.1 - 9.0.0-preview.25120.1 + 9.0.0-preview.25121.3 + 9.0.0-preview.25121.3 + 9.0.0-preview.25121.3 From ce571cdc0556935c4a6604843b2a503c865db1cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Feb 2025 01:08:02 +0000 Subject: [PATCH 28/80] Update dependencies from https://github.com/dotnet/razor build 20250221.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.25104.3 -> To Version 9.0.0-preview.25121.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01cfc35ed997..41c5e7714ffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor - b950e5bb7cbbdf2bde035feb9b15bf252565a07d + d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor - b950e5bb7cbbdf2bde035feb9b15bf252565a07d + d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor - b950e5bb7cbbdf2bde035feb9b15bf252565a07d + d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor - b950e5bb7cbbdf2bde035feb9b15bf252565a07d + d0fbb0748128955a5c5e5dd4289b3859d7d70600 diff --git a/eng/Versions.props b/eng/Versions.props index d8f5237edec7..9967b2cca4fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25119.1 - 9.0.0-preview.25119.1 - 9.0.0-preview.25119.1 + 9.0.0-preview.25121.4 + 9.0.0-preview.25121.4 + 9.0.0-preview.25121.4 From 566a28a477519ce51eb160f16718ce54e44e15b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 09:00:58 +0000 Subject: [PATCH 29/80] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250223.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25076.2 -> To Version 3.11.0-beta1.25123.1 --- NuGet.config | 81 +---------------------------------------- eng/Version.Details.xml | 6 +-- eng/Versions.props | 4 +- 3 files changed, 6 insertions(+), 85 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..ab600514e68f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -74,24 +42,9 @@ + - - - - - - - - - - - - - - - - @@ -118,22 +71,6 @@ - - - - - - - - - - - - - - - - @@ -144,22 +81,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..a714e06cbd84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -374,16 +374,16 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..1be3273ab1ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,8 +156,8 @@ - 9.0.0-preview.25076.2 - 3.11.0-beta1.25076.2 + 9.0.0-preview.25123.1 + 3.11.0-beta1.25123.1 From 2883d54229925dcc78e1ffd626d9966a66bcc57f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 09:02:04 +0000 Subject: [PATCH 30/80] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250223.3 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25076.3 -> To Version 3.11.0-beta1.25123.3 --- NuGet.config | 80 ----------------------------------------- eng/Version.Details.xml | 6 ++-- eng/Versions.props | 4 +-- 3 files changed, 5 insertions(+), 85 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8057371b87e4..2aed81c3b6dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -76,22 +44,6 @@ - - - - - - - - - - - - - - - - @@ -118,22 +70,6 @@ - - - - - - - - - - - - - - - - @@ -144,22 +80,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f5458bacfd..ebf99f4fb3a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,16 +408,16 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..9401fb7f0416 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,8 +158,8 @@ - 9.0.0-preview.25076.3 - 3.11.0-beta1.25076.3 + 9.0.0-preview.25123.3 + 3.11.0-beta1.25123.3 From 9cbec7c6d8338fe901207ee78991d70062bf167f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 09:35:23 +0000 Subject: [PATCH 31/80] Update dependencies from https://github.com/dotnet/razor build 20250223.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.25104.3 -> To Version 9.0.0-preview.25123.4 --- NuGet.config | 48 ----------------------------------------- eng/Version.Details.xml | 8 +++---- eng/Versions.props | 6 +++--- 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00be8ce273d5..2aed81c3b6dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,22 +24,6 @@ - - - - - - - - - - - - - - - - @@ -60,22 +44,6 @@ - - - - - - - - - - - - - - - - @@ -112,22 +80,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41c5e7714ffe..e234abf50948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,20 +325,20 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor d0fbb0748128955a5c5e5dd4289b3859d7d70600 - + https://github.com/dotnet/razor d0fbb0748128955a5c5e5dd4289b3859d7d70600 diff --git a/eng/Versions.props b/eng/Versions.props index 9967b2cca4fc..a84878507515 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25121.4 - 9.0.0-preview.25121.4 - 9.0.0-preview.25121.4 + 9.0.0-preview.25123.4 + 9.0.0-preview.25123.4 + 9.0.0-preview.25123.4 From 1d6315e8bffcc8a0011d39fde3df12e2984528c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 09:36:28 +0000 Subject: [PATCH 32/80] Update dependencies from https://github.com/dotnet/razor build 20250223.6 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.25078.1 -> To Version 9.0.0-preview.25123.6 --- NuGet.config | 48 ----------------------------------------- eng/Version.Details.xml | 8 +++---- eng/Versions.props | 6 +++--- 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/NuGet.config b/NuGet.config index cbe68fa70166..ab600514e68f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,22 +26,6 @@ - - - - - - - - - - - - - - - - @@ -61,22 +45,6 @@ - - - - - - - - - - - - - - - - @@ -113,22 +81,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67c4336e75a5..8ff2d1539feb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/dotnet/razor 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://github.com/dotnet/razor 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac diff --git a/eng/Versions.props b/eng/Versions.props index 79a32151095c..37ca5eb7e956 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25121.3 - 9.0.0-preview.25121.3 - 9.0.0-preview.25121.3 + 9.0.0-preview.25123.6 + 9.0.0-preview.25123.6 + 9.0.0-preview.25123.6 From 04119a7635bb7769a04e5a8f552502ba197c9be8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 10:36:30 +0000 Subject: [PATCH 33/80] Update dependencies from https://github.com/dotnet/roslyn build 20250223.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.13.0-3.25112.7 -> To Version 4.13.0-3.25123.5 --- NuGet.config | 48 ----------------------------------------- eng/Version.Details.xml | 18 ++++++++-------- eng/Versions.props | 16 +++++++------- 3 files changed, 17 insertions(+), 65 deletions(-) diff --git a/NuGet.config b/NuGet.config index cbe68fa70166..ab600514e68f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,22 +26,6 @@ - - - - - - - - - - - - - - - - @@ -61,22 +45,6 @@ - - - - - - - - - - - - - - - - @@ -113,22 +81,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 316f691865e7..c169d14037c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,41 +93,41 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 - + https://github.com/dotnet/roslyn 75e79dace86b274327a1afe479228d82a06051a4 diff --git a/eng/Versions.props b/eng/Versions.props index 82eea1969916..0a726272dc50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 - 4.13.0-3.25120.11 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 + 4.13.0-3.25123.5 From c6e07eaff307be372a82ef538df63598e35f351d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Feb 2025 05:02:27 +0000 Subject: [PATCH 34/80] Update dependencies from https://github.com/dotnet/roslyn build 20250223.1 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.25105.5 -> To Version 4.12.0-3.25123.1 --- NuGet.config | 80 ----------------------------------------- eng/Version.Details.xml | 18 +++++----- eng/Versions.props | 16 ++++----- 3 files changed, 17 insertions(+), 97 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8057371b87e4..2aed81c3b6dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -76,22 +44,6 @@ - - - - - - - - - - - - - - - - @@ -118,22 +70,6 @@ - - - - - - - - - - - - - - - - @@ -144,22 +80,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f5458bacfd..5c79fb83a0b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,41 +97,41 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 - + https://github.com/dotnet/roslyn 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..baf15cbf1893 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 - 4.12.0-3.25105.5 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 + 4.12.0-3.25123.1 From 866a6c82edce6974ba18dcb524da449cddde9e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Feb 2025 02:33:34 +0000 Subject: [PATCH 35/80] Update dependencies from https://github.com/dotnet/msbuild build 20250225.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.13-preview-25112-07 -> To Version 17.13.15-preview-25125-01 --- NuGet.config | 84 ++--------------------------------------- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 4 +- 3 files changed, 11 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..b4cb524df1ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,43 +24,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -74,24 +42,10 @@ + + - - - - - - - - - - - - - - - - @@ -118,22 +72,6 @@ - - - - - - - - - - - - - - - - @@ -144,22 +82,6 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..7c28d5739b96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - 1c202646288e077c489d41e00e67c458cf9245f7 + 18b3035f62325a6b61978a2776bac265955465c8 - + https://github.com/dotnet/msbuild - 1c202646288e077c489d41e00e67c458cf9245f7 + 18b3035f62325a6b61978a2776bac265955465c8 - + https://github.com/dotnet/msbuild - 1c202646288e077c489d41e00e67c458cf9245f7 + 18b3035f62325a6b61978a2776bac265955465c8 diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..44230528bc95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,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.13.13 - 17.13.13-preview-25112-07 + 17.13.15 + 17.13.15-preview-25125-01 17.11.4 17.12 From b53b08567bdbcda7bfd40d703e8eac54e6e95889 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Feb 2025 05:02:20 +0000 Subject: [PATCH 36/80] Update dependencies from https://github.com/dotnet/roslyn build 20250224.2 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.25105.5 -> To Version 4.12.0-3.25124.2 --- 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 5c79fb83a0b5..2363e489b095 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://github.com/dotnet/roslyn - 25acc509a1cb1d1a4923b0091cbc5ce837b024d0 + 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index baf15cbf1893..d243392a73d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 - 4.12.0-3.25123.1 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 + 4.12.0-3.25124.2 From d2896d738873ff10805df1e4fe407e31481108a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Feb 2025 13:05:01 +0000 Subject: [PATCH 37/80] Update dependencies from https://github.com/dotnet/msbuild build 20250225.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.13-preview-25112-07 -> To Version 17.13.17-preview-25125-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 b4cb524df1ed..241a50db76fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c28d5739b96..55f1876ffc0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - 18b3035f62325a6b61978a2776bac265955465c8 + 90ed6977fd91a5da256739d74cd60e9d3a89d436 - + https://github.com/dotnet/msbuild - 18b3035f62325a6b61978a2776bac265955465c8 + 90ed6977fd91a5da256739d74cd60e9d3a89d436 - + https://github.com/dotnet/msbuild - 18b3035f62325a6b61978a2776bac265955465c8 + 90ed6977fd91a5da256739d74cd60e9d3a89d436 diff --git a/eng/Versions.props b/eng/Versions.props index 44230528bc95..3fc35698dbf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,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.13.15 - 17.13.15-preview-25125-01 + 17.13.17 + 17.13.17-preview-25125-05 17.11.4 17.12 From 0f94e6abe0318cade733077dc7e2863a5ebd93e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Feb 2025 05:02:36 +0000 Subject: [PATCH 38/80] Update dependencies from https://github.com/dotnet/msbuild build 20250225.10 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.29-preview-25111-06 -> To Version 17.12.32-preview-25125-10 --- NuGet.config | 94 +---------------------------------------- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 4 +- 3 files changed, 9 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a136ab8c692..6ede4fde63ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,74 +24,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - @@ -118,48 +64,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 842bffe5335d..c596454772b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - 66286d576d5a4dec11eca10ac95ab08a7117bb75 + 8314f8fc4d11b3ea9bc86fba82b79e167cac41c6 - + https://github.com/dotnet/msbuild - 66286d576d5a4dec11eca10ac95ab08a7117bb75 + 8314f8fc4d11b3ea9bc86fba82b79e167cac41c6 - + https://github.com/dotnet/msbuild - 66286d576d5a4dec11eca10ac95ab08a7117bb75 + 8314f8fc4d11b3ea9bc86fba82b79e167cac41c6 diff --git a/eng/Versions.props b/eng/Versions.props index d2b881983a82..b0d8696690b9 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.30 - 17.12.30-preview-25111-15 + 17.12.32 + 17.12.32-preview-25125-10 17.11.4 17.12 From 61f14510d31fa09935e7a3d1f8063189fc91e211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Feb 2025 07:56:39 +0000 Subject: [PATCH 39/80] Update dependencies from https://github.com/dotnet/msbuild build 20250226.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.13-preview-25112-07 -> To Version 17.13.18-preview-25126-01 --- NuGet.config | 14 +------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 241a50db76fc..d7936a4ffd96 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,17 +28,11 @@ - + - - - - - - @@ -74,12 +68,6 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55f1876ffc0e..5c2f865779e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - 90ed6977fd91a5da256739d74cd60e9d3a89d436 + 73f9d5d2185e4809241bcb3219f9719261c97a12 - + https://github.com/dotnet/msbuild - 90ed6977fd91a5da256739d74cd60e9d3a89d436 + 73f9d5d2185e4809241bcb3219f9719261c97a12 - + https://github.com/dotnet/msbuild - 90ed6977fd91a5da256739d74cd60e9d3a89d436 + 73f9d5d2185e4809241bcb3219f9719261c97a12 diff --git a/eng/Versions.props b/eng/Versions.props index 3fc35698dbf2..fe21ac84eefc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,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.13.17 - 17.13.17-preview-25125-05 + 17.13.18 + 17.13.18-preview-25126-01 17.11.4 17.12 From 7e1d5cf83e7bbcc8f535bd8957071ec51ce60563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Feb 2025 20:24:02 +0000 Subject: [PATCH 40/80] Update dependencies from https://github.com/dotnet/msbuild build 20250226.12 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.13-preview-25112-07 -> To Version 17.13.18-preview-25126-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 d7936a4ffd96..d3a4ea2341a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c2f865779e0..f2d8f486faac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,16 +71,16 @@ https://github.com/dotnet/msbuild - 73f9d5d2185e4809241bcb3219f9719261c97a12 + f1b335d0aa9423c304b5cb186bad40935a6e2f2b - + https://github.com/dotnet/msbuild - 73f9d5d2185e4809241bcb3219f9719261c97a12 + f1b335d0aa9423c304b5cb186bad40935a6e2f2b - + https://github.com/dotnet/msbuild - 73f9d5d2185e4809241bcb3219f9719261c97a12 + f1b335d0aa9423c304b5cb186bad40935a6e2f2b diff --git a/eng/Versions.props b/eng/Versions.props index fe21ac84eefc..c458afd832a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,7 +179,7 @@ Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> 17.13.18 - 17.13.18-preview-25126-01 + 17.13.18-preview-25126-12 17.11.4 17.12 From 5ff7ddace486d6bc80d9cbc1a3a2a2910da0cc19 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Wed, 26 Feb 2025 15:26:27 -0600 Subject: [PATCH 41/80] [Backport to 9.0.1xx] Workflows: Don't allow merge if pr in lockdown (#46663) (#47142) Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> --- .github/workflows/pr-analysis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/pr-analysis.yml diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml new file mode 100644 index 000000000000..b74a99c9799b --- /dev/null +++ b/.github/workflows/pr-analysis.yml @@ -0,0 +1,14 @@ +name: PR Analysis +on: + pull_request: + types: [opened, synchronize, labeled, unlabeled] +permissions: + contents: read + pull-requests: read +jobs: + allowed-labels: + runs-on: ubuntu-latest + steps: + - name: Return error if branch is in lockdown or 'do not merge' label is present + run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1 + if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }} From fbac80ee9fb11fb37f789f019217ebea1ac197b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Feb 2025 22:14:11 +0000 Subject: [PATCH 42/80] Update dependencies from https://github.com/dotnet/roslyn build 20250226.2 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.13.0-3.25112.7 -> To Version 4.13.0-3.25126.2 --- NuGet.config | 13 +------------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index ab600514e68f..246819dc62b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -33,15 +33,10 @@ - - - - - - + @@ -73,12 +68,6 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c169d14037c6..3c07ba0ba382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda - + https://github.com/dotnet/roslyn - 75e79dace86b274327a1afe479228d82a06051a4 + 44ee46abe31f7ad9306ccba4f143a737ff393bda https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0a726272dc50..37fccf292bc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 - 4.13.0-3.25123.5 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 + 4.13.0-3.25126.2 From 515cdc25f1123527ad8d035d4e13bb7f5bfa31be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Feb 2025 21:30:19 +0000 Subject: [PATCH 43/80] Update dependencies from https://github.com/dotnet/roslyn build 20250227.2 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.13.0-3.25112.7 -> To Version 4.13.0-3.25127.2 --- 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 3c07ba0ba382..b63183f58937 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn - 44ee46abe31f7ad9306ccba4f143a737ff393bda + 398aa319196d4684c751a3d7c75c847e519a393c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 37fccf292bc5..b2c1ceaf77da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 - 4.13.0-3.25126.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 + 4.13.0-3.25127.2 From c72b5a59c4264a9dcbc8f93415c9bbc091f1e5cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Feb 2025 02:16:28 +0000 Subject: [PATCH 44/80] Update dependencies from https://github.com/dotnet/msbuild build 20250228.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.13-preview-25112-07 -> To Version 17.13.19-preview-25128-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 d3a4ea2341a7..aa1a01fa78a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2d8f486faac..8346d7d0d12e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 2c27e405e17595694d91892159593d6dd10e61e2 - + https://github.com/dotnet/msbuild - f1b335d0aa9423c304b5cb186bad40935a6e2f2b + d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 - + https://github.com/dotnet/msbuild - f1b335d0aa9423c304b5cb186bad40935a6e2f2b + d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 - + https://github.com/dotnet/msbuild - f1b335d0aa9423c304b5cb186bad40935a6e2f2b + d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 diff --git a/eng/Versions.props b/eng/Versions.props index c458afd832a1..5a74169afdcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,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.13.18 - 17.13.18-preview-25126-12 + 17.13.19 + 17.13.19-preview-25128-01 17.11.4 17.12 From 77d896250564a7fcf7d843e4ec7b3cf851af31a4 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:10:06 -0500 Subject: [PATCH 45/80] Attempt to resolve workload gc bug --- .../dotnet-workload/WorkloadUtilities.cs | 37 +++++++++++++++++++ .../install/WorkloadGarbageCollector.cs | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs new file mode 100644 index 000000000000..cffbaf893fc8 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -0,0 +1,37 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Deployment.DotNet.Releases; + +namespace Microsoft.DotNet.Workloads.Workload +{ + internal class WorkloadUtilities + { + internal static int VersionCompare(string first, string second) + { + if (first.Equals(second)) + { + return 0; + } + + var firstDash = first.IndexOf('-'); + var secondDash = second.IndexOf('-'); + firstDash = firstDash < 0 ? first.Length : firstDash; + secondDash = secondDash < 0 ? second.Length : secondDash; + + var firstVersion = new Version(first.Substring(0, firstDash)); + var secondVersion = new Version(second.Substring(0, secondDash)); + + var comparison = firstVersion.CompareTo(secondVersion); + if (comparison != 0) + { + return comparison; + } + + var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + + return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs index d9d72f80154f..0b74c06101d6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs @@ -115,7 +115,7 @@ void GarbageCollectWorkloadSets() // If there isn't a rollback state file, don't garbage collect the latest workload set installed for the feature band if (installedWorkloadSets.Any()) { - var latestWorkloadSetVersion = installedWorkloadSets.Keys.MaxBy(k => new ReleaseVersion(k)); + var latestWorkloadSetVersion = installedWorkloadSets.Keys.Aggregate((s1, s2) => WorkloadUtilities.VersionCompare(s1, s2) >= 0 ? s1 : s2); _workloadSets[latestWorkloadSetVersion] = GCAction.Keep; _verboseReporter.WriteLine($"GC: Keeping latest installed workload set version {latestWorkloadSetVersion}"); } From 5557f471525b1e7186925619069374a0a1b72414 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:39:06 -0500 Subject: [PATCH 46/80] Cleaner comparison --- .../dotnet/commands/dotnet-workload/WorkloadUtilities.cs | 6 +++--- .../SdkDirectoryWorkloadManifestProvider.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs index cffbaf893fc8..0b3ab2fbbe11 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -28,10 +28,10 @@ internal static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); - return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + return modifiedFirst.CompareTo(modifiedSecond); } } } diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index 94b917c537e8..4e97d7b00fe6 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -230,10 +230,10 @@ private static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); - return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + return modifiedFirst.CompareTo(modifiedSecond); } void ThrowExceptionIfManifestsNotAvailable() From ed9379d03ddd8f2950ea18a899d51a0afe19ce5f Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:01:07 -0500 Subject: [PATCH 47/80] string.Empty --> null --- src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs | 4 ++-- .../SdkDirectoryWorkloadManifestProvider.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs index 0b3ab2fbbe11..b621d0939767 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -28,8 +28,8 @@ internal static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? null : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? null : second.Substring(secondDash)); return modifiedFirst.CompareTo(modifiedSecond); } diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index 4e97d7b00fe6..c0e0da0e9466 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -230,8 +230,8 @@ private static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? null : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? null : second.Substring(secondDash)); return modifiedFirst.CompareTo(modifiedSecond); } From a1cfcc53abcc3b3ec258884fc5213be97db68e5a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:39:40 -0800 Subject: [PATCH 48/80] [release/9.0.1xx] Check shipping packages for poison (#47224) Co-authored-by: Nikola Milosavljevic --- .../content/eng/finish-source-only.proj | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/finish-source-only.proj b/src/SourceBuild/content/eng/finish-source-only.proj index a1d68f88d40b..67f3dae1fe93 100644 --- a/src/SourceBuild/content/eng/finish-source-only.proj +++ b/src/SourceBuild/content/eng/finish-source-only.proj @@ -114,12 +114,22 @@ Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > - - + + - + - + + + + + + + + + + + From b776188b32181f4f9db7b45af9cec7b7574b0c93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Mar 2025 01:28:05 +0000 Subject: [PATCH 49/80] Update dependencies from https://github.com/nuget/nuget.client build 6.13.2.1 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.1-rc.1 -> To Version 6.13.2-rc.1 --- NuGet.config | 94 +---------------------------------------- eng/Version.Details.xml | 68 ++++++++++++++--------------- eng/Versions.props | 24 +++++------ 3 files changed, 48 insertions(+), 138 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..246819dc62b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -65,33 +33,13 @@ - - - - - - + + - - - - - - - - - - - - - - - - @@ -118,48 +66,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..4fc68d667d20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 704f7cb1d2cea33afb00c2097731216f121c2c73 - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce - + https://github.com/nuget/nuget.client - 3d42754f2962b30deac1ec48e5415aa83c071b37 + 5d81cb8da82eda8a6b47aae92d1e6f888de982ce https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..f25831734392 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,18 +135,18 @@ - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 - 6.13.1-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 + 6.13.2-rc.1 From 9d61505eb6f3ba2dcde9098edb3f622bd30f527f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Mar 2025 09:19:22 +0000 Subject: [PATCH 50/80] Update dependencies from https://github.com/dotnet/roslyn build 20250305.17 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.13.0-3.25112.7 -> To Version 4.13.0-3.25155.17 --- 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 b63183f58937..e018816cba6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,41 +93,41 @@ 3d780e06fbae1bc106cb90088fa9605ea4a42eed - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c diff --git a/eng/Versions.props b/eng/Versions.props index b2c1ceaf77da..de9ae7dbe2cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 - 4.13.0-3.25127.2 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 + 4.13.0-3.25155.17 From de13f4cc7baef1939836cf6ed987aee333f0a89e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 6 Mar 2025 11:00:53 -0800 Subject: [PATCH 51/80] Update branding to 8.0.408 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a65136a81700..606eb006d246 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.407 + 8.0.408 8.0.400 true From b412c5d9b59f05d30ccdeb437bf8c81913720778 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Mar 2025 20:34:50 +0000 Subject: [PATCH 52/80] Update dependencies from https://github.com/dotnet/templating build 20250306.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.104-servicing.25112.3 -> To Version 9.0.105-servicing.25156.6 --- NuGet.config | 94 +---------------------------------------- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 4 +- 3 files changed, 9 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8057371b87e4..703384863c06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -65,33 +33,11 @@ - - - - - - - + - - - - - - - - - - - - - - - - @@ -118,48 +64,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39f5458bacfd..65a1fb8a365e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 77f6dd4f65d0f835a49b7f8375f9667933bb93d6 + 9f7796557bded3bb837f6b10d400f573e2ef83fe - + https://github.com/dotnet/templating - 77f6dd4f65d0f835a49b7f8375f9667933bb93d6 + 9f7796557bded3bb837f6b10d400f573e2ef83fe - + https://github.com/dotnet/templating - 77f6dd4f65d0f835a49b7f8375f9667933bb93d6 + 9f7796557bded3bb837f6b10d400f573e2ef83fe diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..572e0311cb39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,13 +187,13 @@ - 9.0.104 + 9.0.105 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.104-servicing.25112.3 + 9.0.105-servicing.25156.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 5c2f691e6ff3899b98beaf63706edb8ed28ab638 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:06:10 -0800 Subject: [PATCH 53/80] Update branding to 9.0.105 (#47325) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4024393b3e3f..b78cff0c3e3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 04 + 05 From b58c41b4962b5e2c2c204dfda2a8cace5c9818e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:42:35 -0800 Subject: [PATCH 54/80] [release/9.0.2xx] Update dependencies from dotnet/templating (#47329) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 94 +---------------------------------------- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 4 +- 3 files changed, 9 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b1356e90c69..5329a2562ea4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,40 +24,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -65,33 +33,11 @@ - - - - - - - + - - - - - - - - - - - - - - - - @@ -118,48 +64,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e74c319300d..c9551ea81957 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - a2862fdcaf86b098da8025439e8317417290e610 + 978233e8a25bfc3b2daa52005724ba470ca771bb - + https://github.com/dotnet/templating - a2862fdcaf86b098da8025439e8317417290e610 + 978233e8a25bfc3b2daa52005724ba470ca771bb - + https://github.com/dotnet/templating - a2862fdcaf86b098da8025439e8317417290e610 + 978233e8a25bfc3b2daa52005724ba470ca771bb diff --git a/eng/Versions.props b/eng/Versions.props index 21ff24a33862..a7b070579d55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,13 +185,13 @@ - 9.0.201 + 9.0.203 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.201-servicing.25112.5 + 9.0.203-servicing.25156.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From efbe0f75ab621e03a4a0b154bfc36aafda449689 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 6 Mar 2025 15:08:53 -0800 Subject: [PATCH 55/80] Update branding to 9.0.203 (#47326) Co-authored-by: Marc Paine --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a7b070579d55..928f40f40659 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 2 - 01 + 03 @@ -34,7 +34,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 13)) + $([MSBuild]::Add($(VersionFeature), 12)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From c3e6ef14b5ce515029316bbf22add93a41f9c037 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 6 Mar 2025 22:56:53 -0800 Subject: [PATCH 56/80] Disable tests that rely on vs-solutionpersistence fix --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index e22f2f979cda..ebb82381c743 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -244,10 +244,11 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom } [Theory] - [InlineData("sln", true, ".sln")] - [InlineData("sln", false, ".sln")] - [InlineData("solution", true, ".sln")] - [InlineData("solution", false, ".sln")] + // needs https://github.com/microsoft/vs-solutionpersistence/pull/101 + // [InlineData("sln", true, ".sln")] + // [InlineData("sln", false, ".sln")] + // [InlineData("solution", true, ".sln")] + // [InlineData("solution", false, ".sln")] [InlineData("sln", true, ".slnx")] [InlineData("solution", false, ".slnx")] public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst, string solutionExtension) From 59a7a73a436d46f7789cd508c5db60ff787dba5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Mar 2025 07:16:13 +0000 Subject: [PATCH 57/80] Update dependencies from https://github.com/dotnet/templating build 20250306.14 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.203-servicing.25156.7 -> To Version 9.0.203-servicing.25156.14 --- 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 50f6244065b0..fdd316c51bd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,10 +35,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb30371feb1b..ebd414edc3af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 978233e8a25bfc3b2daa52005724ba470ca771bb + 38b262d89eb400037cbe4f726b5650788b6b4c9d - + https://github.com/dotnet/templating - 978233e8a25bfc3b2daa52005724ba470ca771bb + 38b262d89eb400037cbe4f726b5650788b6b4c9d - + https://github.com/dotnet/templating - 978233e8a25bfc3b2daa52005724ba470ca771bb + 38b262d89eb400037cbe4f726b5650788b6b4c9d diff --git a/eng/Versions.props b/eng/Versions.props index f17188ea2844..5c08e07ab590 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.203-servicing.25156.7 + 9.0.203-servicing.25156.14 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 9c606975979f62ca64d079aae007b4d6811f8bfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 09:23:21 -0800 Subject: [PATCH 58/80] [release/9.0.1xx] Update dependencies from dotnet/templating (#47342) Co-authored-by: dotnet-maestro[bot] --- 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 22e42882b406..1939144956fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7549c3838d1b..ecc94e480382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 9f7796557bded3bb837f6b10d400f573e2ef83fe + 693a4fd2526759d8408ec1388970143e666b03e2 - + https://github.com/dotnet/templating - 9f7796557bded3bb837f6b10d400f573e2ef83fe + 693a4fd2526759d8408ec1388970143e666b03e2 - + https://github.com/dotnet/templating - 9f7796557bded3bb837f6b10d400f573e2ef83fe + 693a4fd2526759d8408ec1388970143e666b03e2 diff --git a/eng/Versions.props b/eng/Versions.props index ba3c2c0475db..3d0c4ba76a1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.105-servicing.25156.6 + 9.0.105-servicing.25156.13 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fbaf2d7e9099376dfb9ba75b9a6a56d31197a8fa Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Fri, 7 Mar 2025 17:24:53 -0600 Subject: [PATCH 59/80] [release/8.0.4xx] NugetConfigWriter: Update CDN tests (#47369) --- ...nThatWeHaveAPackageReferenceWithAliases.cs | 6 ++-- .../GivenThatWeWantToBuildANetCoreApp.cs | 2 +- ...enThatWeWantToGenerateADepsFileForATool.cs | 4 +-- ...atWeWantToStoreAProjectWithDependencies.cs | 30 ------------------- ...ntToIgnoreObsoleteDotNetCliToolPackages.cs | 2 +- ...atWeWantToRestoreDotNetCliToolReference.cs | 2 +- .../NuGetConfigWriter.cs | 1 - 7 files changed, 8 insertions(+), 39 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs index 63ba728b5084..5b895304f022 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs @@ -39,7 +39,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes() var testAsset = _testAssetsManager.CreateTestProject(testProject); var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath)); - List sources = new List() { NuGetConfigWriter.DotnetCoreBlobFeed }; + List sources = new(); sources.AddRange(packagesPaths); NuGetConfigWriter.Write(testAsset.TestRoot, sources); @@ -85,7 +85,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases() testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; var testAsset = _testAssetsManager.CreateTestProject(testProject); - List sources = new List() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) }; + List sources = new List() { Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) }; NuGetConfigWriter.Write(testAsset.TestRoot, sources); var buildCommand = new BuildCommand(testAsset) @@ -122,7 +122,7 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases() testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage; var testAsset = _testAssetsManager.CreateTestProject(testProject); - List sources = new List() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) }; + List sources = new List() { Path.GetDirectoryName(packageReferenceA.NupkgPath) }; NuGetConfigWriter.Write(testAsset.TestRoot, sources); var buildCommand = new BuildCommand(testAsset) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 2701aa314dd1..c4e87d3e9737 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -133,7 +133,7 @@ private void It_targets_the_right_framework( var testAsset = _testAssetsManager.CreateTestProject(testProject, testIdentifier); - NuGetConfigWriter.Write(testAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(testAsset.TestRoot); var buildCommand = new BuildCommand(testAsset); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs index c73131a42541..c1f324d5e510 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs @@ -86,7 +86,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem var toolProjectInstance = _testAssetsManager.CreateTestProject(toolProject, callingMethod, identifier: toolProject.Name); - NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(toolProjectInstance.TestRoot); // Workaround https://github.com/dotnet/cli/issues/9701 var useBundledNETCoreAppPackage = "/p:UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion=true"; @@ -118,7 +118,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem new XAttribute("Version", "1.0.0"))); }); - List sources = new List() { NuGetConfigWriter.DotnetCoreBlobFeed }; + List sources = new(); sources.Add(nupkgPath); NuGetConfigWriter.Write(toolReferencerInstance.TestRoot, sources); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b8b880bc0399..9d59b076dd58 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -119,36 +119,6 @@ public void compose_dependencies_noopt() storeDirectory.Should().OnlyHaveFiles(files_on_disk); } - [Fact] - public void store_nativeonlyassets() - { - TestAsset simpleDependenciesAsset = _testAssetsManager - .CopyTestAsset("UnmanagedStore") - .WithSource(); - - var storeCommand = new ComposeStoreCommand(Log, simpleDependenciesAsset.TestRoot); - - var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "outdir"); - var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w"); - - NuGetConfigWriter.Write(simpleDependenciesAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); - - storeCommand - .Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:ComposeWorkingDir={WorkingDir}", $"/p:ComposeDir={OutputFolder}", $"/p:DoNotDecorateComposeDir=true") - .Should() - .Pass(); - - DirectoryInfo storeDirectory = new DirectoryInfo(OutputFolder); - - List files_on_disk = new List { - "artifact.xml", - $"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/{_libPrefix}coredistools{FileConstants.DynamicLibSuffix}", - $"runtime.{_runtimeRid}.microsoft.netcore.coredistools/1.0.1-prerelease-00001/runtimes/{_runtimeRid}/native/coredistools.h" - }; - - storeDirectory.Should().OnlyHaveFiles(files_on_disk); - } - [Fact] public void compose_multifile() { diff --git a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs index b5d8b02faafc..0d2eaca53898 100644 --- a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs +++ b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToIgnoreObsoleteDotNetCliToolPackages.cs @@ -34,7 +34,7 @@ public void It_issues_warning_and_skips_restore_for_obsolete_DotNetCliToolRefere new XAttribute("Include", obsoletePackageId))); }); - NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed); + NuGetConfigWriter.Write(toolProjectInstance.TestRoot); RestoreCommand restoreCommand = toolProjectInstance.GetRestoreCommand(Log, toolProject.Name); restoreCommand.Execute("/v:n").Should() diff --git a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs index 8d820ac26b27..694da217c50f 100644 --- a/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs +++ b/src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreDotNetCliToolReference.cs @@ -50,7 +50,7 @@ public void It_can_restore_with_netcoreapp2_2() DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, toolProject.Name.ToLowerInvariant())); DeleteFolder(Path.Combine(TestContext.Current.NuGetCachePath, ".tools", toolProject.Name.ToLowerInvariant())); - NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed, nupkgPath); + NuGetConfigWriter.Write(toolReferenceProjectInstance.TestRoot, nupkgPath); RestoreCommand restoreCommand = toolReferenceProjectInstance.GetRestoreCommand(log: Log, relativePath: toolReferenceProject.Name); diff --git a/src/Tests/Microsoft.NET.TestFramework/NuGetConfigWriter.cs b/src/Tests/Microsoft.NET.TestFramework/NuGetConfigWriter.cs index 6a35fe11677b..5f85ea7c5515 100644 --- a/src/Tests/Microsoft.NET.TestFramework/NuGetConfigWriter.cs +++ b/src/Tests/Microsoft.NET.TestFramework/NuGetConfigWriter.cs @@ -5,7 +5,6 @@ namespace Microsoft.NET.TestFramework { public static class NuGetConfigWriter { - public static readonly string DotnetCoreBlobFeed = "https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"; public static readonly string AspNetCoreDevFeed = "https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json"; public static void Write(string folder, params string[] nugetSources) From c35d72a7b8ec8538934b2e7c9f7e527c0674da7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 23:27:47 +0000 Subject: [PATCH 60/80] [release/9.0.1xx] Update dependencies from dotnet/source-build-externals (#47364) Co-authored-by: dotnet-maestro[bot] --- 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 ecc94e480382..36b8867fe258 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 884764492bf2cbc8d38037d9eee84f16960daa74 + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 From 3ce3b345bb2501ed7e1ae0abf1b42c12bfa34a64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 15:35:29 -0800 Subject: [PATCH 61/80] [release/8.0.4xx] Update dependencies from dotnet/arcade (#46877) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/steps/send-to-helix.yml | 7 ++++--- eng/common/templates/steps/send-to-helix.yml | 7 ++++--- global.json | 4 ++-- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index e55f3ce30908..501993ecae4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bd89b043b17..3dc6922a0ba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - a319ada170a54ee87c7a81e3309948e3d3ea7aca + 221fba21fbd6a29f17af7a7004f8ef18a51519bd - + https://github.com/dotnet/arcade - a319ada170a54ee87c7a81e3309948e3d3ea7aca + 221fba21fbd6a29f17af7a7004f8ef18a51519bd - + https://github.com/dotnet/arcade - a319ada170a54ee87c7a81e3309948e3d3ea7aca + 221fba21fbd6a29f17af7a7004f8ef18a51519bd - + https://github.com/dotnet/arcade - a319ada170a54ee87c7a81e3309948e3d3ea7aca + 221fba21fbd6a29f17af7a7004f8ef18a51519bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 606eb006d246..a4c95e1604ed 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.25111.4 + 8.0.0-beta.25114.5 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.25111.4 + 8.0.0-beta.25114.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml index 3eb7e2d5f840..22f2501307d4 100644 --- a/eng/common/templates-official/steps/send-to-helix.yml +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -8,6 +8,7 @@ parameters: HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution + HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects @@ -24,12 +25,12 @@ parameters: IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +60,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 3eb7e2d5f840..22f2501307d4 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -8,6 +8,7 @@ parameters: HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution + HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects @@ -24,12 +25,12 @@ parameters: IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +60,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/global.json b/global.json index ba40e5c7d5b5..29e4c494df4e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5" } } From f6c2a6e9a38c67f1af656bb678f3126b8dfe710d Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Sun, 9 Mar 2025 14:17:28 -0600 Subject: [PATCH 62/80] NuGetPackageDownloader: Only verify signing on windows by default (#47321) Co-authored-by: Noah Gilson Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> --- .../NuGetPackageDownloader.cs | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index 87de51b002fe..33a27993dfd1 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -38,6 +38,10 @@ internal class NuGetPackageDownloader : INuGetPackageDownloader private readonly Dictionary _sourceRepositories; private readonly bool _shouldUsePackageSourceMapping; + /// + /// If true, the package downloader will verify the signatures of the packages it downloads. + /// Temporarily disabled for macOS and Linux. + /// private readonly bool _verifySignatures; private readonly VerbosityOptions _verbosityOptions; private readonly string _currentWorkingDirectory; @@ -65,7 +69,9 @@ public NuGetPackageDownloader( _restoreActionConfig = restoreActionConfig ?? new RestoreActionConfig(); _retryTimer = timer; _sourceRepositories = new(); - _verifySignatures = verifySignatures; + // If windows or env variable is set, verify signatures + _verifySignatures = verifySignatures && (OperatingSystem.IsWindows() ? true + : bool.TryParse(Environment.GetEnvironmentVariable(NuGetSignatureVerificationEnabler.DotNetNuGetSignatureVerification), out var shouldVerifySignature) ? shouldVerifySignature : OperatingSystem.IsLinux()); _cacheSettings = new SourceCacheContext { @@ -130,8 +136,17 @@ public async Task DownloadPackageAsync(PackageId packageId, packageVersion.ToNormalizedString())); } - await VerifySigning(nupkgPath, repository); - + // Delete file if verification fails + try + { + await VerifySigning(nupkgPath, repository); + } + catch (NuGetPackageInstallerException) + { + File.Delete(nupkgPath); + throw; + } + return nupkgPath; } From e184d630ff363cb8eacffd3d80049f92a50a1dfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 9 Mar 2025 14:23:11 -0600 Subject: [PATCH 63/80] [release/8.0.4xx] Update dependencies from dotnet/templating (#47384) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 47 ++--------------------------------------- eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 501993ecae4a..204efe33723a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,25 +4,13 @@ - - - - + - - - - - - - - - @@ -30,22 +18,11 @@ - - - + - - - - - - - - - @@ -72,32 +49,12 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dc6922a0ba1..1d0054a49b4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 0d7c16316a4eb3036a5483ee67bc5607cfb22254 + 8e755bc4c9be9dde2ccf64abc631aa4a74b8630c - + https://github.com/dotnet/templating - 0d7c16316a4eb3036a5483ee67bc5607cfb22254 + 8e755bc4c9be9dde2ccf64abc631aa4a74b8630c - + https://github.com/dotnet/templating - 0d7c16316a4eb3036a5483ee67bc5607cfb22254 + 8e755bc4c9be9dde2ccf64abc631aa4a74b8630c diff --git a/eng/Versions.props b/eng/Versions.props index a4c95e1604ed..b8c1f6686382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.407 + 8.0.408 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.407-servicing.25112.2 + 8.0.408-servicing.25156.12 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 239328b42cd00ebba9dab8ae6b65835ac55751de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 08:25:55 -0700 Subject: [PATCH 64/80] [release/9.0.2xx] Update dependencies from dotnet/fsharp (#47265) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85e0138b6e8c..82cf1f752773 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,6 +35,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27037b874a95..488e79379607 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 - + https://github.com/dotnet/fsharp - 3d780e06fbae1bc106cb90088fa9605ea4a42eed + 82a3f54f7140a62e6398403451098c4517747c02 - + https://github.com/dotnet/fsharp - 3d780e06fbae1bc106cb90088fa9605ea4a42eed + 82a3f54f7140a62e6398403451098c4517747c02 diff --git a/eng/Versions.props b/eng/Versions.props index 5bfdea654441..2f5e320d0271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,7 +198,7 @@ - 13.9.201-beta.25070.3 + 13.9.202-beta.25154.2 From d8512e155ecb8e683a7e9a5e2fce87d0060c3287 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 10 Mar 2025 11:41:29 -0600 Subject: [PATCH 65/80] WorkloadRestoreCommand.DiscoverAllProjects: Return full paths (#47415) --- .../dotnet-workload/restore/WorkloadRestoreCommand.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs index f25690d52963..40e61778c979 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs @@ -136,10 +136,11 @@ internal static List DiscoverAllProjects(string currentDirectory, .Select(Path.GetFullPath).ToList(); } - foreach (string file in slnFiles) + foreach (string solutionFilePath in slnFiles) { - var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(file); - projectFiles.AddRange(solutionFile.SolutionProjects.Select(p => p.FilePath)); + var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(solutionFilePath); + projectFiles.AddRange(solutionFile.SolutionProjects.Select( + p => Path.GetFullPath(p.FilePath, Path.GetDirectoryName(solutionFilePath)))); } if (projectFiles.Count == 0) From 99247e479de1666bb976b2e073ae415fe656421f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:15:45 -0700 Subject: [PATCH 66/80] [automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#47341) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Eduardo Villalpando Mello Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nikola Milosavljevic Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: v-wuzhai --- .github/workflows/pr-analysis.yml | 14 ++++++++++++++ .../content/eng/finish-source-only.proj | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/pr-analysis.yml diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml new file mode 100644 index 000000000000..b74a99c9799b --- /dev/null +++ b/.github/workflows/pr-analysis.yml @@ -0,0 +1,14 @@ +name: PR Analysis +on: + pull_request: + types: [opened, synchronize, labeled, unlabeled] +permissions: + contents: read + pull-requests: read +jobs: + allowed-labels: + runs-on: ubuntu-latest + steps: + - name: Return error if branch is in lockdown or 'do not merge' label is present + run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1 + if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }} diff --git a/src/SourceBuild/content/eng/finish-source-only.proj b/src/SourceBuild/content/eng/finish-source-only.proj index a1d68f88d40b..67f3dae1fe93 100644 --- a/src/SourceBuild/content/eng/finish-source-only.proj +++ b/src/SourceBuild/content/eng/finish-source-only.proj @@ -114,12 +114,22 @@ Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" > - - + + - + - + + + + + + + + + + + From 5eb4440a04bff2d5a39f84270906b454d58b676c Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 10 Mar 2025 20:55:53 -0700 Subject: [PATCH 67/80] [REF] SolutionProjectModel Full Paths (#47422) --- src/Cli/dotnet/ReleasePropertyProjectLocator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs index 2d52334b58f1..b09d0a345e6f 100644 --- a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs +++ b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs @@ -176,7 +176,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() Parallel.ForEach(sln.SolutionProjects.AsEnumerable(), (project, state) => { #pragma warning disable CS8604 // Possible null reference argument. - string projectFullPath = Path.Combine(Path.GetDirectoryName(slnFullPath), project.FilePath); + string projectFullPath = Path.GetFullPath(project.FilePath, Path.GetDirectoryName(slnFullPath)); #pragma warning restore CS8604 // Possible null reference argument. if (IsUnanalyzableProjectInSolution(project, projectFullPath)) return; @@ -220,7 +220,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() foreach (var project in sln.SolutionProjects.AsEnumerable()) { #pragma warning disable CS8604 // Possible null reference argument. - string projectFullPath = Path.Combine(Path.GetDirectoryName(slnPath), project.FilePath); + string projectFullPath = Path.GetFullPath(project.FilePath, Path.GetDirectoryName(slnPath)); #pragma warning restore CS8604 // Possible null reference argument. if (IsUnanalyzableProjectInSolution(project, projectFullPath)) continue; From 3d627062e0f19d1b0a02a3f3094cac06c0f5cb9c Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 11 Mar 2025 21:00:39 -0700 Subject: [PATCH 68/80] Add dotnet-templating feed to fix build failure --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index d06fafab78d7..a20104ba76b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -38,6 +38,7 @@ + From a8b7dc58d01dc048da3071f0a0bc2a56d05138d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 16:21:55 +0000 Subject: [PATCH 69/80] Update dependencies from https://github.com/dotnet/msbuild build 20250312.14 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.19-preview-25128-01 -> To Version 17.13.20-preview-25162-14 --- NuGet.config | 20 +++++++++++++------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 500b02067e01..e8781f287dc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,28 +24,30 @@ - + + + - + + + - - - - + + @@ -72,12 +74,16 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33af03552ac8..7335a787eabf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ dad5528e5bdf92a05a5a404c5f7939523390b96d - + https://github.com/dotnet/msbuild - d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 + a4ef1e90fef9b56473708b7d308f982c7c9f46d9 - + https://github.com/dotnet/msbuild - d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 + a4ef1e90fef9b56473708b7d308f982c7c9f46d9 - + https://github.com/dotnet/msbuild - d87bc64f6b9eb3af9b6b785f910136cc6a309ce7 + a4ef1e90fef9b56473708b7d308f982c7c9f46d9 diff --git a/eng/Versions.props b/eng/Versions.props index b88b3e99d783..a8954cb04217 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,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.13.19 - 17.13.19-preview-25128-01 + 17.13.20 + 17.13.20-preview-25162-14 17.11.4 17.12 From dc2cb5b547d6fb718edc82cba7b0a1aed55bf51a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 21:46:54 +0000 Subject: [PATCH 70/80] Update dependencies from https://github.com/dotnet/arcade build 20250311.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.25111.5 -> To Version 9.0.0-beta.25161.4 --- NuGet.config | 19 +++++++++---- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 20 +++++++++---- eng/common/generate-sbom-prep.sh | 17 +++++++---- eng/common/templates-official/job/job.yml | 1 + global.json | 6 ++-- 8 files changed, 61 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 500b02067e01..b9795a9f5837 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,12 @@ - + + + @@ -36,16 +38,17 @@ + + - - - - + + + @@ -72,12 +75,16 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33af03552ac8..377416d8ebcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 diff --git a/eng/Versions.props b/eng/Versions.props index b88b3e99d783..5a047162edf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -268,10 +268,10 @@ - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 + 9.0.0-beta.25161.4 + 9.0.0-beta.25161.4 + 9.0.0-beta.25161.4 + 9.0.0-beta.25161.4 diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index d938b60e1bb5..56a090094824 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -38,7 +38,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a1c5..a0c7d792a76f 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $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 $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + 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" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc827b4..b8ecca72bbf5 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# 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. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 605692d2fb77..817555505aa6 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -16,6 +16,7 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion }} BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom publishArtifacts: false # publish artifacts diff --git a/global.json b/global.json index 8156db5f7137..27cd32ad4577 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.103", + "dotnet": "9.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 395793727c2d9d072d22e95034a7bb5b905e71ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 03:25:22 +0000 Subject: [PATCH 71/80] Update dependencies from https://github.com/dotnet/templating build 20250312.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.203-servicing.25156.14 -> To Version 9.0.203-servicing.25162.4 --- NuGet.config | 4 +++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e8781f287dc8..c848e8602203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -42,7 +43,7 @@ - + @@ -75,6 +76,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7335a787eabf..1ce003b06bd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 38b262d89eb400037cbe4f726b5650788b6b4c9d + 43874922b804f9e97790fead5aa72e43ab324591 - + https://github.com/dotnet/templating - 38b262d89eb400037cbe4f726b5650788b6b4c9d + 43874922b804f9e97790fead5aa72e43ab324591 - + https://github.com/dotnet/templating - 38b262d89eb400037cbe4f726b5650788b6b4c9d + 43874922b804f9e97790fead5aa72e43ab324591 diff --git a/eng/Versions.props b/eng/Versions.props index a8954cb04217..f10f4fb9e02d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.203-servicing.25156.14 + 9.0.203-servicing.25162.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 68f5df9ddc5457cbe68b7b9c2c0965186dbc1b9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 10:27:46 +0000 Subject: [PATCH 72/80] Update dependencies from https://github.com/dotnet/templating build 20250313.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.203-servicing.25156.14 -> To Version 9.0.203-servicing.25163.4 --- 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 c848e8602203..0f8859375673 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ce003b06bd8..d800259ec230 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 43874922b804f9e97790fead5aa72e43ab324591 + 43c42acfb25c93e471d53f7c1ba27463a96246fd - + https://github.com/dotnet/templating - 43874922b804f9e97790fead5aa72e43ab324591 + 43c42acfb25c93e471d53f7c1ba27463a96246fd - + https://github.com/dotnet/templating - 43874922b804f9e97790fead5aa72e43ab324591 + 43c42acfb25c93e471d53f7c1ba27463a96246fd diff --git a/eng/Versions.props b/eng/Versions.props index f10f4fb9e02d..a8c582ec78cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.203-servicing.25162.4 + 9.0.203-servicing.25163.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 082bcded3473234c94b9ab8e67fadbf5d7bdbb02 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:16:11 +0100 Subject: [PATCH 73/80] Update GivenThatWeWantMSBuildToRespectCustomCulture.cs Fixes failing `SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail` test by consolidating back with the core only test theory. This is causing all PRs in sdk main to fail because of a machine rollout that updated VS to 17.13.x --- ...ThatWeWantMSBuildToRespectCustomCulture.cs | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index b52fdb9dfecc..f273b92e7b49 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -27,11 +27,9 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist(); } + [Theory] [InlineData("net7.0")] [InlineData("net6.0")] - // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the WarnOnCultureOverwritten - // is not supported - and the build will fail copy (more details in the last test). - [CoreMSBuildOnlyTheory] public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework) { var testAsset = _testAssetsManager @@ -46,25 +44,5 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW // warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set. .HaveStdOutContaining("warning MSB3002:"); } - - [Theory] - [InlineData("net7.0")] - [InlineData("net6.0")] - // Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild. - // - // Without explicit opt-in via WarnOnCultureOverwritten - the test will fail, as - // proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy: - // - // Microsoft.Common.CurrentVersion.targets(4959,5): error MSB3030: Could not copy the file "obj\Debug\net7.0\test-1\MSBuildCultureResourceGeneration.resources.dll" because it was not found. - public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework) - { - var testAsset = _testAssetsManager - .CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework) - .WithSource() - .WithTargetFramework(targetFramework); - - var buildCommand = new BuildCommand(testAsset); - buildCommand.Execute().Should().Fail(); - } } } From 3324483179bd8a8ab3195287f12fb044962106f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 04:35:40 +0000 Subject: [PATCH 74/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250313.5 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.3 -> To Version 9.0.4 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.3 -> To Version 9.0.4 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 17 ++--- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 70 +++++++++---------- 3 files changed, 115 insertions(+), 120 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1af8102b7b6c..901d8a6c8bc1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,13 +24,12 @@ + - - - + @@ -38,13 +37,10 @@ - - - + - - + @@ -78,11 +74,10 @@ + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8e9cadd1619..ca071066edc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 43c42acfb25c93e471d53f7c1ba27463a96246fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 @@ -226,29 +226,29 @@ e8cf3808d0b16dea8d6e1a9b77f1660a5ff45e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -469,89 +469,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore b96167fbfe8bd45d94e4dcda42c7d09eb5745459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 @@ -585,9 +585,9 @@ f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5cc91643a9b1..7a3d341c59de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,47 +84,47 @@ - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.0-rc.1.23414.4 - 9.0.3-servicing.25111.13 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4-servicing.25163.5 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 2.1.0 - 9.0.3 + 9.0.4 8.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.4 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 @@ -329,7 +329,7 @@ 15.0.9617 18.0.9617 - 9.0.3 + 9.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From d40539f8c50907e0f0b54783317b705eeb3ca445 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 07:19:27 +0000 Subject: [PATCH 75/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250313.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.3-servicing.25112.20 -> To Version 9.0.4-servicing.25163.12 --- 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 901d8a6c8bc1..1a7b55a94e82 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,9 +24,7 @@ - - - + @@ -72,9 +70,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca071066edc1..1eb09285a587 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf f58f709bc102a0d15aa6ffe4d9a7435bebd3079e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf @@ -339,21 +339,21 @@ 41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf @@ -505,9 +505,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + 0e3201af63dfb753cb9219dc472ddfa0719bf7bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a3d341c59de..f0de7bcc0a4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -213,19 +213,19 @@ - 9.0.3 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 + 9.0.4 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 + 9.0.4-servicing.25163.12 From adcff4d773a6721e71d0286e5ec498fdb8921c40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 09:16:09 +0000 Subject: [PATCH 76/80] [release/9.0.2xx] Update dependencies from dotnet/scenario-tests (#47552) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Eduardo Villalpando Mello --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1af8102b7b6c..69aebb96a946 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -45,6 +46,7 @@ + @@ -74,10 +76,12 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8e9cadd1619..d34e6fc90349 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -597,14 +597,14 @@ https://github.com/dotnet/arcade-services 47e3672c762970073e4282bd563233da86bcca3e - + https://github.com/dotnet/scenario-tests - f219fd635f701e3142be92cb0bb4039cadb39d4d + 75f784a5484a2d4e00905069160954f686dcc8e3 - + https://github.com/dotnet/scenario-tests - f219fd635f701e3142be92cb0bb4039cadb39d4d + 75f784a5484a2d4e00905069160954f686dcc8e3 From 673eb374a40ab16fd4cfefe913844ab1cd9ff803 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 08:25:34 -0700 Subject: [PATCH 77/80] [release/9.0.2xx] Update dependencies from dotnet/arcade (#47599) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 +---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69aebb96a946..f2266700cdd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -44,9 +44,7 @@ - - - + @@ -76,7 +74,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d34e6fc90349..de92f800d2a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee diff --git a/eng/Versions.props b/eng/Versions.props index ec2f1e831b28..7b1ec59b5b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -268,10 +268,10 @@ - 9.0.0-beta.25161.4 - 9.0.0-beta.25161.4 - 9.0.0-beta.25161.4 - 9.0.0-beta.25161.4 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a46b6deb7598..22b49e09d09b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 1159726a10fd..01b09b65796c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 27cd32ad4577..4100043a4e4e 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 765f9c176598fc87849a69a4d90d496dd51c3aa0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 19:09:11 +0000 Subject: [PATCH 78/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250314.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.3-servicing.25112.20 -> To Version 9.0.4-servicing.25164.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 1a7b55a94e82..e0d4040632e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eb09285a587..13d61c2d42e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 398aa319196d4684c751a3d7c75c847e519a393c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0e3201af63dfb753cb9219dc472ddfa0719bf7bf + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f0de7bcc0a4f..5d9168469a3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -214,18 +214,18 @@ 9.0.4 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 9.0.4 9.0.4 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 - 9.0.4-servicing.25163.12 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 From 2b8d9bf58fb76ba0d33b2122afb9c579c6af0700 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 20:51:12 +0000 Subject: [PATCH 79/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250314.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.3 -> To Version 9.0.4 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.3-rtm.25113.4 -> To Version 9.0.4-rtm.25164.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 8 ++------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0d4040632e0..ba0181a292f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,9 +41,7 @@ - - - + @@ -76,9 +74,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78d5bab4f2aa..bd4f095d9690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 33f5371cc258de0a72569adf1e9fbcbf04256a17 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 + ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 33f5371cc258de0a72569adf1e9fbcbf04256a17 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5577f794a53c..fb6a04ca83ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 9.0.3-servicing.25112.2 + 9.0.4-servicing.25163.12 @@ -128,10 +128,10 @@ - 9.0.3-servicing.25113.2 - 9.0.3-servicing.25113.2 - 9.0.3 - 9.0.3 + 9.0.4-servicing.25164.2 + 9.0.4-servicing.25164.2 + 9.0.4 + 9.0.4 @@ -235,8 +235,8 @@ - 9.0.3-rtm.25113.4 - 9.0.3-rtm.25113.4 + 9.0.4-rtm.25164.2 + 9.0.4-rtm.25164.2 From 4a7f5319c8f76ea55d2bd4dc74bd8c27efff7f2f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Mar 2025 06:04:49 +0000 Subject: [PATCH 80/80] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250314.6 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.4 -> To Version 9.0.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba0181a292f5..4be9187139c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd4f095d9690..07ef799dcbc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -252,20 +252,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e + ef0ddf89991072267608f432ca2163ac54fdecab https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e + ef0ddf89991072267608f432ca2163ac54fdecab https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index fb6a04ca83ad..fac3eede1334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,8 +128,8 @@ - 9.0.4-servicing.25164.2 - 9.0.4-servicing.25164.2 + 9.0.4-servicing.25164.6 + 9.0.4-servicing.25164.6 9.0.4 9.0.4