From f9ad8bf8b00004d8735b7b95251d988c068ecd83 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 15 Aug 2024 18:41:34 +0000 Subject: [PATCH 01/36] Merged PR 41536: [internal/release/6.0.1xx] Update dependencies from 3 repositories This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20240812.10 - **Date Produced**: August 13, 2024 2:56:37 AM UTC - **Commit**: 4493500184d43f2d0c60001d557433e40de1663c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e4bec0ab4141e6681c87e3f34317f3d670946cd&targetVersion=GC4493500184d43f2d0c60001d557433e40de1663c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240813.2 - **Date Produced**: August 13, 2024 11:41:29 PM UTC - **Commit**: 526b783fc75e702512a29ede591c4335dce62d6f - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][4] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7748e8750e5b93731c9ebd20aae01dd5b6abaaab&targetVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240807.6 - **Date Produced**: August 7, 2024 10:41:17 PM UTC - **Commit**: 461f5091a1b0ac7a12af350bb2a094e248cd757c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.33-servici... --- NuGet.config | 30 ++++++---- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 32 +++++------ 3 files changed, 96 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69e19e9faf5d..76b727085c52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -16,15 +16,18 @@ + + + + + + - - - - + @@ -41,24 +44,27 @@ - + - + + + + + + + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31c929be5f22..08171b92ca86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c https://github.com/dotnet/msbuild @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -174,98 +174,98 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 526b783fc75e702512a29ede591c4335dce62d6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 526b783fc75e702512a29ede591c4335dce62d6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 526b783fc75e702512a29ede591c4335dce62d6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 526b783fc75e702512a29ede591c4335dce62d6f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b660c1e83039451abe9d9190a7aabe87c03fd7ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c0e1d6c809cf..41ac0453e398 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,13 +41,13 @@ - 6.0.33 - 6.0.33-servicing.24366.10 - 6.0.33 + 6.0.34 + 6.0.34-servicing.24412.10 + 6.0.34 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.33 - 6.0.33-servicing.24366.10 + 6.0.34 + 6.0.34-servicing.24412.10 6.0.0-preview.7.21363.9 6.0.1 6.0.1 @@ -132,16 +132,16 @@ - 6.0.33-servicing.24379.5 - 6.0.33 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33 - 6.0.33 - 6.0.33 - 6.0.33 - 6.0.33-servicing.24379.5 + 6.0.34-servicing.24415.2 + 6.0.34 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34 + 6.0.34 + 6.0.34 + 6.0.34 + 6.0.34-servicing.24415.2 @@ -149,7 +149,7 @@ - 6.0.33-servicing.24366.6 + 6.0.34-servicing.24413.2 From 545b7dde3f8761587e5dae23dcda07a185ef5d3e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 00:19:44 +0000 Subject: [PATCH 02/36] Merged PR 41772: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240815.8 - **Date Produced**: August 15, 2024 8:11:17 PM UTC - **Commit**: 15b9e7637e51dc8495f899ebaadd7d2a76095967 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.133 to 6.0.133][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.133-servicing.24415.4 to 6.0.133-servicing.24415.8][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Utils**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateSearch.Common**: [from 6.0.133 to 6.0.133][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC68f6e5bdac8569fd32be90ecf442d4f8068e967b&targetVersion=GC15b9e7637e51dc8495f899ebaadd7d2a76095967&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) --- NuGet.config | 22 ++-------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76b727085c52..50ab86ab3c43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,16 +15,7 @@ - - - - - - - - - - + @@ -52,16 +43,7 @@ - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08171b92ca86..2d227e6390f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 41ac0453e398..41276e6c819b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 6.0.133-servicing.24366.6 + 6.0.133-servicing.24415.8 6.0.133 6.0.133 6.0.133 From a9e1ba5cadc1a36be59c59dbb991e6475c91f347 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 15:36:31 +0000 Subject: [PATCH 03/36] Merged PR 41778: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240815.7 - **Date Produced**: August 16, 2024 1:03:31 AM UTC - **Commit**: 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50ab86ab3c43..eb6606cca7c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d227e6390f9..53babcd2c5f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,23 +176,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 526b783fc75e702512a29ede591c4335dce62d6f + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 526b783fc75e702512a29ede591c4335dce62d6f + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 526b783fc75e702512a29ede591c4335dce62d6f + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 526b783fc75e702512a29ede591c4335dce62d6f + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b660c1e83039451abe9d9190a7aabe87c03fd7ae + 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 41276e6c819b..26d8c2cf0856 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.33-servicing.24366.5 + 6.0.34-servicing.24415.6 - 6.0.34-servicing.24413.2 + 6.0.34-servicing.24415.7 From 902e4fa5b25d2b3e2bdb9d0933005c535f37e026 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 17 Aug 2024 15:30:48 +0000 Subject: [PATCH 04/36] Merged PR 41815: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20240816.23 - **Date Produced**: August 17, 2024 4:41:32 AM UTC - **Commit**: 98588b0f0d72383aca8722755d838ae1d542ce62 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4493500184d43f2d0c60001d557433e40de1663c&targetVersion=GC98588b0f0d72383aca8722755d838ae1d542ce62&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb6606cca7c1..8436149e5dda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53babcd2c5f4..159f61ed2f5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 26d8c2cf0856..c74f2292b88a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.34 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 6.0.34 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.34 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 6.0.0-preview.7.21363.9 6.0.1 6.0.1 From 436bce461faaa2dbf929d7b4055fc3568bb41173 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 17 Aug 2024 22:13:15 +0000 Subject: [PATCH 05/36] Merged PR 41826: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240817.2 - **Date Produced**: August 17, 2024 4:05:07 PM UTC - **Commit**: b66746dd945089102c4932375063d67616bea606 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.133 to 6.0.133][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.133-servicing.24415.8 to 6.0.133-servicing.24417.2][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.133 to 6.0.133][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC15b9e7637e51dc8495f899ebaadd7d2a76095967&targetVersion=GCb66746dd945089102c4932375063d67616bea606&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240817.1 - **Date Produced**: August 17, 2024 4:21:43 PM UTC - **Commit**: e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **dotnet-user-secrets**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Authorization**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Razor.Inter... --- NuGet.config | 8 ++--- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++---- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8436149e5dda..27f2b8d774ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 159f61ed2f5d..7dc85650a17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -196,76 +196,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c74f2292b88a..0a325fbf7c12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 6.0.133-servicing.24415.8 + 6.0.133-servicing.24417.2 6.0.133 6.0.133 6.0.133 @@ -132,16 +132,16 @@ - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 6.0.34 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 6.0.34 6.0.34 6.0.34 6.0.34 - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 From be7da2b93dad324ef6399a8f8049a064430ac3be Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 19 Aug 2024 18:13:22 +0000 Subject: [PATCH 06/36] Merged PR 41864: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240819.1 - **Date Produced**: August 19, 2024 5:18:35 PM UTC - **Commit**: 7132545b5ef9cfe30512311811ee420b1f208971 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&targetVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&targetVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 27f2b8d774ea..bbbd9e79d021 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7dc85650a17b..975ee0119fc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,23 +176,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 + 0716b4331761db24b6c5f2f52e8bcd32b6bd065b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0a325fbf7c12..037db496db57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.34-servicing.24415.6 + 6.0.34-servicing.24417.2 - 6.0.34-servicing.24415.7 + 6.0.34-servicing.24419.1 From 6b5e21ecb90996f17575a2ce55a28302a431684c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 3 Sep 2024 22:22:42 +0000 Subject: [PATCH 07/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240903.6 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.34-servicing.24417.1 -> To Version 6.0.35-servicing.24453.6 --- NuGet.config | 26 ++++++++++++-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++------ 3 files changed, 74 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbbd9e79d021..3e13fb12ca8b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ - + + @@ -16,9 +17,19 @@ + + + + + + + + + + @@ -35,17 +46,28 @@ - + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 975ee0119fc2..f727406c6b81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -194,78 +194,78 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0716b4331761db24b6c5f2f52e8bcd32b6bd065b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 559806d223a382821be5ec8f7e0e15d33c01cc01 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2bafd7585348..c9e29edcb97d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.34-servicing.24417.1 - 6.0.34 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34 - 6.0.34 - 6.0.34 - 6.0.34 - 6.0.34-servicing.24417.1 + 6.0.35-servicing.24453.6 + 6.0.35 + 6.0.35-servicing.24453.6 + 6.0.35-servicing.24453.6 + 6.0.35-servicing.24453.6 + 6.0.35 + 6.0.35 + 6.0.35 + 6.0.35 + 6.0.35-servicing.24453.6 From 65957f36e37fcc112e66804b870a3d4e53373f41 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Sep 2024 02:35:46 +0000 Subject: [PATCH 08/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240904.6 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24453.6 -> To Version 6.0.35-servicing.24454.6 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e13fb12ca8b..b5e00cf723d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f727406c6b81..d7dd197cdd4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -196,76 +196,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 559806d223a382821be5ec8f7e0e15d33c01cc01 + 4413239935644e4c528bd400fed7ae65a2667e4c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c9e29edcb97d..4c5abb39eee1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.35-servicing.24453.6 + 6.0.35-servicing.24454.6 6.0.35 - 6.0.35-servicing.24453.6 - 6.0.35-servicing.24453.6 - 6.0.35-servicing.24453.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 6.0.35 6.0.35 6.0.35 6.0.35 - 6.0.35-servicing.24453.6 + 6.0.35-servicing.24454.6 From cf01aac691da668e933a24efdd1f5bc9f81110f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Sep 2024 03:20:36 +0000 Subject: [PATCH 09/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240905.11 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.0 -> To Version 6.0.1 --- NuGet.config | 6 ++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5e00cf723d1..7cb44e15051c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -51,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7dd197cdd4b..753f91639f22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4c5abb39eee1..d35a8daf0cff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,13 +41,13 @@ - 6.0.34 - 6.0.34-servicing.24416.23 - 6.0.34 + 6.0.35 + 6.0.35-servicing.24455.11 + 6.0.35 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 6.0.0 - 6.0.34 - 6.0.34-servicing.24416.23 + 6.0.1 + 6.0.35 + 6.0.35-servicing.24455.11 6.0.0-preview.7.21363.9 6.0.1 6.0.1 From c1de528660a0b879ed83bf0733992d20c5b3b33c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 Sep 2024 18:43:11 +0000 Subject: [PATCH 10/36] Updated .vsts-ci.yml --- .vsts-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 23bb5bf18548..1081d3f2cbe7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -112,12 +112,10 @@ extends: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - image: 1es-windows-2022-open - os: windows + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022 - os: windows + demands: ImageOverride -equals windows.vs2022preview.amd64 ${{ if eq(variables['System.TeamProject'], 'public') }}: helixTargetQueue: Windows.Amd64.VS2022.Pre.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: From 1a7cab05abfba431d5d553507ffa9bbb9318f85a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Sep 2024 21:30:19 +0000 Subject: [PATCH 11/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240909.5 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7cb44e15051c..51ee005a84d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 753f91639f22..aa8c21204960 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,39 +32,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7442e7d200fd02d8d0bf7ba1de30ecfd453bb2e6 + 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d35a8daf0cff..26a6f4a7be5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.35 - 6.0.35-servicing.24455.11 + 6.0.35-servicing.24459.5 6.0.35 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.1 6.0.35 - 6.0.35-servicing.24455.11 + 6.0.35-servicing.24459.5 6.0.0-preview.7.21363.9 6.0.1 6.0.1 From 2993393ab6a79f20c39a99489a00338e964d9cfa Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 Sep 2024 15:00:13 -0700 Subject: [PATCH 12/36] Modify first run tests to all use a different test folder so there's no risk of overlap --- ...ivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index ce6ef6e3141c..ab6228c6fe35 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -61,13 +61,13 @@ public class DotNetFirstTimeFixture : IDisposable public Dictionary ExtraEnvironmentVariables = new Dictionary(); - public void Init(ITestOutputHelper log, TestAssetsManager testAssets) + public void Init(ITestOutputHelper log, TestAssetsManager testAssets, [CallerMemberName] string testName = null) { if (TestDirectory == null) { var dotnetFirstTime = new DotNetFirstTime(); - var command = dotnetFirstTime.Setup(log, testAssets, testName: "Dotnet_first_time_experience_tests"); + var command = dotnetFirstTime.Setup(log, testAssets, testName: testName ?? "Dotnet_first_time_experience_tests"); FirstDotnetNonVerbUseCommandResult = command.Execute("--info"); FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive"); @@ -87,16 +87,18 @@ public void Dispose() public class GivenThatTheUserIsRunningDotNetForTheFirstTime : SdkTest, IClassFixture { DotNetFirstTimeFixture _fixture; + ITestOutputHelper _log; public GivenThatTheUserIsRunningDotNetForTheFirstTime(ITestOutputHelper log, DotNetFirstTimeFixture fixture) : base(log) { - fixture.Init(log, _testAssetsManager); + _log = log; _fixture = fixture; } [Fact] public void UsingDotnetForTheFirstTimeSucceeds() { + _fixture.Init(_log, _testAssetsManager); _fixture.FirstDotnetVerbUseCommandResult .Should() .Pass(); @@ -105,6 +107,7 @@ public void UsingDotnetForTheFirstTimeSucceeds() [Fact] public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() { + _fixture.Init(_log, _testAssetsManager); string firstTimeNonVerbUseMessage = Cli.Utils.LocalizableStrings.DotNetSdkInfoLabel; _fixture.FirstDotnetNonVerbUseCommandResult.StdOut @@ -115,7 +118,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() [Fact] public void ItShowsTheAppropriateMessageToTheUser() { - + _fixture.Init(_log, _testAssetsManager); var expectedVersion = GetDotnetVersion(); _fixture.FirstDotnetVerbUseCommandResult.StdOut .Should() @@ -130,6 +133,7 @@ public void ItShowsTheAppropriateMessageToTheUser() [Fact] public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder() { + _fixture.Init(_log, _testAssetsManager); _fixture.DotDotnetFolder .Should() .HaveFile($"{GetDotnetVersion()}.dotnetFirstUseSentinel"); @@ -138,6 +142,7 @@ public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder() [Fact] public void ItCreatesAnAspNetCertificateSentinelFileUnderTheDotDotNetFolder() { + _fixture.Init(_log, _testAssetsManager); _fixture.DotDotnetFolder .Should() .HaveFile($"{GetDotnetVersion()}.aspNetCertificateSentinel"); From 371e8dc28f140f8c0e175fc241e1634a23c9ff20 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 05:54:57 +0000 Subject: [PATCH 13/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240909.14 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51ee005a84d2..f74b20b9fe48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa8c21204960..83315246fac3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,39 +32,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40d60a122dfd637e1b8a7cccbbbc363d508fb0d7 + fd1aa2c473164cc81476dc1933333bb4af26698f https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 26a6f4a7be5e..9c4b930a55fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.35 - 6.0.35-servicing.24459.5 + 6.0.35-servicing.24459.14 6.0.35 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.1 6.0.35 - 6.0.35-servicing.24459.5 + 6.0.35-servicing.24459.14 6.0.0-preview.7.21363.9 6.0.1 6.0.1 From 0a899bbe86a0b2969ddd990c1c0016cf1a22cb11 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 10:26:54 +0000 Subject: [PATCH 14/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240909.18 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index f74b20b9fe48..dd6d0fdd4069 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83315246fac3..779ea1d6c17f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,39 +32,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fd1aa2c473164cc81476dc1933333bb4af26698f + b357f86ce3bce7c232ea242074b17bebdc50b543 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9c4b930a55fb..9b604963e516 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.35 - 6.0.35-servicing.24459.14 + 6.0.35-servicing.24459.18 6.0.35 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.1 6.0.35 - 6.0.35-servicing.24459.14 + 6.0.35-servicing.24459.18 6.0.0-preview.7.21363.9 6.0.1 6.0.1 From 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Sep 2024 16:57:33 +0000 Subject: [PATCH 15/36] Merged PR 42559: Merge GH release/6.0.1xx to internal/release/6.0.1xx https://github.com/dotnet/sdk/issues/43104 ---- #### AI description (iteration 1) #### PR Classification Code cleanup and script updates. #### PR Summary This pull request updates and cleans up various post-build scripts and configurations. - Added `nuget-verification.ps1` to verify Microsoft NuGet packages. - Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1`. - Updated `publish-build-assets.yml` and `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`. - Updated dependencies in `Version.Details.xml`. --- NuGet.config | 2 +- eng/Version.Details.xml | 24 ++-- eng/Versions.props | 8 +- .../post-build/add-build-to-channel.ps1 | 48 ------- .../post-build/check-channel-consistency.ps1 | 10 +- eng/common/post-build/nuget-validation.ps1 | 13 +- eng/common/post-build/nuget-verification.ps1 | 121 ++++++++++++++++++ eng/common/post-build/post-build-utils.ps1 | 91 ------------- eng/common/post-build/publish-using-darc.ps1 | 22 ++-- .../post-build/sourcelink-validation.ps1 | 10 +- eng/common/post-build/symbols-validation.ps1 | 2 - .../post-build/trigger-subscriptions.ps1 | 64 --------- .../job/publish-build-assets.yml | 17 ++- .../post-build/common-variables.yml | 2 - .../post-build/post-build.yml | 11 +- .../post-build/setup-maestro-vars.yml | 30 ++--- .../post-build/trigger-subscription.yml | 13 -- .../steps/add-build-to-channel.yml | 13 -- .../templates/job/publish-build-assets.yml | 17 ++- .../templates/post-build/common-variables.yml | 2 - .../templates/post-build/post-build.yml | 14 +- .../post-build/setup-maestro-vars.yml | 30 ++--- .../post-build/trigger-subscription.yml | 13 -- .../templates/steps/add-build-to-channel.yml | 13 -- global.json | 6 +- .../Microsoft.DotNet.Cli.Utils.csproj | 1 + src/Layout/tool_msbuild/tool_msbuild.csproj | 1 + ...Microsoft.DotNet.MSBuildSdkResolver.csproj | 1 + ....NET.Sdk.WorkloadMSBuildSdkResolver.csproj | 1 + 29 files changed, 244 insertions(+), 356 deletions(-) delete mode 100644 eng/common/post-build/add-build-to-channel.ps1 create mode 100644 eng/common/post-build/nuget-verification.ps1 delete mode 100644 eng/common/post-build/post-build-utils.ps1 delete mode 100644 eng/common/post-build/trigger-subscriptions.ps1 delete mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml delete mode 100644 eng/common/templates/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates/steps/add-build-to-channel.yml diff --git a/NuGet.config b/NuGet.config index bbbd9e79d021..22a345758907 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 975ee0119fc2..7c5c8694f0dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,13 +66,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://github.com/dotnet/msbuild - d679d209277a156cdc0963c993585ffa5744dc5f + 85d71072f8fa22cc761d6b65954da263364bee4d - + https://github.com/dotnet/msbuild - d679d209277a156cdc0963c993585ffa5744dc5f + 85d71072f8fa22cc761d6b65954da263364bee4d https://github.com/dotnet/fsharp @@ -300,22 +300,22 @@ - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + c3f5fe044e7115fb66c79db5e074cb341dbe21dd - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + c3f5fe044e7115fb66c79db5e074cb341dbe21dd - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + c3f5fe044e7115fb66c79db5e074cb341dbe21dd - + https://github.com/dotnet/arcade - fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 + c3f5fe044e7115fb66c79db5e074cb341dbe21dd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2bafd7585348..3ccfcf4babcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ 4.0.0 5.0.0 6.0.4 - 6.0.0-beta.24360.7 + 6.0.0-beta.24413.1 3.1.0 6.0.0 4.3.0 @@ -97,10 +97,10 @@ - 17.0.3 + 17.0.4 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.0.3-preview-24178-04 + 17.0.4-preview-24422-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) @@ -167,7 +167,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.24360.7 + 6.0.0-beta.24413.1 4.8.2 6.0.0-beta.21376.2 diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 deleted file mode 100644 index 49938f0c89f7..000000000000 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -param( - [Parameter(Mandatory=$true)][int] $BuildId, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Check that the channel we are going to promote the build to exist - $channelInfo = Get-MaestroChannel -ChannelId $ChannelId - - if (!$channelInfo) { - Write-PipelineTelemetryCategory -Category 'PromoteBuild' -Message "Channel with BAR ID $ChannelId was not found in BAR!" - ExitWithExitCode 1 - } - - # Get info about which channel(s) the build has already been promoted to - $buildInfo = Get-MaestroBuild -BuildId $BuildId - - if (!$buildInfo) { - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "Build with BAR ID $BuildId was not found in BAR!" - ExitWithExitCode 1 - } - - # Find whether the build is already assigned to the channel or not - if ($buildInfo.channels) { - foreach ($channel in $buildInfo.channels) { - if ($channel.Id -eq $ChannelId) { - Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!" - ExitWithExitCode 0 - } - } - } - - Write-Host "Promoting build '$BuildId' to channel '$ChannelId'." - - Assign-BuildToChannel -BuildId $BuildId -ChannelId $ChannelId - - Write-Host 'done.' -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'" - ExitWithExitCode 1 -} diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c986a..470d48455ba6 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -4,7 +4,15 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 if ($PromoteToChannels -eq "") { Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab538..9c81aa43917f 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,11 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { - . $PSScriptRoot\post-build-utils.ps1 - - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000000..a365194a9389 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 deleted file mode 100644 index 534f6988d5b7..000000000000 --- a/eng/common/post-build/post-build-utils.ps1 +++ /dev/null @@ -1,91 +0,0 @@ -# Most of the functions in this file require the variables `MaestroApiEndPoint`, -# `MaestroApiVersion` and `MaestroApiAccessToken` to be globally available. - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -$disableConfigureToolsetImport = $true -. $PSScriptRoot\..\tools.ps1 - -function Create-MaestroApiRequestHeaders([string]$ContentType = 'application/json') { - Validate-MaestroVars - - $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $headers.Add('Accept', $ContentType) - $headers.Add('Authorization',"Bearer $MaestroApiAccessToken") - return $headers -} - -function Get-MaestroChannel([int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroBuild([int]$BuildId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { - Validate-MaestroVars - - $SourceRepository = [System.Web.HttpUtility]::UrlEncode($SourceRepository) - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null -} - -function Trigger-Subscription([string]$SubscriptionId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null -} - -function Validate-MaestroVars { - try { - Get-Variable MaestroApiEndPoint | Out-Null - Get-Variable MaestroApiVersion | Out-Null - Get-Variable MaestroApiAccessToken | Out-Null - - if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" - ExitWithExitCode 1 - } - - if (!($MaestroApiVersion -Match '^[0-9]{4}-[0-9]{2}-[0-9]{2}$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiVersion does not match a version string in the format yyyy-MM-DD. '$MaestroApiVersion'" - ExitWithExitCode 1 - } - } - catch { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message 'Error: Variables `MaestroApiEndPoint`, `MaestroApiVersion` and `MaestroApiAccessToken` are required while using this script.' - Write-Host $_ - ExitWithExitCode 1 - } -} diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d75..4ff587ca46a9 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -10,7 +9,12 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 $darc = Get-Darc @@ -31,13 +35,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index e8ab29afeb33..5c4dd17dc3a4 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -6,7 +6,15 @@ param( [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) -. $PSScriptRoot\post-build-utils.ps1 +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist # in the repository at a specific commit point. This is populated by inserting diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a5af041ba775..8857e3b84034 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -299,8 +299,6 @@ function InstallDotnetSymbol { } try { - . $PSScriptRoot\post-build-utils.ps1 - InstallDotnetSymbol foreach ($Job in @(Get-Job)) { diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 deleted file mode 100644 index ac9a95778fcd..000000000000 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ /dev/null @@ -1,64 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $SourceRepo, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Get all the $SourceRepo subscriptions - $normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '') - $subscriptions = Get-MaestroSubscriptions -SourceRepository $normalizedSourceRepo -ChannelId $ChannelId - - if (!$subscriptions) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'" - ExitWithExitCode 0 - } - - $subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] - $failedTriggeredSubscription = $false - - # Get all enabled subscriptions that need dependency flow on 'everyBuild' - foreach ($subscription in $subscriptions) { - if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { - Write-Host "Should trigger this subscription: ${$subscription.id}" - [void]$subscriptionsToTrigger.Add($subscription.id) - } - } - - foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { - try { - Write-Host "Triggering subscription '$subscriptionToTrigger'." - - Trigger-Subscription -SubscriptionId $subscriptionToTrigger - - Write-Host 'done.' - } - catch - { - Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'" - Write-Host $_ - Write-Host $_.ScriptStackTrace - $failedTriggeredSubscription = $true - } - } - - if ($subscriptionsToTrigger.Count -eq 0) { - Write-Host "No subscription matched source repo '$normalizedSourceRepo' and channel ID '$ChannelId'." - } - elseif ($failedTriggeredSubscription) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message 'At least one subscription failed to be triggered...' - ExitWithExitCode 1 - } - else { - Write-Host 'All subscriptions were triggered successfully!' - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message $_ - ExitWithExitCode 1 -} diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 1d84eb301c46..e035ef719bff 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -61,19 +61,24 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: eng\common\sdk-task.ps1 + arguments: > + -task PublishBuildAssets + -restore + -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 displayName: Create ReleaseConfigs Artifact diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index 5404cc7ecbef..7e1af5af506c 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -11,8 +11,6 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - name: MaestroApiVersion value: "2020-02-20" diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index fce0d0bf5cef..7a83f6c4e302 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -128,7 +128,6 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -266,14 +265,16 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4ad..af3a6eb12f12 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -11,19 +11,20 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf6..000000000000 --- a/eng/common/templates-official/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml deleted file mode 100644 index f67a210d62f3..000000000000 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bd3d54b760c2..cab9056d1e5e 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -61,19 +61,24 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: eng\common\sdk-task.ps1 + arguments: > + -task PublishBuildAssets + -restore + -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 displayName: Create ReleaseConfigs Artifact diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 5404cc7ecbef..7e1af5af506c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,8 +11,6 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - name: MaestroApiVersion value: "2020-02-20" diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5a0bb8d96d20..c6c2da3de6ee 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -125,7 +125,6 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -262,14 +261,17 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4ad..af3a6eb12f12 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,19 +11,20 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf6..000000000000 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml deleted file mode 100644 index f67a210d62f3..000000000000 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/global.json b/global.json index 90a2e8486ad5..1ac5f2394bfc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.132", + "dotnet": "6.0.133", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24360.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1" } } diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index ad51338f90ba..c9cde4be84f6 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -44,5 +44,6 @@ + diff --git a/src/Layout/tool_msbuild/tool_msbuild.csproj b/src/Layout/tool_msbuild/tool_msbuild.csproj index 3c51e686e286..a0e07220ccef 100644 --- a/src/Layout/tool_msbuild/tool_msbuild.csproj +++ b/src/Layout/tool_msbuild/tool_msbuild.csproj @@ -10,5 +10,6 @@ + diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index cf53c33fe5b1..291c1a4c6bfc 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -57,6 +57,7 @@ + diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj index 1e3c98d93e88..7a8da8f70976 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj @@ -15,6 +15,7 @@ + From 13c140cd71dadf6d31d9a13af82918eb7f246a57 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Sep 2024 12:46:04 -0700 Subject: [PATCH 16/36] Swap the order of the commands in case that's affecting the first run message. --- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index ab6228c6fe35..33930696eb5f 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -69,8 +69,8 @@ public void Init(ITestOutputHelper log, TestAssetsManager testAssets, [CallerMem var command = dotnetFirstTime.Setup(log, testAssets, testName: testName ?? "Dotnet_first_time_experience_tests"); - FirstDotnetNonVerbUseCommandResult = command.Execute("--info"); FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive"); + FirstDotnetNonVerbUseCommandResult = command.Execute("--info"); TestDirectory = dotnetFirstTime.TestDirectory; NugetFallbackFolder = dotnetFirstTime.NugetFallbackFolder; From a2387021a7ad18353dc342891785a1a855d1b38c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Sep 2024 16:04:37 -0700 Subject: [PATCH 17/36] Revert "Modify first run tests to all use a different test folder so there's no risk of overlap" This reverts commit 2993393ab6a79f20c39a99489a00338e964d9cfa. --- ...ivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 33930696eb5f..e45ac4adbcd5 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -61,13 +61,13 @@ public class DotNetFirstTimeFixture : IDisposable public Dictionary ExtraEnvironmentVariables = new Dictionary(); - public void Init(ITestOutputHelper log, TestAssetsManager testAssets, [CallerMemberName] string testName = null) + public void Init(ITestOutputHelper log, TestAssetsManager testAssets) { if (TestDirectory == null) { var dotnetFirstTime = new DotNetFirstTime(); - var command = dotnetFirstTime.Setup(log, testAssets, testName: testName ?? "Dotnet_first_time_experience_tests"); + var command = dotnetFirstTime.Setup(log, testAssets, testName: "Dotnet_first_time_experience_tests"); FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive"); FirstDotnetNonVerbUseCommandResult = command.Execute("--info"); @@ -87,18 +87,16 @@ public void Dispose() public class GivenThatTheUserIsRunningDotNetForTheFirstTime : SdkTest, IClassFixture { DotNetFirstTimeFixture _fixture; - ITestOutputHelper _log; public GivenThatTheUserIsRunningDotNetForTheFirstTime(ITestOutputHelper log, DotNetFirstTimeFixture fixture) : base(log) { - _log = log; + fixture.Init(log, _testAssetsManager); _fixture = fixture; } [Fact] public void UsingDotnetForTheFirstTimeSucceeds() { - _fixture.Init(_log, _testAssetsManager); _fixture.FirstDotnetVerbUseCommandResult .Should() .Pass(); @@ -107,7 +105,6 @@ public void UsingDotnetForTheFirstTimeSucceeds() [Fact] public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() { - _fixture.Init(_log, _testAssetsManager); string firstTimeNonVerbUseMessage = Cli.Utils.LocalizableStrings.DotNetSdkInfoLabel; _fixture.FirstDotnetNonVerbUseCommandResult.StdOut @@ -118,7 +115,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() [Fact] public void ItShowsTheAppropriateMessageToTheUser() { - _fixture.Init(_log, _testAssetsManager); + var expectedVersion = GetDotnetVersion(); _fixture.FirstDotnetVerbUseCommandResult.StdOut .Should() @@ -133,7 +130,6 @@ public void ItShowsTheAppropriateMessageToTheUser() [Fact] public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder() { - _fixture.Init(_log, _testAssetsManager); _fixture.DotDotnetFolder .Should() .HaveFile($"{GetDotnetVersion()}.dotnetFirstUseSentinel"); @@ -142,7 +138,6 @@ public void ItCreatesAFirstUseSentinelFileUnderTheDotDotNetFolder() [Fact] public void ItCreatesAnAspNetCertificateSentinelFileUnderTheDotDotNetFolder() { - _fixture.Init(_log, _testAssetsManager); _fixture.DotDotnetFolder .Should() .HaveFile($"{GetDotnetVersion()}.aspNetCertificateSentinel"); From d8add0693c3332150f122dc36f03a5296ca6810c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Sep 2024 16:04:49 -0700 Subject: [PATCH 18/36] Revert "Swap the order of the commands in case that's affecting the first run message." This reverts commit 13c140cd71dadf6d31d9a13af82918eb7f246a57. --- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index e45ac4adbcd5..ce6ef6e3141c 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -69,8 +69,8 @@ public void Init(ITestOutputHelper log, TestAssetsManager testAssets) var command = dotnetFirstTime.Setup(log, testAssets, testName: "Dotnet_first_time_experience_tests"); - FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive"); FirstDotnetNonVerbUseCommandResult = command.Execute("--info"); + FirstDotnetVerbUseCommandResult = command.Execute("new", "--debug:ephemeral-hive"); TestDirectory = dotnetFirstTime.TestDirectory; NugetFallbackFolder = dotnetFirstTime.NugetFallbackFolder; From 0eb1a357efb6e43b1cbaf140bcea7b254da63537 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Sep 2024 16:10:02 -0700 Subject: [PATCH 19/36] Skip two of the first run tests that aren't correctly resetting the environment Try to fix an ubuntu test that has the full path rather than just partial --- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 2 +- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 395329c4c90b..be5d06f21d2d 100644 --- a/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/src/Tests/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -136,7 +136,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation() { var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build"); - Assert.Equal("xdg-open", proc.StartInfo.FileName); + Assert.Contains("xdg-open", proc.StartInfo.FileName); Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments); } diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index ce6ef6e3141c..a3a7205b1354 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -112,7 +112,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() .StartWith(firstTimeNonVerbUseMessage); } - [Fact] + [Fact(Skip="https://github.com/dotnet/sdk/issues/43328")]] public void ItShowsTheAppropriateMessageToTheUser() { @@ -160,7 +160,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi homeFolder.Should().NotExist(); } - [Fact] + [Fact(Skip="https://github.com/dotnet/sdk/issues/43328")] public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked() { var dotnetFirstTime = new DotNetFirstTime(); From f12afa0d7defc8f723194b77d1dea9f8d4fa9f1b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Sep 2024 07:06:00 +0000 Subject: [PATCH 20/36] Fix typo --- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index a3a7205b1354..ba9fc2261df2 100644 --- a/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -112,7 +112,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula() .StartWith(firstTimeNonVerbUseMessage); } - [Fact(Skip="https://github.com/dotnet/sdk/issues/43328")]] + [Fact(Skip="https://github.com/dotnet/sdk/issues/43328")] public void ItShowsTheAppropriateMessageToTheUser() { From 18e4ae88656f97cfeee7fc6e5dc3e0f8fdcb3b61 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Sep 2024 13:10:07 -0700 Subject: [PATCH 21/36] Null out the helix access token in the test --- src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs index 225bf7c325a6..04b580cca8de 100644 --- a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs +++ b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs @@ -71,6 +71,7 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_ var cmd = new DotnetCommand(Log) .WithWorkingDirectory(testInstance.Path) + .WithEnvironmentVariable("HelixAccessToken", "") .Execute(command, "-v", "diag"); cmd.Should().Pass(); From 8cd523456c6a456515cd6d7a317a4cccede8db68 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Sep 2024 13:10:21 -0700 Subject: [PATCH 22/36] try the osx13 queues to see if they work better. --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1081d3f2cbe7..b123b2c7e40c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -181,9 +181,9 @@ extends: image: macOS-latest os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.1200.Amd64.Open + helixTargetQueue: OSX.13.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.1200.Amd64 + helixTargetQueue: OSX.13.Amd64 variables: - name: _BuildConfig value: Release From 542fac11e2c8158583d13ce597236967661bf713 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Sep 2024 15:20:58 -0700 Subject: [PATCH 23/36] Add OSX13 to the test infrastructure --- .../AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs | 1 + .../AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs index 17d0f5d2808e..a760db58d5e8 100644 --- a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs +++ b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs @@ -20,6 +20,7 @@ public static string InvokeNativeCodeAndReturnAString() case "'osx.10.15-x64'": case "'osx.11.0-x64'": case "'osx.12-x64'": + case "'osx.13-x64'": return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion()); case "'win10-x64'": case "'win81-x64'": diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs index c54239f5b7a5..c319c2454c7c 100644 --- a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs +++ b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs @@ -20,6 +20,7 @@ public static string InvokeNativeCodeAndReturnAString() case "'osx.10.15-x64'": case "'osx.11.0-x64'": case "'osx.12-x64'": + case "'osx.13-x64'": return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion()); case "'win10-x64'": case "'win81-x64'": From c3eac006c285ff0ce073965cbc5ba46737785bf8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 22:58:19 +0000 Subject: [PATCH 24/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240911.15 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24454.6 -> To Version 6.0.35-servicing.24461.15 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e9d514f4417..3e43c98c60a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 167ba65a7fe6..6d3f13c90261 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -196,76 +196,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 89786c0208cb785eb4826fe2c805f1da79bfc3f3 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 38bea7aea4ef..26602e7013fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.35-servicing.24454.6 + 6.0.35-servicing.24461.15 6.0.35 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 + 6.0.35-servicing.24461.15 + 6.0.35-servicing.24461.15 + 6.0.35-servicing.24461.15 6.0.35 6.0.35 6.0.35 6.0.35 - 6.0.35-servicing.24454.6 + 6.0.35-servicing.24461.15 From 1d51dbf42f4b13598b963527c5ae47894570a0df Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Sep 2024 05:55:06 +0000 Subject: [PATCH 25/36] remove system access token as well --- src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs index 04b580cca8de..4a407c450e07 100644 --- a/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs +++ b/src/Tests/msbuild.Integration.Tests/GivenDotnetInvokesMSBuild.cs @@ -72,6 +72,7 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_ var cmd = new DotnetCommand(Log) .WithWorkingDirectory(testInstance.Path) .WithEnvironmentVariable("HelixAccessToken", "") + .WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "") .Execute(command, "-v", "diag"); cmd.Should().Pass(); From dc8224ef8b3355410a1ec89c92a91ab261dd5a0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 18:23:15 +0000 Subject: [PATCH 26/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240912.3 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24461.15 -> To Version 6.0.35-servicing.24462.3 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e43c98c60a8..374797dd804d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d3f13c90261..559f2eb925ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -196,76 +196,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 89786c0208cb785eb4826fe2c805f1da79bfc3f3 + 1ad4097713d52a22315021099f2a185ae68abbe1 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 26602e7013fa..60fafbcda8e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.35-servicing.24461.15 + 6.0.35-servicing.24462.3 6.0.35 - 6.0.35-servicing.24461.15 - 6.0.35-servicing.24461.15 - 6.0.35-servicing.24461.15 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 6.0.35 6.0.35 6.0.35 6.0.35 - 6.0.35-servicing.24461.15 + 6.0.35-servicing.24462.3 From 95dcc8e94134c18f22bcd4987ac04e8be732c655 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 20:35:35 +0000 Subject: [PATCH 27/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240912.8 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.34 -> To Version 6.0.35 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.34-servicing.24417.2 -> To Version 6.0.35-servicing.24462.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 374797dd804d..279198f8ab13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,12 +23,7 @@ - - - - - - + @@ -61,12 +56,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 559f2eb925ea..b6c897b0af5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,25 +174,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0716b4331761db24b6c5f2f52e8bcd32b6bd065b + 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 60fafbcda8e2..6cfa954846cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.34-servicing.24417.2 + 6.0.35-servicing.24462.2 - 6.0.34-servicing.24419.1 + 6.0.35-servicing.24462.8 From d0f14dbae9ecf493c21afe37183f0db9e4546dd2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Sep 2024 15:48:38 -0700 Subject: [PATCH 28/36] Revert to OSx 12 now that three bad machines are out of rotation --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b123b2c7e40c..1081d3f2cbe7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -181,9 +181,9 @@ extends: image: macOS-latest os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.1200.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.1200.Amd64 variables: - name: _BuildConfig value: Release From daa0f16fe11880381c26b693293719de1f4c4882 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 23:35:44 +0000 Subject: [PATCH 29/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240912.14 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24462.3 -> To Version 6.0.35-servicing.24462.14 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 279198f8ab13..c676be583561 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6c897b0af5a..f1bf6ee927dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -196,76 +196,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6cfa954846cb..e55df9580a6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.14 6.0.35 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 6.0.35 6.0.35 6.0.35 6.0.35 - 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.14 From 1cc7deab369e4b2e6e43e25aa0475f0840a573f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 19:52:43 +0000 Subject: [PATCH 30/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240913.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.35 -> To Version 6.0.35 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.35-servicing.24462.2 -> To Version 6.0.35-servicing.24462.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c676be583561..0a046637cdcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1bf6ee927dd..d83a988d5a33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,23 +176,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe + c9e44425226553e639116ff82698cfd2808f7769 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e55df9580a6d..2b2a96150bb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.35-servicing.24462.2 + 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.8 + 6.0.35-servicing.24463.5 From 0bc82457f6d3899d2bf048bb6dcdd1c30a754e31 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 20:17:00 +0000 Subject: [PATCH 31/36] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20240916.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.133 -> To Version 6.0.135 --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0a046637cdcb..052fa7962594 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,12 +15,7 @@ - - - - - - + @@ -48,12 +43,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d83a988d5a33..d874449f9051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b2a96150bb5..a818f2b7cfac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,11 +111,11 @@ - 6.0.133-servicing.24417.2 - 6.0.133 - 6.0.133 - 6.0.133 - 6.0.133 + 6.0.135-servicing.24466.4 + 6.0.135 + 6.0.135 + 6.0.135 + 6.0.135 From f6397af62b226659d9b7362f3809efff88a865fa Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:53:30 -0700 Subject: [PATCH 32/36] Update branding to 6.0.136 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f587b662a44..33d0d226fcff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.135 + 6.0.136 servicing From b2bf826903a366e95e0b10b2048f12754d63da84 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Oct 2024 14:43:42 -0700 Subject: [PATCH 33/36] add osx14 rid --- src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 83eac4be525e..63c9d0193e2c 100644 --- a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -4,7 +4,7 @@ Exe $(CurrentTargetFramework) - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 + win7-x64;win7-x86;osx.10.12-x64;osx.14-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 $(RestoreAdditionalProjectSources);$(TEST_PACKAGES) false From 57d159469979addbf419f927136f9b4894e38f05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Oct 2024 09:31:37 -0700 Subject: [PATCH 34/36] Switch back to macos 13 --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 23bb5bf18548..8aca98ed2114 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -180,7 +180,7 @@ extends: agentOs: Darwin pool: name: Azure Pipelines - image: macOS-latest + image: macos-13 os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: helixTargetQueue: OSX.1200.Amd64.Open From 53b18964d10fc4173ff6854bcdcc079cc38f2ce0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Oct 2024 09:31:57 -0700 Subject: [PATCH 35/36] Switch back to macos 13 --- .vsts-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 83bcf462bf89..d8829ad2efc3 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -145,7 +145,7 @@ stages: parameters: agentOs: Darwin pool: - vmImage: 'macOS-latest' + vmImage: 'macos-13' ${{ if eq(variables['System.TeamProject'], 'public') }}: helixTargetQueue: OSX.1200.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: From da41cc858b42097d826116bdc25561decc12ff5c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 3 Oct 2024 11:37:11 -0700 Subject: [PATCH 36/36] remove osx14 from the ridlist in the test --- src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 63c9d0193e2c..83eac4be525e 100644 --- a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -4,7 +4,7 @@ Exe $(CurrentTargetFramework) - win7-x64;win7-x86;osx.10.12-x64;osx.14-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 $(RestoreAdditionalProjectSources);$(TEST_PACKAGES) false