From c6198ba9536ed293b89d3c81bc798a127b1bf0b4 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 00:17:06 +0000 Subject: [PATCH 01/36] 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/36] 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/36] 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/36] 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/36] 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/36] 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/36] [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/36] 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/36] 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 00f16bf32c92c922f609331f41ac5c57f4db699c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2025 08:19:57 +0000 Subject: [PATCH 12/36] 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 13/36] 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 6c4510c30583dd1ee9301b2b3ee158646dcc0dea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Feb 2025 05:02:05 +0000 Subject: [PATCH 14/36] 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 5b1cc30ee41e83abffcf7cd1d0e511984f612d6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Feb 2025 19:25:44 +0000 Subject: [PATCH 15/36] 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 ce571cdc0556935c4a6604843b2a503c865db1cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Feb 2025 01:08:02 +0000 Subject: [PATCH 16/36] 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 2883d54229925dcc78e1ffd626d9966a66bcc57f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Feb 2025 09:02:04 +0000 Subject: [PATCH 17/36] 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 18/36] 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 c6e07eaff307be372a82ef538df63598e35f351d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Feb 2025 05:02:27 +0000 Subject: [PATCH 19/36] 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 b53b08567bdbcda7bfd40d703e8eac54e6e95889 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Feb 2025 05:02:20 +0000 Subject: [PATCH 20/36] 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 0f94e6abe0318cade733077dc7e2863a5ebd93e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Feb 2025 05:02:36 +0000 Subject: [PATCH 21/36] 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 5ff7ddace486d6bc80d9cbc1a3a2a2910da0cc19 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Wed, 26 Feb 2025 15:26:27 -0600 Subject: [PATCH 22/36] [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 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 23/36] [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 de13f4cc7baef1939836cf6ed987aee333f0a89e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 6 Mar 2025 11:00:53 -0800 Subject: [PATCH 24/36] 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 25/36] 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 26/36] 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 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 27/36] [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 28/36] [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 29/36] [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 30/36] [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 31/36] 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 32/36] [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 33/36] [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 34/36] 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 35/36] [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 36/36] [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;