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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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/97] 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 a97a2339b63bef1f743c02dfe2320b5be8291303 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 30 Aug 2024 16:11:15 -0700 Subject: [PATCH 21/97] Add Dev Device ID --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 105 ++++++++++++++++++ .../Telemetry/TelemetryCommonProperties.cs | 5 + .../TelemetryCommonPropertiesTests.cs | 16 +++ 3 files changed, 126 insertions(+) create mode 100644 src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs new file mode 100644 index 000000000000..f4bff2b59fee --- /dev/null +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -0,0 +1,105 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Win32; + +namespace Microsoft.DotNet.Cli.Telemetry +{ + internal static class DeviceIdGetter + { + public static string GetDeviceId() + { + string deviceId = GetCachedDeviceId(); + + // Check if the device Id is already cached + if (string.IsNullOrEmpty(deviceId)) + { + // Generate a new guid + deviceId = Guid.NewGuid().ToString("D").ToLowerInvariant(); + + // Cache the new device Id + CacheDeviceId(deviceId); + } + + return deviceId; + } + + private static string GetCachedDeviceId() + { + string deviceId = null; + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // Get device Id from Windows registry + using (var key = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + { + deviceId = key?.GetValue("deviceid") as string; + } + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + // Get device Id from Linux cache file + string cacheFilePath; + string xdgCacheHome = Environment.GetEnvironmentVariable("XDG_CACHE_HOME"); + if (!string.IsNullOrEmpty(xdgCacheHome)) + { + cacheFilePath = Path.Combine(xdgCacheHome, "Microsoft", "DeveloperTools", "deviceid"); + } + else + { + cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".cache", "deviceid"); + } + + if (File.Exists(cacheFilePath)) + { + deviceId = File.ReadAllText(cacheFilePath); + } + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // Get device Id from macOS cache file + string cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library", "Application Support", "Microsoft", "DeveloperTools", "deviceid"); + if (File.Exists(cacheFilePath)) + { + deviceId = File.ReadAllText(cacheFilePath); + } + } + + return deviceId; + } + + private static void CacheDeviceId(string deviceId) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // Cache device Id in Windows registry + using (var key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + { + key.SetValue("deviceid", deviceId); + } + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + // Cache device Id in Linux cache file + string cacheFilePath; + string xdgCacheHome = Environment.GetEnvironmentVariable("XDG_CACHE_HOME"); + if (!string.IsNullOrEmpty(xdgCacheHome)) + { + cacheFilePath = Path.Combine(xdgCacheHome, "Microsoft", "DeveloperTools", "deviceId"); + } + else + { + cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".cache", "deviceid"); + } + + File.WriteAllText(cacheFilePath, deviceId); + } + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // Cache device Id in macOS cache file + string cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library", "Application Support", "Microsoft", "DeveloperTools", "deviceid"); + File.WriteAllText(cacheFilePath, deviceId); + } + } + } +} diff --git a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs index eed36f6149ad..b9081c498869 100644 --- a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs +++ b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs @@ -14,6 +14,7 @@ public TelemetryCommonProperties( Func getCurrentDirectory = null, Func hasher = null, Func getMACAddress = null, + Func getDeviceId = null, IDockerContainerDetector dockerContainerDetector = null, IUserLevelCacheWriter userLevelCacheWriter = null, ICIEnvironmentDetector ciEnvironmentDetector = null) @@ -21,6 +22,7 @@ public TelemetryCommonProperties( _getCurrentDirectory = getCurrentDirectory ?? Directory.GetCurrentDirectory; _hasher = hasher ?? Sha256Hasher.Hash; _getMACAddress = getMACAddress ?? MacAddressGetter.GetMacAddress; + _getDeviceId = getDeviceId ?? DeviceIdGetter.GetDeviceId; _dockerContainerDetector = dockerContainerDetector ?? new DockerContainerDetectorForTelemetry(); _userLevelCacheWriter = userLevelCacheWriter ?? new UserLevelCacheWriter(); _ciEnvironmentDetector = ciEnvironmentDetector ?? new CIEnvironmentDetectorForTelemetry(); @@ -31,6 +33,7 @@ public TelemetryCommonProperties( private Func _getCurrentDirectory; private Func _hasher; private Func _getMACAddress; + private Func _getDeviceId; private IUserLevelCacheWriter _userLevelCacheWriter; private const string OSVersion = "OS Version"; private const string OSPlatform = "OS Platform"; @@ -40,6 +43,7 @@ public TelemetryCommonProperties( private const string ProductVersion = "Product Version"; private const string TelemetryProfile = "Telemetry Profile"; private const string CurrentPathHash = "Current Path Hash"; + private const string DeviceId = "DeviceId"; private const string MachineId = "Machine ID"; private const string MachineIdOld = "Machine ID Old"; private const string DockerContainer = "Docker Container"; @@ -81,6 +85,7 @@ public Dictionary GetTelemetryCommonProperties() CliFolderPathCalculator.DotnetUserProfileFolderPath, $"{MachineIdCacheKey}.v1.dotnetUserLevelCache"), GetMachineId)}, + {DeviceId, _getDeviceId()}, {KernelVersion, GetKernelVersion()}, {InstallationType, ExternalTelemetryProperties.GetInstallationType()}, {ProductType, ExternalTelemetryProperties.GetProductType()}, diff --git a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs index 36a641beb0c7..8e1d97fba4db 100644 --- a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs +++ b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs @@ -33,6 +33,13 @@ public void TelemetryCommonPropertiesShouldReturnHashedMachineId() unitUnderTest.GetTelemetryCommonProperties()["Machine ID"].Should().NotBe("plaintext"); } + [Fact] + public void TelemetryCommonPropertiesShouldReturnDevDeviceId() + { + var unitUnderTest = new TelemetryCommonProperties(getDeviceId: () => "plaintext", userLevelCacheWriter: new NothingCache()); + unitUnderTest.GetTelemetryCommonProperties()["DevDeviceId"].Should().Be("plaintext"); + } + [Fact] public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress() { @@ -42,6 +49,15 @@ public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress( Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid"); } + [Fact] + public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotDevDeviceId() + { + var unitUnderTest = new TelemetryCommonProperties(getDeviceId: () => null, userLevelCacheWriter: new NothingCache()); + var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["DevDeviceId"]; + + Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid"); + } + [Fact] public void TelemetryCommonPropertiesShouldReturnHashedMachineIdOld() { From f34a6b4390792bfbb63b053b08ad9023ac7d8350 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Sep 2024 17:13:58 -0700 Subject: [PATCH 22/97] fix the new deviceid tests Make sure we return an empty string if caching fails but don't error our code refactor the caching code slightly for simplicity --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 25 ++++++++++++++++--- .../Telemetry/TelemetryCommonProperties.cs | 2 +- .../TelemetryCommonPropertiesTests.cs | 6 ++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index f4bff2b59fee..a4afb8b13933 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -18,7 +18,15 @@ public static string GetDeviceId() deviceId = Guid.NewGuid().ToString("D").ToLowerInvariant(); // Cache the new device Id - CacheDeviceId(deviceId); + try + { + CacheDeviceId(deviceId); + } + catch + { + // If caching fails, return empty string to avoid sending a non-stored id + deviceId = "" + } } return deviceId; @@ -92,14 +100,25 @@ private static void CacheDeviceId(string deviceId) cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".cache", "deviceid"); } - File.WriteAllText(cacheFilePath, deviceId); + CreateDirectoryAndWriteToFile(cacheFilePath, deviceId); } else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { // Cache device Id in macOS cache file string cacheFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library", "Application Support", "Microsoft", "DeveloperTools", "deviceid"); - File.WriteAllText(cacheFilePath, deviceId); + + CreateDirectoryAndWriteToFile(cacheFilePath, deviceId); + } + } + + private static void CreateDirectoryAndWriteToFile(string filePath, string content) + { + string directory = Path.GetDirectoryName(filePath); + if (!Directory.Exists(directory)) + { + Directory.CreateDirectory(directory); } + File.WriteAllText(filePath, content); } } } diff --git a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs index b9081c498869..ce167c4c17f7 100644 --- a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs +++ b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs @@ -43,7 +43,7 @@ public TelemetryCommonProperties( private const string ProductVersion = "Product Version"; private const string TelemetryProfile = "Telemetry Profile"; private const string CurrentPathHash = "Current Path Hash"; - private const string DeviceId = "DeviceId"; + private const string DeviceId = "devdeviceid"; private const string MachineId = "Machine ID"; private const string MachineIdOld = "Machine ID Old"; private const string DockerContainer = "Docker Container"; diff --git a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs index 8e1d97fba4db..7b1c9af6565e 100644 --- a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs +++ b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs @@ -37,7 +37,7 @@ public void TelemetryCommonPropertiesShouldReturnHashedMachineId() public void TelemetryCommonPropertiesShouldReturnDevDeviceId() { var unitUnderTest = new TelemetryCommonProperties(getDeviceId: () => "plaintext", userLevelCacheWriter: new NothingCache()); - unitUnderTest.GetTelemetryCommonProperties()["DevDeviceId"].Should().Be("plaintext"); + unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"].Should().Be("plaintext"); } [Fact] @@ -52,8 +52,8 @@ public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress( [Fact] public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotDevDeviceId() { - var unitUnderTest = new TelemetryCommonProperties(getDeviceId: () => null, userLevelCacheWriter: new NothingCache()); - var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["DevDeviceId"]; + var unitUnderTest = new TelemetryCommonProperties(userLevelCacheWriter: new NothingCache()); + var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"]; Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid"); } From 8fd78e95556d7d24281660ddd8fc91b4da82335e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 4 Sep 2024 12:48:25 -0700 Subject: [PATCH 23/97] add trailing ; --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index a4afb8b13933..360e530e3b49 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -25,7 +25,7 @@ public static string GetDeviceId() catch { // If caching fails, return empty string to avoid sending a non-stored id - deviceId = "" + deviceId = ""; } } From 18e4ae88656f97cfeee7fc6e5dc3e0f8fdcb3b61 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 11 Sep 2024 13:10:07 -0700 Subject: [PATCH 24/97] 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 25/97] 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 26/97] 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 27/97] 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 28/97] 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 29/97] 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 30/97] 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 31/97] 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 32/97] 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 33/97] 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 34/97] 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 56406cc59f8254beb5af50fb2f8d58f33b5ab71c Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 24 Sep 2024 23:59:10 +0000 Subject: [PATCH 35/97] Merged PR 43128: [internal/release/8.0.4xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.10 to 8.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604 - **Build**: 20240924.4 - **Date Produced**: September 24, 2024 10:50:51 PM UTC - **Commit**: 81cabf2857a01351e5ab578947c7403a5b128ad1 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][3] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][3] - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][3] - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][3] - **System.Reflection.MetadataLoadContext**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Pkcs**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Xml**: [from 8.0.2 to 8.0.2][3] - **System.ServiceProcess.ServiceController**: [from 8.0.1 to 8.0.1][3] - **System.Text.Json**: [from 8.0.5 to 8.0.5][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.10 to 8.0.9][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdcf4a22cf8671c1abe880ebec4cfd906c99588bf&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [4]: https://git... --- NuGet.config | 20 ++++++++++++++++++-- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index bad9c1458bbf..b60f45605c05 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,12 +5,18 @@ + + + + + + @@ -23,7 +29,7 @@ - + @@ -32,9 +38,13 @@ + + + + @@ -66,8 +76,12 @@ + + + + @@ -77,7 +91,7 @@ - + @@ -85,6 +99,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89a4992fbe1e..a6e3b2b54bcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,12 +18,12 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -35,11 +35,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 diff --git a/eng/Versions.props b/eng/Versions.props index 6fdb6b6bcb7d..5021767bfcf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 8.0.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 8.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 8.0.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 From f6397af62b226659d9b7362f3809efff88a865fa Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:53:30 -0700 Subject: [PATCH 36/97] 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 37/97] 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 38/97] 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 39/97] 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 40/97] 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 From aab610fb7b7e7051e9641a8e3a3fdd2e04736526 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 18 Sep 2024 11:39:49 -0700 Subject: [PATCH 41/97] Correctly handle different architectures for devdeviceID (#43471) --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 16 +++++++++++----- .../TelemetryCommonPropertiesTests.cs | 6 +++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index 360e530e3b49..2bb88a290745 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -38,8 +38,8 @@ private static string GetCachedDeviceId() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // Get device Id from Windows registry - using (var key = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + // Get device Id from Windows registry matching the OS architecture + using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) { deviceId = key?.GetValue("deviceid") as string; } @@ -80,10 +80,16 @@ private static void CacheDeviceId(string deviceId) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // Cache device Id in Windows registry - using (var key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + // Cache device Id in Windows registry matching the OS architecture + using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64)) { - key.SetValue("deviceid", deviceId); + using(var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + { + if (key != null) + { + key.SetValue("deviceid", deviceId); + } + } } } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) diff --git a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs index 7b1c9af6565e..0353e76d713c 100644 --- a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs +++ b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs @@ -50,12 +50,16 @@ public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress( } [Fact] - public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotDevDeviceId() + public void TelemetryCommonPropertiesShouldEnsureDevDeviceIDIsCached() { var unitUnderTest = new TelemetryCommonProperties(userLevelCacheWriter: new NothingCache()); var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"]; Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid"); + var secondAssignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"]; + + Guid.TryParse(secondAssignedMachineId, out var _).Should().BeTrue("it should be a guid"); + secondAssignedMachineId.Should().Be(assignedMachineId, "it should match the previously assigned guid"); } [Fact] From 713b2d9c06c3a55077bfd8b4375e81c712133aaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:20:23 +0000 Subject: [PATCH 42/97] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 --- NuGet.config | 59 +++++++++++++++++++++++++++++++++++++++-- eng/Version.Details.xml | 16 +++++------ eng/Versions.props | 4 +-- eng/common/tools.ps1 | 2 +- global.json | 6 ++--- 5 files changed, 71 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 104f7508922d..828125d8b350 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,31 @@ + + + + + + + + + + + + + + + + + + + @@ -22,7 +41,7 @@ - + @@ -34,6 +53,16 @@ + + + + + + + + + + @@ -58,9 +87,25 @@ + + + + + + + + + + + + + + + + @@ -70,7 +115,7 @@ - + @@ -78,6 +123,16 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ed6253e7d60..d5d55f99c9ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index eee0592ab53a..c63abce933d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415..a2dedaa5297a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 57d319093292..955cc21472ea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" } } From d495e12553a1eb7e4693ead7a1fc0e86cb4c20af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 17:57:03 +0000 Subject: [PATCH 43/97] Update dependencies from https://github.com/dotnet/arcade build 20241008.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24459.5 -> To Version 6.0.0-beta.24508.2 --- NuGet.config | 20 ++++++++++++++++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c186e37d4292..d46aa77b1988 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,9 @@ + + + @@ -13,12 +16,19 @@ + + + + + + + @@ -38,15 +48,25 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0fa2b39b88a..3ece2b55b3ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,22 +299,22 @@ - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9527debe2dd4..26ca66fd3a7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ 4.0.0 6.0.0 6.0.4 - 6.0.0-beta.24459.5 + 6.0.0-beta.24508.2 3.1.0 4.3.0 4.3.0 @@ -175,7 +175,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.24459.5 + 6.0.0-beta.24508.2 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 724fc62bb630..f6f5091a996e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24508.2" } } From cbb6e2ecefad0f771c9d014892b0f231341a3a95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 19:07:49 +0000 Subject: [PATCH 44/97] Update dependencies from https://github.com/dotnet/source-build-externals build 20241010.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24379.1 -> To Version 8.0.0-alpha.1.24510.2 --- NuGet.config | 59 +++++++++++++++++++++++++++++++++++++++-- eng/Version.Details.xml | 4 +-- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 104f7508922d..828125d8b350 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,31 @@ + + + + + + + + + + + + + + + + + + + @@ -22,7 +41,7 @@ - + @@ -34,6 +53,16 @@ + + + + + + + + + + @@ -58,9 +87,25 @@ + + + + + + + + + + + + + + + + @@ -70,7 +115,7 @@ - + @@ -78,6 +123,16 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ed6253e7d60..5c364707e6d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - fb970eccb0a9cae3092464e29cbabda0d4115049 + d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 From ae447306d21ea23f62c8265f61c8392c3c8c1a8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 00:52:10 +0000 Subject: [PATCH 45/97] Update dependencies from https://github.com/dotnet/roslyn build 20241010.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.24468.9 -> To Version 4.8.0-7.24510.4 --- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c364707e6d4..0f9e8ffbacbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 27f18656aab37d71839f562c0653afce07a2d2fd - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - def88648f7e78a44bf300acd0a4e2009c44a6b39 + + https://github.com/dotnet/roslyn + 745a021d09e4b3603248421205cb6a27468c76ab https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index eee0592ab53a..0305d7a5da06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,13 +154,13 @@ - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 - 4.8.0-7.24468.9 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 + 4.8.0-7.24510.4 $(MicrosoftNetCompilersToolsetPackageVersion) From 4ddcae04d5857f65e956387a1bdaa8141f2a03b7 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 10 Oct 2024 18:31:50 -0700 Subject: [PATCH 46/97] Update CsWinRT version --- .../GivenThatWeWantToBuildAWindowsRuntimeComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs index 72f300908ea3..b9b2263519ef 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs @@ -100,8 +100,8 @@ public void ManagedWinRTComponentCanBeReferenced() managedWinRTComponent.AdditionalProperties.Add("CsWinRTComponent", "true"); managedWinRTComponent.AdditionalProperties.Add("PlatformTarget", "x64"); - // TODO: Update to latest (currently 1.2.5) once it shows up on dotnet-public feed - managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "1.2.3")); + // TODO: Update to latest (currently 2.1.1) once it shows up on dotnet-public feed + managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "2.1.1")); managedWinRTComponent.SourceFiles["Coords.cs"] = @"using System; From 260add95f8048dcb5fcc4a0a11a3c9e891e10198 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 01:58:55 +0000 Subject: [PATCH 47/97] Update dependencies from https://github.com/dotnet/format build 20241010.1 dotnet-format From Version 6.4.546803 -> To Version 6.4.551001 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ece2b55b3ec..ba9eb54cf845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,9 +83,9 @@ 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - - https://dev.azure.com/dnceng/internal/_git/dotnet-format - 22541a9f44196f25a4b1b431f2dae01f92dc5e62 + + https://github.com/dotnet/format + 889b6b0638fa9529a6a0120e9363c401b9e5846f diff --git a/eng/Versions.props b/eng/Versions.props index 26ca66fd3a7d..3c771b11b318 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -92,7 +92,7 @@ - 6.4.546803 + 6.4.551001 From 9547584d5010caca09b59c6fb28afeb46f8a1003 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 08:49:04 +0000 Subject: [PATCH 48/97] Update dependencies from https://github.com/dotnet/templating build 20241011.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.111-servicing.24502.4 -> To Version 8.0.111-servicing.24511.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 828125d8b350..3898e7bf7c0d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2052144c796..81060feea2ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 3a8381bea7213a9d53e7571901edc35e1ed841a1 + a3647b72bb85c9779771f814c4f00892e2c31647 - + https://github.com/dotnet/templating - 3a8381bea7213a9d53e7571901edc35e1ed841a1 + a3647b72bb85c9779771f814c4f00892e2c31647 - + https://github.com/dotnet/templating - 3a8381bea7213a9d53e7571901edc35e1ed841a1 + a3647b72bb85c9779771f814c4f00892e2c31647 diff --git a/eng/Versions.props b/eng/Versions.props index 8733e87ecd23..48bb32d94b00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.111-servicing.24502.4 + 8.0.111-servicing.24511.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 939ff4e1962e86515b2b374a00871a8d7e0a8cd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 09:56:12 +0000 Subject: [PATCH 49/97] Update dependencies from https://github.com/dotnet/templating build 20241011.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.111-servicing.24511.3 -> To Version 8.0.111-servicing.24511.8 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3898e7bf7c0d..4ddde9536df8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81060feea2ce..c8b7bd042905 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a3647b72bb85c9779771f814c4f00892e2c31647 + 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 - + https://github.com/dotnet/templating - a3647b72bb85c9779771f814c4f00892e2c31647 + 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 - + https://github.com/dotnet/templating - a3647b72bb85c9779771f814c4f00892e2c31647 + 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 diff --git a/eng/Versions.props b/eng/Versions.props index 48bb32d94b00..a10575b7016b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.111-servicing.24511.3 + 8.0.111-servicing.24511.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8c383f3816cc4da50ec0d390bdacdaf15bc03a18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Oct 2024 01:58:38 +0000 Subject: [PATCH 50/97] Update dependencies from https://github.com/dotnet/roslyn build 20241014.16 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.24510.4 -> To Version 4.8.0-7.24514.16 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8b7bd042905..46a3050dd24b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 27f18656aab37d71839f562c0653afce07a2d2fd - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 745a021d09e4b3603248421205cb6a27468c76ab + 4ff64493649bd045ced204661958393dc5575e96 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a10575b7016b..999832d6e568 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,13 +154,13 @@ - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 - 4.8.0-7.24510.4 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 + 4.8.0-7.24514.16 $(MicrosoftNetCompilersToolsetPackageVersion) From 061d34f499c48d62ab125614abb870841edbd1af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 21:35:54 +0000 Subject: [PATCH 51/97] Update dependencies from https://github.com/dotnet/arcade build 20241016.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../steps/get-delegation-sas.yml | 11 ++++++++++- .../templates/steps/get-delegation-sas.yml | 11 ++++++++++- global.json | 4 ++-- 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46a3050dd24b..979b6c734e1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 999832d6e568..74609af31fe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24508.1 + 8.0.0-beta.24516.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24508.1 + 8.0.0-beta.24516.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index 955cc21472ea..81ea487c6165 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1" } } From 643db0267890c0ccf4e1f9a375fb3f433a0d41be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 23:20:10 +0000 Subject: [PATCH 52/97] Update dependencies from https://github.com/dotnet/source-build-externals build 20241016.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24510.2 -> To Version 8.0.0-alpha.1.24516.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46a3050dd24b..308ae976264a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 + 3b85d089311e89b47758ba6a84eeb79374476dc8 From 8110ebeda6eb645811450112661bec0f3f343baa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 03:36:15 +0000 Subject: [PATCH 53/97] Update dependencies from https://github.com/dotnet/templating build 20241016.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.111-servicing.24511.8 -> To Version 8.0.111-servicing.24516.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ddde9536df8..bb6e49cfa0ab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c21ef64d1564..7d79a2243b49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 + b5712b997be1bdfef6bcdf0ff79c3677777894cb - + https://github.com/dotnet/templating - 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 + b5712b997be1bdfef6bcdf0ff79c3677777894cb - + https://github.com/dotnet/templating - 6f9c02189d97deb6940dff1d7d2eaac5a46bf7f9 + b5712b997be1bdfef6bcdf0ff79c3677777894cb diff --git a/eng/Versions.props b/eng/Versions.props index 74609af31fe7..94f7257c53ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.111-servicing.24511.8 + 8.0.111-servicing.24516.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 391030ba389fed9b5113a4ee9c22a079648dfac9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 23:56:51 +0000 Subject: [PATCH 54/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20241017.7 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.10-servicing.24474.4 -> To Version 8.0.11-servicing.24517.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.9 -> To Version 8.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 46 ++++++++++++++++++++++++++++++++++++++--- eng/Version.Details.xml | 40 +++++++++++++++++------------------ eng/Versions.props | 14 ++++++------- 3 files changed, 70 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e6ed8ce1c34..b5a8ae5b5ee5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,29 @@ - - - + + + + + + + + + + + + + @@ -30,6 +40,7 @@ + @@ -42,7 +53,15 @@ + + + + + + + + @@ -76,11 +95,23 @@ + + + + + + + + + + + + @@ -91,6 +122,7 @@ + @@ -99,7 +131,15 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1749d94523b6..a054eed41c1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ b59d68fe7fe0fefa44bda56a7b96e3ece049dfe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + f6237140b33bf18c72dccfeda14be8d103c3b93e https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b898557b7bc4..327b38b27268 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.10 - 8.0.10-servicing.24474.4 - 8.0.10 + 8.0.11 + 8.0.11-servicing.24517.7 + 8.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.10 - 8.0.10-servicing.24474.4 + 8.0.11 + 8.0.11-servicing.24517.7 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.2 8.0.1 - 8.0.10 + 8.0.11 8.0.0 8.0.0 8.0.10 @@ -229,7 +229,7 @@ - 8.0.9 + 8.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From cd750d7b4b8e878839aa97b5034462bcd6a50f0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 09:53:18 +0000 Subject: [PATCH 55/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241018.1 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.10-servicing.24468.4 -> To Version 8.0.11-servicing.24518.1 --- NuGet.config | 20 ++---------- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5a8ae5b5ee5..efe8ae699084 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,15 +19,7 @@ - - - - - - - - - + @@ -94,15 +86,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a054eed41c1a..7e6fad45b4e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn cfe3bd0a653ebd218fec07ff4cce9a994715a473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf e84ed744bb7989299c544f715056d05e220c7e00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + fc878b7641ff2e87598c6425f1a736184deb6619 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 327b38b27268..512d80c32590 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.11 8.0.0 8.0.0 - 8.0.10 + 8.0.11 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.10 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10 + 8.0.11 + 8.0.11-servicing.24518.1 + 8.0.11-servicing.24518.1 + 8.0.11-servicing.24518.1 + 8.0.11-servicing.24518.1 + 8.0.11-servicing.24518.1 + 8.0.11 From 68f165d29ee02d3b2b32d73857b8fdaf5ffe5c73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 18:29:35 +0000 Subject: [PATCH 56/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20241018.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.10 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.10-servicing.24468.10 -> To Version 8.0.11-servicing.24518.4 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 24 ++---------------------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index efe8ae699084..5603d360073b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -44,17 +44,7 @@ - - - - - - - - - - - + @@ -114,17 +104,7 @@ - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e6fad45b4e9..bd2ef17bc266 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,25 +228,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e84ed744bb7989299c544f715056d05e220c7e00 + 2398667ad95d477c56d7530b619a0bb4d18e3c64 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 512d80c32590..f08a8a1a64f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.10-servicing.24468.10 + 8.0.11-servicing.24518.4 From d2c5dbb924f48c2d0477ecf729da49c39ebe2428 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 20:44:00 +0000 Subject: [PATCH 57/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241018.14 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24518.1 -> To Version 8.0.11-servicing.24518.14 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5603d360073b..5c414c38edc2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd2ef17bc266..ba9627db8981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn cfe3bd0a653ebd218fec07ff4cce9a994715a473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fc878b7641ff2e87598c6425f1a736184deb6619 + cb771e5630e58486d0ce4dad73bd449e0cb00c67 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f08a8a1a64f1..4b24e9734d04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.11 - 8.0.11-servicing.24518.1 - 8.0.11-servicing.24518.1 - 8.0.11-servicing.24518.1 - 8.0.11-servicing.24518.1 - 8.0.11-servicing.24518.1 + 8.0.11-servicing.24518.14 + 8.0.11-servicing.24518.14 + 8.0.11-servicing.24518.14 + 8.0.11-servicing.24518.14 + 8.0.11-servicing.24518.14 8.0.11 From ab2a66083158ff24ac1d3430cf017c2d7355b8cd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 18:12:18 +0000 Subject: [PATCH 58/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.4 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24518.14 -> To Version 8.0.11-servicing.24521.4 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c414c38edc2..795d4026b82e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9627db8981..f3e8ac6b25da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn cfe3bd0a653ebd218fec07ff4cce9a994715a473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb771e5630e58486d0ce4dad73bd449e0cb00c67 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4b24e9734d04..c48a01541339 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.11 - 8.0.11-servicing.24518.14 - 8.0.11-servicing.24518.14 - 8.0.11-servicing.24518.14 - 8.0.11-servicing.24518.14 - 8.0.11-servicing.24518.14 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 8.0.11 From c1cdd6cb4aff5a1aee18d273753b85273d17c663 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 01:39:36 +0000 Subject: [PATCH 59/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.16 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.11-servicing.24521.4 -> To Version 8.0.11-servicing.24521.16 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 795d4026b82e..a90aa30c86e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3e8ac6b25da..83669e9b2727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn cfe3bd0a653ebd218fec07ff4cce9a994715a473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://github.com/nuget/nuget.client @@ -250,48 +250,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c48a01541339..ff706104a023 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,11 +170,11 @@ 8.0.11 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 8.0.11 From 8ddc0835e6d55e28c258dee035cd97e2d9ba61d7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 02:06:55 +0000 Subject: [PATCH 60/97] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20241021.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.11 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.11-servicing.24518.4 -> To Version 8.0.11-servicing.24521.7 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a90aa30c86e2..b2010816e06c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -44,7 +44,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83669e9b2727..8dffb9a43a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2398667ad95d477c56d7530b619a0bb4d18e3c64 + 42a83a56d421ac71312453e53dbacc3d2ae6d432 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ff706104a023..f01445c70592 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.11-servicing.24518.4 + 8.0.11-servicing.24521.7 From 20fd99a9b902c52e76931d152cf5e23c096ebcf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Oct 2024 12:41:57 +0000 Subject: [PATCH 61/97] Update dependencies from https://github.com/dotnet/arcade build 20241025.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.24525.2 --- NuGet.config | 64 ++--------------------------------------- eng/Version.Details.xml | 16 +++++------ eng/Versions.props | 4 +-- global.json | 4 +-- 4 files changed, 14 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb6e49cfa0ab..c179a498cba1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,15 +20,6 @@ - - - - - - - - - @@ -36,33 +27,13 @@ - - - - - - - - - - - + + - - - - - - - - - - - @@ -87,15 +58,6 @@ - - - - - - - - - @@ -110,30 +72,8 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d79a2243b49..fcfaf234a0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94f7257c53ab..e45571ae98ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24516.1 + 8.0.0-beta.24525.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24516.1 + 8.0.0-beta.24525.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 81ea487c6165..74fa3ebe3bbb 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24525.2" } } From 17d3b31f0e792324af4a763c974ae2993c81fd30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Oct 2024 11:46:17 +0000 Subject: [PATCH 62/97] Update dependencies from https://github.com/dotnet/roslyn build 20241027.6 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.24514.16 -> To Version 4.8.0-7.24527.6 --- NuGet.config | 64 ++--------------------------------------- eng/Version.Details.xml | 14 ++++----- eng/Versions.props | 14 ++++----- 3 files changed, 16 insertions(+), 76 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb6e49cfa0ab..c179a498cba1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,15 +20,6 @@ - - - - - - - - - @@ -36,33 +27,13 @@ - - - - - - - - - - - + + - - - - - - - - - - - @@ -87,15 +58,6 @@ - - - - - - - - - @@ -110,30 +72,8 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d79a2243b49..1e83c2c8297c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,32 +82,32 @@ 27f18656aab37d71839f562c0653afce07a2d2fd - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 diff --git a/eng/Versions.props b/eng/Versions.props index 94f7257c53ab..039145e64c66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,13 +154,13 @@ - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 - 4.8.0-7.24514.16 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 + 4.8.0-7.24527.6 $(MicrosoftNetCompilersToolsetPackageVersion) From 2cf531795b1eb0a1a2167fafe78146f1fd13f4ea Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 28 Oct 2024 09:39:56 -0700 Subject: [PATCH 63/97] [FIX] tool-install: Use config options --- src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs | 4 +++- src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs | 9 +++++++-- .../install/ToolInstallGlobalOrToolPathCommand.cs | 9 ++++++--- .../dotnet-tool/install/ToolInstallLocalCommand.cs | 9 ++++++++- .../dotnet-tool/install/ToolInstallLocalInstaller.cs | 10 +++++++--- .../ToolPackageDownloaderMock.cs | 4 +++- 6 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs b/src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs index 816ead4cdf73..b65ad6522913 100644 --- a/src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs +++ b/src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Threading.Tasks; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.ToolPackage; using NuGet.Versioning; @@ -13,7 +14,8 @@ IToolPackage InstallPackage(PackageLocation packageLocation, PackageId packageId VerbosityOptions verbosity, VersionRange versionRange = null, string targetFramework = null, - bool isGlobalTool = false + bool isGlobalTool = false, + RestoreActionConfig restoreActionConfig = null ); } } diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs index be97e3937ab0..1a924551bfe6 100644 --- a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs +++ b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs @@ -72,7 +72,8 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa VerbosityOptions verbosity = VerbosityOptions.normal, VersionRange versionRange = null, string targetFramework = null, - bool isGlobalTool = false + bool isGlobalTool = false, + RestoreActionConfig restoreActionConfig = null ) { var packageRootDirectory = _toolPackageStore.GetRootPackageDirectory(packageId); @@ -95,7 +96,11 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa var toolDownloadDir = isGlobalTool ? _globalToolStageDir : _localToolDownloadDir; var assetFileDirectory = isGlobalTool ? _globalToolStageDir : _localToolAssetDir; - var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(toolDownloadDir, verboseLogger: nugetLogger, isNuGetTool: true); + var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader( + toolDownloadDir, + verboseLogger: nugetLogger, + isNuGetTool: true, + restoreActionConfig: restoreActionConfig); var packageSourceLocation = new PackageSourceLocation(packageLocation.NugetConfig, packageLocation.RootConfigDirectory, null, packageLocation.AdditionalFeeds); diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index a9cbfe8d1a63..cf48d48c1607 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -44,6 +44,8 @@ internal class ToolInstallGlobalOrToolPathCommand : CommandBase private readonly string _architectureOption; private IEnumerable _forwardRestoreArguments; + internal readonly RestoreActionConfig _restoreActionConfig; + public ToolInstallGlobalOrToolPathCommand( ParseResult parseResult, CreateToolPackageStoresAndDownloader createToolPackageStoreAndDownloader = null, @@ -74,11 +76,11 @@ public ToolInstallGlobalOrToolPathCommand( var configOption = parseResult.GetValue(ToolInstallCommandParser.ConfigOption); var sourceOption = parseResult.GetValue(ToolInstallCommandParser.AddSourceOption); var packageSourceLocation = new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), additionalSourceFeeds: sourceOption); - var restoreAction = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), + _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); - nugetPackageDownloader ??= new NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: restoreAction); + nugetPackageDownloader ??= new NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: _restoreActionConfig); _shellShimTemplateFinder = new ShellShimTemplateFinder(nugetPackageDownloader, tempDir, packageSourceLocation); _reporter = (reporter ?? Reporter.Output); @@ -132,7 +134,8 @@ public override int Execute() versionRange: versionRange, targetFramework: _framework, verbosity: _verbosity, - isGlobalTool: true + isGlobalTool: true, + restoreActionConfig: _restoreActionConfig ); NuGetFramework framework; diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs index 9f9980ba9371..1cf4c5e01442 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs @@ -3,6 +3,7 @@ using System.CommandLine; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolManifest; @@ -23,6 +24,8 @@ internal class ToolInstallLocalCommand : CommandBase private readonly string _explicitManifestFile; private readonly bool _createManifestIfNeeded; + internal readonly RestoreActionConfig _restoreActionConfig; + public ToolInstallLocalCommand( ParseResult parseResult, IToolPackageDownloader toolPackageDownloader = null, @@ -43,7 +46,11 @@ public ToolInstallLocalCommand( new ToolManifestFinder(new DirectoryPath(Directory.GetCurrentDirectory())); _toolManifestEditor = toolManifestEditor ?? new ToolManifestEditor(); _localToolsResolverCache = localToolsResolverCache ?? new LocalToolsResolverCache(); - _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader); + _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), + NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), + IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), + Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); + _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader, _restoreActionConfig); } public override int Execute() diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs index 4c370c34523f..1b778332aa69 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalInstaller.cs @@ -4,6 +4,7 @@ using System.CommandLine; using System.IO; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; @@ -24,10 +25,12 @@ internal class ToolInstallLocalInstaller private readonly string _configFilePath; private readonly string[] _sources; private readonly VerbosityOptions _verbosity; + private readonly RestoreActionConfig _restoreActionConfig; public ToolInstallLocalInstaller( ParseResult parseResult, - IToolPackageDownloader toolPackageDownloader = null) + IToolPackageDownloader toolPackageDownloader = null, + RestoreActionConfig restoreActionConfig = null) { _parseResult = parseResult; _packageId = new PackageId(parseResult.GetValue(ToolInstallCommandParser.PackageIdArgument)); @@ -43,7 +46,7 @@ public ToolInstallLocalInstaller( additionalRestoreArguments: parseResult.OptionValuesToBeForwarded(ToolInstallCommandParser.GetCommand())); _toolPackageStore = toolPackageStoresAndDownloader.store; _toolPackageDownloader = toolPackageDownloader?? toolPackageStoresAndDownloader.downloader; - + _restoreActionConfig = restoreActionConfig; TargetFrameworkToInstall = BundledTargetFramework.GetTargetFrameworkMoniker(); } @@ -76,7 +79,8 @@ public IToolPackage Install(FilePath manifestFile) _packageId, verbosity: _verbosity, versionRange, - TargetFrameworkToInstall + TargetFrameworkToInstall, + restoreActionConfig: _restoreActionConfig ); return toolDownloadedPackage; diff --git a/src/Tests/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageDownloaderMock.cs b/src/Tests/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageDownloaderMock.cs index 8ce41aef115d..73c95c137e38 100644 --- a/src/Tests/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageDownloaderMock.cs +++ b/src/Tests/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageDownloaderMock.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text.Json; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; @@ -96,7 +97,8 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa VerbosityOptions verbosity, VersionRange versionRange = null, string targetFramework = null, - bool isGlobalTool = false + bool isGlobalTool = false, + RestoreActionConfig restoreActionConfig = null ) { string rollbackDirectory = null; From f85f6641f195d7c966895696f5f9d0866c913973 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 28 Oct 2024 09:48:52 -0700 Subject: [PATCH 64/97] [FIX] tool-update: Use config options --- .../update/ToolUpdateGlobalOrToolPathCommand.cs | 11 ++++++++++- .../dotnet-tool/update/ToolUpdateLocalCommand.cs | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index 86a737cb6693..f2b90365ceac 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.Versioning; using Microsoft.DotNet.Cli.ToolPackage; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; namespace Microsoft.DotNet.Tools.Tool.Update { @@ -38,6 +39,8 @@ internal class ToolUpdateGlobalOrToolPathCommand : CommandBase private readonly IEnumerable _forwardRestoreArguments; private readonly string _packageVersion; + internal readonly RestoreActionConfig _restoreActionConfig; + public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, CreateToolPackageStoresAndDownloaderAndUninstaller createToolPackageStoreDownloaderUninstaller = null, CreateShellShimRepository createShellShimRepository = null, @@ -60,6 +63,11 @@ public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; + _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), + NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), + IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), + Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); + _reporter = (reporter ?? Reporter.Output); _errorReporter = (reporter ?? Reporter.Error); } @@ -111,7 +119,8 @@ public override int Execute() versionRange: versionRange, targetFramework: _framework, verbosity: _verbosity, - isGlobalTool: true + isGlobalTool: true, + restoreActionConfig: _restoreActionConfig ); EnsureVersionIsHigher(oldPackageNullable, newInstalledPackage); diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs index 8118adee5229..cf48d4ab6092 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs @@ -3,6 +3,7 @@ using System.CommandLine; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolManifest; @@ -26,6 +27,8 @@ internal class ToolUpdateLocalCommand : CommandBase private readonly PackageId _packageId; private readonly string _explicitManifestFile; + internal readonly RestoreActionConfig _restoreActionConfig; + public ToolUpdateLocalCommand( ParseResult parseResult, IToolPackageDownloader toolPackageDownloader = null, @@ -59,7 +62,12 @@ public ToolUpdateLocalCommand( _toolManifestEditor = toolManifestEditor ?? new ToolManifestEditor(); _localToolsResolverCache = localToolsResolverCache ?? new LocalToolsResolverCache(); - _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader); + _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), + NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), + IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), + Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); + + _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader, _restoreActionConfig); _toolInstallLocalCommand = new Lazy( () => new ToolInstallLocalCommand( parseResult, From df1c65000a14a05c258c81f87f7eabea5ceff734 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 28 Oct 2024 10:14:54 -0700 Subject: [PATCH 65/97] [TESTS] tool-install/tool-update: Respect RestoreActionConfig options --- ...ToolInstallGlobalOrToolPathCommandTests.cs | 34 +++++++++++++++++ .../ToolInstallLocalCommandTests.cs | 36 ++++++++++++++++++ .../ToolUpdateGlobalOrToolPathCommandTests.cs | 38 +++++++++++++++++-- .../ToolUpdateLocalCommandTests.cs | 37 ++++++++++++++++++ 4 files changed, 142 insertions(+), 3 deletions(-) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index e0c4e247d4fb..99a70b75dd1f 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -63,6 +63,30 @@ public ToolInstallGlobalOrToolPathCommandTests(ITestOutputHelper log): base(log) _parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId}"); } + [Fact] + public void WhenPassingRestoreActionConfigOptions() + { + var parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --ignore-failed-sources"); + var toolInstallCommand = new ToolInstallGlobalOrToolPathCommand(parseResult); + toolInstallCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + } + + [Fact] + public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() + { + _fileSystem.File.WriteAllText(Path.Combine(_temporaryDirectory, "nuget.config"), _nugetConfigWithInvalidSources); + + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + _parseResult, + _createToolPackageStoresAndDownloader, + _createShellShimRepository, + _environmentPathInstructionMock, + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + _fileSystem.File.Delete(Path.Combine(_temporaryDirectory, "nuget.config")); + } + [Fact] public void WhenRunWithPackageIdItShouldCreateValidShim() { @@ -630,6 +654,16 @@ public void SetPermission(string path, string chmodArgument) { } } + + private string _nugetConfigWithInvalidSources = @"{ + + + + + + + +}"; } } diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs index 898223f16c62..55f8fd56df83 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs @@ -96,6 +96,32 @@ public ToolInstallLocalCommandTests(ITestOutputHelper log):base(log) 1); } + [Fact] + public void WhenPassingRestoreActionConfigOptions() + { + var parseResult = Parser.Instance.Parse($"dotnet tool install {_packageIdA.ToString()} --ignore-failed-sources"); + var command = new ToolInstallLocalCommand(parseResult); + command._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + } + + [Fact] + public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() + { + _fileSystem.File.WriteAllText(Path.Combine(_temporaryDirectory, "nuget.config"), _nugetConfigWithInvalidSources); + var parseResult = Parser.Instance.Parse($"dotnet tool install {_packageIdA.ToString()} --ignore-failed-sources"); + var installLocalCommand = new ToolInstallLocalCommand( + parseResult, + _toolPackageDownloaderMock, + _toolManifestFinder, + _toolManifestEditor, + _localToolsResolverCache, + _reporter); + + installLocalCommand.Execute().Should().Be(0); + + _fileSystem.File.Delete(Path.Combine(_temporaryDirectory, "nuget.config")); + } + [Fact] public void WhenRunWithPackageIdItShouldSaveToCacheAndAddToManifestFile() { @@ -440,6 +466,16 @@ out RestoredCommand restoredCommand ""isRoot"":true, ""tools"":{ } +}"; + + private string _nugetConfigWithInvalidSources = @"{ + + + + + + + }"; } } diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index b5eb57b1ea78..366eaee12edd 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -12,6 +12,8 @@ using Microsoft.DotNet.ShellShim; using System.CommandLine; using Parser = Microsoft.DotNet.Cli.Parser; +using Microsoft.DotNet.InternalAbstractions; +using Microsoft.DotNet.Tools.Tool.Uninstall; namespace Microsoft.DotNet.Tests.Commands.Tool { @@ -28,14 +30,15 @@ public class ToolUpdateGlobalOrToolPathCommandTests private const string HigherPreviewPackageVersion = "1.0.5-preview3"; private readonly string _shimsDirectory; private readonly string _toolsDirectory; + private readonly string _tempDirectory; public ToolUpdateGlobalOrToolPathCommandTests() { _reporter = new BufferedReporter(); _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); - var tempDirectory = _fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath; - _shimsDirectory = Path.Combine(tempDirectory, "shims"); - _toolsDirectory = Path.Combine(tempDirectory, "tools"); + _tempDirectory = _fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath; + _shimsDirectory = Path.Combine(_tempDirectory, "shims"); + _toolsDirectory = Path.Combine(_tempDirectory, "tools"); _environmentPathInstructionMock = new EnvironmentPathInstructionMock(_reporter, _shimsDirectory); _store = new ToolPackageStoreMock(new DirectoryPath(_toolsDirectory), _fileSystem); _mockFeeds = new List @@ -68,6 +71,25 @@ public ToolUpdateGlobalOrToolPathCommandTests() }; } + [Fact] + public void WhenPassingRestoreActionConfigOptions() + { + var parseResult = Parser.Instance.Parse($"dotnet tool update -g {_packageId} --ignore-failed-sources"); + var toolUpdateCommand = new ToolUpdateGlobalOrToolPathCommand(parseResult); + toolUpdateCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + } + + [Fact] + public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() + { + _fileSystem.File.WriteAllText(Path.Combine(_tempDirectory, "nuget.config"), _nugetConfigWithInvalidSources); + + var command = CreateUpdateCommand($"-g {_packageId} --ignore-failed-sources"); + + command.Execute().Should().Be(0); + _fileSystem.File.Delete(Path.Combine(_tempDirectory, "nuget.config")); + } + [Fact] public void GivenANonFeedExistentPackageItErrors() { @@ -373,6 +395,16 @@ private ShellShimRepository GetMockedShellShimRepository() appHostShellShimMaker: new AppHostShellShimMakerMock(_fileSystem), filePermissionSetter: new ToolInstallGlobalOrToolPathCommandTests.NoOpFilePermissionSetter()); } + + private string _nugetConfigWithInvalidSources = @"{ + + + + + + + +}"; } } diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs index 78c4958e1c18..760f50b58051 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs @@ -7,6 +7,7 @@ using Microsoft.DotNet.ToolManifest; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools.Tests.ComponentMocks; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.DotNet.Tools.Tool.Restore; using Microsoft.DotNet.Tools.Tool.Update; using Microsoft.Extensions.DependencyModel.Tests; @@ -112,6 +113,32 @@ public ToolUpdateLocalCommandTests() _reporter); } + [Fact] + public void WhenPassingRestoreActionConfigOptions() + { + var parseResult = Parser.Instance.Parse($"dotnet tool update {_packageIdA.ToString()} --ignore-failed-sources"); + var command = new ToolUpdateLocalCommand(parseResult); + command._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + } + + [Fact] + public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() + { + _fileSystem.File.WriteAllText(Path.Combine(_temporaryDirectory, "nuget.config"), _nugetConfigWithInvalidSources); + var parseResult = Parser.Instance.Parse($"dotnet tool update {_packageIdA.ToString()} --ignore-failed-sources"); + var updateLocalCommand = new ToolUpdateLocalCommand( + parseResult, + _toolPackageDownloaderMock, + _toolManifestFinder, + _toolManifestEditor, + _localToolsResolverCache, + _reporter); + + updateLocalCommand.Execute().Should().Be(0); + + _fileSystem.File.Delete(Path.Combine(_temporaryDirectory, "nuget.config")); + } + [Fact] public void WhenRunWithPackageIdItShouldUpdateFromManifestFile() { @@ -349,6 +376,16 @@ out RestoredCommand restoredCommand ""version"": 1, ""isRoot"": false, ""tools"": {} +}"; + + private string _nugetConfigWithInvalidSources = @"{ + + + + + + + }"; } } From 72cc0710b6d4d89ad7b41cbc651f872c086e19ca Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:44:35 -0800 Subject: [PATCH 66/97] Update branding to 8.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 94f7257c53ab..e5c6e53bf1f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.111 + 8.0.112 true release From 31d8a32d212b7ac9cb48aa0fe2e85c44df98ac5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 00:34:22 +0000 Subject: [PATCH 67/97] Update dependencies from https://github.com/dotnet/templating build 20241105.9 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.111-servicing.24516.5 -> To Version 8.0.112-servicing.24555.9 --- NuGet.config | 4 +--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c179a498cba1..2e907536025e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,9 +29,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c3559b85d7a..26276083577d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - b5712b997be1bdfef6bcdf0ff79c3677777894cb + 0900b585f72d5ee81844d776a421819dca6e3d05 - + https://github.com/dotnet/templating - b5712b997be1bdfef6bcdf0ff79c3677777894cb + 0900b585f72d5ee81844d776a421819dca6e3d05 - + https://github.com/dotnet/templating - b5712b997be1bdfef6bcdf0ff79c3677777894cb + 0900b585f72d5ee81844d776a421819dca6e3d05 diff --git a/eng/Versions.props b/eng/Versions.props index eabe65835a15..e6def8cae722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 8.0.111 + 8.0.112 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.111-servicing.24516.5 + 8.0.112-servicing.24555.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7de92f578c180f2b4fb91491388bbf9f10653a5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 13:43:09 +0000 Subject: [PATCH 68/97] Update dependencies from https://github.com/dotnet/templating build 20241106.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.307-servicing.24517.1 -> To Version 8.0.308-servicing.24556.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index f454d764d056..1dc8a57b4d1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 392a9e2a9d22..d5cc3655094e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - ded032dc3046c039313fcd61e47bb37af78013b7 + 50b07cbd3a4e656f7a9099872efbbe292db5e05a - + https://github.com/dotnet/templating - ded032dc3046c039313fcd61e47bb37af78013b7 + 50b07cbd3a4e656f7a9099872efbbe292db5e05a - + https://github.com/dotnet/templating - ded032dc3046c039313fcd61e47bb37af78013b7 + 50b07cbd3a4e656f7a9099872efbbe292db5e05a diff --git a/eng/Versions.props b/eng/Versions.props index 87b060382129..442f3b3cd1c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.307 + 8.0.308 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.307-servicing.24517.1 + 8.0.308-servicing.24556.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 5d23bb68dab86cc25b34dc0e064c27e823560913 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Fri, 8 Nov 2024 15:50:21 -0800 Subject: [PATCH 69/97] Fix merge conflicts/discrepancies --- .../commands/dotnet-tool/update/ToolUpdateLocalCommand.cs | 6 ------ .../CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs index cfede862b813..304358b4742c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs @@ -55,12 +55,6 @@ public ToolUpdateLocalCommand( _toolManifestEditor = toolManifestEditor ?? new ToolManifestEditor(); _localToolsResolverCache = localToolsResolverCache ?? new LocalToolsResolverCache(); - _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), - NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), - IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), - Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); - - _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader, _restoreActionConfig); _toolInstallLocalCommand = new Lazy( () => new ToolInstallLocalCommand( parseResult, diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index b72565d5a9e5..0baba19cbfb7 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -86,10 +86,10 @@ public void WhenPassingRestoreActionConfigOptions() public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() { _fileSystem.File.WriteAllText(Path.Combine(_temporaryDirectory, "nuget.config"), _nugetConfigWithInvalidSources); - + var parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --ignore-failed-sources"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( - _parseResult, - _createToolPackageStoresAndDownloader, + parseResult, + _createToolPackageStoreDownloaderUninstaller, _createShellShimRepository, _environmentPathInstructionMock, _reporter); From fc48812c7aa1b63a88dc428f5f26fd22218c1004 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 00:54:47 -0600 Subject: [PATCH 70/97] Fix tests --- .../commands/dotnet-tool/update/ToolUpdateLocalCommand.cs | 2 -- .../CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs | 2 +- .../dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs index 304358b4742c..514aef595df6 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs @@ -23,8 +23,6 @@ internal class ToolUpdateLocalCommand : CommandBase private readonly Lazy _toolInstallLocalCommand; private readonly IReporter _reporter; - internal readonly RestoreActionConfig _restoreActionConfig; - public ToolUpdateLocalCommand( ParseResult parseResult, IToolPackageDownloader toolPackageDownloader = null, diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index 097e57795fce..bd2f3d563276 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -76,7 +76,7 @@ public void WhenPassingRestoreActionConfigOptions() { var parseResult = Parser.Instance.Parse($"dotnet tool update -g {_packageId} --ignore-failed-sources"); var toolUpdateCommand = new ToolUpdateGlobalOrToolPathCommand(parseResult); - toolUpdateCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + toolUpdateCommand._toolInstallGlobalOrToolPathCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); } [Fact] diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs index ef39220b2337..2c3a67863960 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs @@ -118,7 +118,7 @@ public void WhenPassingRestoreActionConfigOptions() { var parseResult = Parser.Instance.Parse($"dotnet tool update {_packageIdA.ToString()} --ignore-failed-sources"); var command = new ToolUpdateLocalCommand(parseResult); - command._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + command._toolInstallLocalCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); } [Fact] From a88089b3e2d47f9ed2d293eef84018bbd4f529b4 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 01:10:52 -0600 Subject: [PATCH 71/97] Fix tests --- .../dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs | 4 +--- .../commands/dotnet-tool/update/ToolUpdateLocalCommand.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index d0a9eecf3e67..024dba69a848 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -23,9 +23,7 @@ internal class ToolUpdateGlobalOrToolPathCommand : CommandBase { private readonly CreateShellShimRepository _createShellShimRepository; private readonly CreateToolPackageStoresAndDownloaderAndUninstaller _createToolPackageStoreDownloaderUninstaller; - private readonly ToolInstallGlobalOrToolPathCommand _toolInstallGlobalOrToolPathCommand; - - internal readonly RestoreActionConfig _restoreActionConfig; + internal readonly ToolInstallGlobalOrToolPathCommand _toolInstallGlobalOrToolPathCommand; public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, CreateToolPackageStoresAndDownloaderAndUninstaller createToolPackageStoreDownloaderUninstaller = null, diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs index 514aef595df6..6e8d5c5e284b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs @@ -20,7 +20,7 @@ internal class ToolUpdateLocalCommand : CommandBase private readonly IToolManifestEditor _toolManifestEditor; private readonly ILocalToolsResolverCache _localToolsResolverCache; private readonly IToolPackageDownloader _toolPackageDownloader; - private readonly Lazy _toolInstallLocalCommand; + internal readonly Lazy _toolInstallLocalCommand; private readonly IReporter _reporter; public ToolUpdateLocalCommand( From 0dde90b2111cb5279e8f86e871976de48d358039 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 01:12:17 -0600 Subject: [PATCH 72/97] Fix tests --- .../dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index 024dba69a848..6f8891aab1d0 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -36,14 +36,8 @@ public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; - - _restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption), - NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption), - IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption), - Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption)); _toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( - parseResult, _createToolPackageStoreDownloaderUninstaller, _createShellShimRepository, From b3ae97e2dd2d73ffd4d67ab65fba1ca5ccd534e0 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 01:22:50 -0600 Subject: [PATCH 73/97] Fix tests --- .../CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs | 2 +- .../dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index bd2f3d563276..e0e24935e924 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -76,7 +76,7 @@ public void WhenPassingRestoreActionConfigOptions() { var parseResult = Parser.Instance.Parse($"dotnet tool update -g {_packageId} --ignore-failed-sources"); var toolUpdateCommand = new ToolUpdateGlobalOrToolPathCommand(parseResult); - toolUpdateCommand._toolInstallGlobalOrToolPathCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + toolUpdateCommand._toolInstallGlobalOrToolPathCommand.Value._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); } [Fact] diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs index 2c3a67863960..aa4ea6c3db0b 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs @@ -118,7 +118,7 @@ public void WhenPassingRestoreActionConfigOptions() { var parseResult = Parser.Instance.Parse($"dotnet tool update {_packageIdA.ToString()} --ignore-failed-sources"); var command = new ToolUpdateLocalCommand(parseResult); - command._toolInstallLocalCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + command._toolInstallLocalCommand.Value._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); } [Fact] From b0968a1af0d6b831a9866ee59e0598cd9f949263 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 08:59:26 -0800 Subject: [PATCH 74/97] Fix tests --- .../CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index e0e24935e924..bd2f3d563276 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -76,7 +76,7 @@ public void WhenPassingRestoreActionConfigOptions() { var parseResult = Parser.Instance.Parse($"dotnet tool update -g {_packageId} --ignore-failed-sources"); var toolUpdateCommand = new ToolUpdateGlobalOrToolPathCommand(parseResult); - toolUpdateCommand._toolInstallGlobalOrToolPathCommand.Value._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); + toolUpdateCommand._toolInstallGlobalOrToolPathCommand._restoreActionConfig.IgnoreFailedSources.Should().BeTrue(); } [Fact] From 37b15ef5ad8a1da0e3d626877b6996cd98832aa6 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 12 Nov 2024 09:24:09 -0800 Subject: [PATCH 75/97] Fix tests --- .../CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs | 1 + .../dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index e5328364207c..e0f1a549248f 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -91,6 +91,7 @@ public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() var parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --ignore-failed-sources"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( parseResult, + _packageId, _createToolPackageStoreDownloaderUninstaller, _createShellShimRepository, _environmentPathInstructionMock, diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs index 994271e10b47..81df3cf8e45b 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs @@ -105,6 +105,7 @@ public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() var parseResult = Parser.Instance.Parse($"dotnet tool install {_packageIdA.ToString()} --ignore-failed-sources"); var installLocalCommand = new ToolInstallLocalCommand( parseResult, + _packageIdA, _toolPackageDownloaderMock, _toolManifestFinder, _toolManifestEditor, From 0d73049db67b84b7f115aae330517bf45f8239ec Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 15:24:27 -0800 Subject: [PATCH 76/97] Fix the template tests --- .../sample03/Program.cs | 1 - .../sample03.optional-page.verified/sample03/Program.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.EnableContactPage=true.verified/sample03/Program.cs b/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.EnableContactPage=true.verified/sample03/Program.cs index 48647fceff09..e05e2ef40478 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.EnableContactPage=true.verified/sample03/Program.cs +++ b/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.EnableContactPage=true.verified/sample03/Program.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using Microsoft.AspNetCore.Hosting; namespace sample03 diff --git a/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.verified/sample03/Program.cs b/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.verified/sample03/Program.cs index 48647fceff09..e05e2ef40478 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.verified/sample03/Program.cs +++ b/src/Tests/dotnet-new.Tests/Approvals/sample03.optional-page.verified/sample03/Program.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using Microsoft.AspNetCore.Hosting; namespace sample03 From 2210c16a20e7c77540e73cb665498cf26786cc30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 14:31:31 +0000 Subject: [PATCH 77/97] Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 --- NuGet.config | 29 ----------------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 845266f8ea3a..f14cc6603338 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,7 +18,6 @@ - @@ -27,24 +25,11 @@ - - - - - - - - - - - - - @@ -71,7 +56,6 @@ - @@ -85,21 +69,8 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b5646508e8..8832549483c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 12e10269d204..b3ee3fb949fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.24525.2 + 8.0.0-beta.24562.12 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24525.2 + 8.0.0-beta.24562.12 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 74fa3ebe3bbb..265d3b6f8cf6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24525.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24562.12" } } From 51c05ea709e6d2cf57e4d783c74c9f58d93805ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 13:28:36 +0000 Subject: [PATCH 78/97] Update dependencies from https://github.com/dotnet/templating build 20241115.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.405-servicing.24556.2 -> To Version 8.0.405-servicing.24565.4 --- NuGet.config | 31 +------------------------------ eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 845266f8ea3a..78925e61aa05 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,7 +18,6 @@ - @@ -27,24 +25,11 @@ - - - - - - - - - - - - - + - @@ -71,7 +56,6 @@ - @@ -85,21 +69,8 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b5646508e8..b4aebe0959b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 5e0f79406f0f3a907ceff031514624670a0401b3 + 269d0dd65ab3129df509709a807b9f1821996bef - + https://github.com/dotnet/templating - 5e0f79406f0f3a907ceff031514624670a0401b3 + 269d0dd65ab3129df509709a807b9f1821996bef - + https://github.com/dotnet/templating - 5e0f79406f0f3a907ceff031514624670a0401b3 + 269d0dd65ab3129df509709a807b9f1821996bef diff --git a/eng/Versions.props b/eng/Versions.props index 12e10269d204..51200eacbf0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.405-servicing.24556.2 + 8.0.405-servicing.24565.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a8d4e866d3a9a94e5fd031f3125a2bde43223982 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Nov 2024 13:13:38 +0000 Subject: [PATCH 79/97] Update dependencies from https://github.com/dotnet/razor build 20241115.7 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24523.7 -> To Version 9.0.0-preview.24565.7 --- NuGet.config | 29 ----------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 845266f8ea3a..f14cc6603338 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,7 +18,6 @@ - @@ -27,24 +25,11 @@ - - - - - - - - - - - - - @@ -71,7 +56,6 @@ - @@ -85,21 +69,8 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b5646508e8..84b2ddab79a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://github.com/dotnet/razor - aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 + b4ba32397a657a228890b10fd6cd84c9fa7035a8 - + https://github.com/dotnet/razor - aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 + b4ba32397a657a228890b10fd6cd84c9fa7035a8 - + https://github.com/dotnet/razor - aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 + b4ba32397a657a228890b10fd6cd84c9fa7035a8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 12e10269d204..987be364e242 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24523.7 - 9.0.0-preview.24523.7 - 9.0.0-preview.24523.7 + 9.0.0-preview.24565.7 + 9.0.0-preview.24565.7 + 9.0.0-preview.24565.7 From 00a11520eebc20b16e0ec7c66182cae64937a9fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 13:52:51 +0000 Subject: [PATCH 80/97] Update dependencies from https://github.com/dotnet/sourcelink build 20241119.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24568.2 -> To Version 9.0.0-beta.24569.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60bce356d654..bc484de0ea0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -460,34 +460,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink - 234bdefe64fdaee50f0c9343d5eca283bd4342b5 + a190fddd4aeb983b59b682c984692639c8c7d100 diff --git a/eng/Versions.props b/eng/Versions.props index 7296ca23a1ed..d837fb7e2fd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24568.2 - 9.0.0-beta.24568.2 - 9.0.0-beta.24568.2 - 9.0.0-beta.24568.2 - 9.0.0-beta.24568.2 - 9.0.0-beta.24568.2 + 9.0.0-beta.24569.2 + 9.0.0-beta.24569.2 + 9.0.0-beta.24569.2 + 9.0.0-beta.24569.2 + 9.0.0-beta.24569.2 + 9.0.0-beta.24569.2 From 3c2bbc74362d0488535978f9b4380a9af9598a28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 14:28:39 +0000 Subject: [PATCH 81/97] Update dependencies from https://github.com/dotnet/test-templates build 20241120.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24568.1 -> To Version 1.1.0-rtm.24570.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60bce356d654..b3592b9239fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -379,14 +379,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 25628d789b54ec56a8648d02847c1ad1b0ea31df + d4e6bd7ea6bb1f5b016e54f6f1b14601178e9794 - + https://github.com/dotnet/test-templates - 25628d789b54ec56a8648d02847c1ad1b0ea31df + d4e6bd7ea6bb1f5b016e54f6f1b14601178e9794 diff --git a/eng/Versions.props b/eng/Versions.props index 7296ca23a1ed..befafa650737 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24568.1 + 1.1.0-rtm.24570.1 From b65fc0b71d929b600edbf5eb29ba7eb0c9fb245c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 15:25:04 +0000 Subject: [PATCH 82/97] Update dependencies from https://github.com/dotnet/test-templates build 20241120.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24568.1 -> To Version 1.1.0-rtm.24570.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3592b9239fc..38a601272453 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -379,14 +379,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - d4e6bd7ea6bb1f5b016e54f6f1b14601178e9794 + 2adf5822dc94d97d0f6e1584129fcf65ba837097 - + https://github.com/dotnet/test-templates - d4e6bd7ea6bb1f5b016e54f6f1b14601178e9794 + 2adf5822dc94d97d0f6e1584129fcf65ba837097 diff --git a/eng/Versions.props b/eng/Versions.props index befafa650737..720cc2929963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24570.1 + 1.1.0-rtm.24570.2 From d28b5e324997330a6ec1834400854f32283a91d4 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Thu, 21 Nov 2024 00:14:09 +0100 Subject: [PATCH 83/97] [StaticWebAssets] Detects pre-compressed assets (#44976) # Detects pre-compressed assets Detects assets that have been pre-compressed by an external tool to avoid conflicts when we compress our own assets, and they end up on the same path as the existing pre-compressed assets. ## Description We have received feedback that some customers are facing issues upgrading as they are consuming packages that contain pre-compressed assets or are using third-party tools (like webpack) that produce pre-compressed versions of those assets. Our recommendation in these cases is to let the framework handle the compression, as it further optimizes the delivery of those assets. However, this requires changes on their project to disable the compression on the third-party tools / exclude the pre compressed assets or to disable the compression that is done by the framework (a one-line MSBuild change). We, however, recognize that this cause friction during the upgrade process and want to improve the situation by following the most common convention, which is, detecting compressed versions of an asset that live side-by-side with it. (Same path with an extra .gz or .br for the compressed versions) This change detects such scenarios and starts treating the assets in the same way as if they were defined by the framework. Fixes https://github.com/dotnet/aspnetcore/issues/57518 ## Customer Impact Customers with pre compressed files in their web content are forced to either remove those assets from the build or disable compression when they upgrade, as otherwise the build breaks. ## Regression? - [ ] Yes - [X] No It's not a regression because this is a new feature, but it impacts the upgrade flow in this particular scenario. ## Risk - [ ] High - [ ] Medium - [X] Low There is a flag that can be used to turn off compression on the framework, which will prevent any compression related code from running. The new added logic should no-op in most common cases and only ever execute when we detect a pre-compressed asset that was not generated by the framework. ## Verification - [ ] Manual (required) - [X] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [X] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props --- ...ET.Sdk.StaticWebAssets.Compression.targets | 24 +- .../DiscoverPrecompressedAssets.cs | 115 ++ .../DiscoverPrecompressedAssetsTest.cs | 109 ++ .../ResolveCompressedAssetsTest.cs | 70 + ...tects_PrecompressedAssets.Build.files.json | 4 + ...ompressedAssets.Build.staticwebassets.json | 1209 +++++++++++++++++ ..._With_PrecompressedAssets.Build.files.json | 18 + ...ompressedAssets.Build.staticwebassets.json | 1209 +++++++++++++++++ ...aticWebAssetsCompressionIntegrationTest.cs | 187 +++ 9 files changed, 2944 insertions(+), 1 deletion(-) create mode 100644 src/StaticWebAssetsSdk/Tasks/Compression/DiscoverPrecompressedAssets.cs create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverPrecompressedAssetsTest.cs create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.files.json create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.staticwebassets.json create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.files.json create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.staticwebassets.json create mode 100644 test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCompressionIntegrationTest.cs diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets index d14cea18509d..1042c438908f 100644 --- a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets @@ -14,6 +14,7 @@ Copyright (c) .NET Foundation. All rights reserved. + @@ -225,7 +226,7 @@ Copyright (c) .NET Foundation. All rights reserved. @@ -276,6 +277,27 @@ Copyright (c) .NET Foundation. All rights reserved. + + + + + + + + + + + + + + (); + + var candidatesByIdentity = candidates.ToDictionary(asset => asset.Identity, OSPath.PathComparer); + + foreach (var candidate in candidates) + { + if (HasCompressionExtension(candidate.RelativePath) && + // We only care about assets that are not already considered compressed + !IsCompressedAsset(candidate) && + // The candidate doesn't already have a related asset + string.IsNullOrEmpty(candidate.RelatedAsset)) + { + Log.LogMessage( + MessageImportance.Low, + "The asset '{0}' was detected as compressed but it didn't specify a related asset.", + candidate.Identity); + var relatedAsset = FindRelatedAsset(candidate, candidatesByIdentity); + if (relatedAsset is null) + { + Log.LogMessage( + MessageImportance.Low, + "The asset '{0}' was detected as compressed but the related asset with relative path '{1}' was not found.", + candidate.Identity, + Path.GetFileNameWithoutExtension(candidate.RelativePath)); + continue; + } + + Log.LogMessage( + "The asset '{0}' was detected as compressed and the related asset '{1}' was found.", + candidate.Identity, + relatedAsset.Identity); + UpdateCompressedAsset(candidate, relatedAsset); + assetsToUpdate.Add(candidate.ToTaskItem()); + } + } + + DiscoveredCompressedAssets = [.. assetsToUpdate]; + + return !Log.HasLoggedErrors; + } + + private StaticWebAsset FindRelatedAsset(StaticWebAsset candidate, IDictionary candidates) + { + // The only pattern that we support is a related asset that lives in the same directory, with the same name, + // but without the compression extension. In any other case we are not going to consider the assets related + // and an error will occur. + var identityWithoutExtension = candidate.Identity.Substring(0, candidate.Identity.Length - 3); // We take advantage we know the extension is .br or .gz. + return candidates.TryGetValue(identityWithoutExtension, out var relatedAsset) ? relatedAsset : null; + } + + private bool HasCompressionExtension(string relativePath) + { + return relativePath.EndsWith(".gz", StringComparison.OrdinalIgnoreCase) || + relativePath.EndsWith(".br", StringComparison.OrdinalIgnoreCase); + } + + private static bool IsCompressedAsset(StaticWebAsset asset) + => string.Equals("Content-Encoding", asset.AssetTraitName, StringComparison.Ordinal); + + private void UpdateCompressedAsset(StaticWebAsset asset, StaticWebAsset relatedAsset) + { + string fileExtension; + string assetTraitValue; + + if (!asset.RelativePath.EndsWith(".gz", StringComparison.OrdinalIgnoreCase)) + { + fileExtension = ".br"; + assetTraitValue = BrotliAssetTraitValue; + } + else + { + fileExtension = ".gz"; + assetTraitValue = GzipAssetTraitValue; + } + + var originalItemSpec = asset.OriginalItemSpec; + var relativePath = relatedAsset.EmbedTokens(relatedAsset.RelativePath); + + asset.RelativePath = $"{relativePath}{fileExtension}"; + asset.OriginalItemSpec = relatedAsset.Identity; + asset.RelatedAsset = relatedAsset.Identity; + asset.AssetRole = "Alternative"; + asset.AssetTraitName = "Content-Encoding"; + asset.AssetTraitValue = assetTraitValue; + } +} diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverPrecompressedAssetsTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverPrecompressedAssetsTest.cs new file mode 100644 index 000000000000..e4019c5b1da9 --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverPrecompressedAssetsTest.cs @@ -0,0 +1,109 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.AspNetCore.StaticWebAssets.Tasks; +using Microsoft.Build.Framework; +using Moq; + +namespace Microsoft.NET.Sdk.Razor.Tests; + +public class DiscoverPrecompressedAssetsTest +{ + public string ItemSpec { get; } + + public string OriginalItemSpec { get; } + + public string OutputBasePath { get; } + + public DiscoverPrecompressedAssetsTest() + { + OutputBasePath = Path.Combine(TestContext.Current.TestExecutionDirectory, nameof(ResolveCompressedAssetsTest)); + ItemSpec = Path.Combine(OutputBasePath, Guid.NewGuid().ToString("N") + ".tmp"); + OriginalItemSpec = Path.Combine(OutputBasePath, Guid.NewGuid().ToString("N") + ".tmp"); + } + + [Fact] + public void DiscoversPrecompressedAssetsCorrectly() + { + var errorMessages = new List(); + var buildEngine = new Mock(); + buildEngine.Setup(e => e.LogErrorEvent(It.IsAny())) + .Callback(args => errorMessages.Add(args.Message)); + + var uncompressedCandidate = new StaticWebAsset + { + Identity = Path.Combine(Environment.CurrentDirectory, "wwwroot", "js", "site.js"), + RelativePath = "js/site#[.{fingerprint}]?.js", + BasePath = "_content/Test", + AssetMode = StaticWebAsset.AssetModes.All, + AssetKind = StaticWebAsset.AssetKinds.All, + AssetMergeSource = string.Empty, + SourceId = "Test", + CopyToOutputDirectory = StaticWebAsset.AssetCopyOptions.Never, + Fingerprint = "uncompressed", + RelatedAsset = string.Empty, + ContentRoot = Path.Combine(Environment.CurrentDirectory,"wwwroot"), + SourceType = StaticWebAsset.SourceTypes.Discovered, + Integrity = "uncompressed-integrity", + AssetRole = StaticWebAsset.AssetRoles.Primary, + AssetMergeBehavior = string.Empty, + AssetTraitValue = string.Empty, + AssetTraitName = string.Empty, + OriginalItemSpec = Path.Combine("wwwroot", "js", "site.js"), + CopyToPublishDirectory = StaticWebAsset.AssetCopyOptions.PreserveNewest + }; + + var compressedCandidate = new StaticWebAsset + { + Identity = Path.Combine(Environment.CurrentDirectory, "wwwroot", "js", "site.js.gz"), + RelativePath = "js/site.js#[.{fingerprint}]?.gz", + BasePath = "_content/Test", + AssetMode = StaticWebAsset.AssetModes.All, + AssetKind = StaticWebAsset.AssetKinds.All, + AssetMergeSource = string.Empty, + SourceId = "Test", + CopyToOutputDirectory = StaticWebAsset.AssetCopyOptions.Never, + Fingerprint = "compressed", + RelatedAsset = string.Empty, + ContentRoot = Path.Combine(Environment.CurrentDirectory, "wwwroot"), + SourceType = StaticWebAsset.SourceTypes.Discovered, + Integrity = "compressed-integrity", + AssetRole = StaticWebAsset.AssetRoles.Primary, + AssetMergeBehavior = string.Empty, + AssetTraitValue = string.Empty, + AssetTraitName = string.Empty, + OriginalItemSpec = Path.Combine("wwwroot", "js", "site.js.gz"), + CopyToPublishDirectory = StaticWebAsset.AssetCopyOptions.PreserveNewest + }; + + var task = new DiscoverPrecompressedAssets + { + CandidateAssets = [uncompressedCandidate.ToTaskItem(), compressedCandidate.ToTaskItem()], + BuildEngine = buildEngine.Object + }; + + var result = task.Execute(); + + result.Should().BeTrue(); + task.DiscoveredCompressedAssets.Should().ContainSingle(); + var asset = task.DiscoveredCompressedAssets[0]; + asset.ItemSpec.Should().Be(compressedCandidate.Identity); + asset.GetMetadata("RelatedAsset").Should().Be(uncompressedCandidate.Identity); + asset.GetMetadata("OriginalItemSpec").Should().Be(uncompressedCandidate.Identity); + asset.GetMetadata("RelativePath").Should().Be("js/site#[.{fingerprint=uncompressed}]?.js.gz"); + asset.GetMetadata("AssetRole").Should().Be("Alternative"); + asset.GetMetadata("AssetTraitName").Should().Be("Content-Encoding"); + asset.GetMetadata("AssetTraitValue").Should().Be("gzip"); + asset.GetMetadata("Fingerprint").Should().Be("compressed"); + asset.GetMetadata("Integrity").Should().Be("compressed-integrity"); + asset.GetMetadata("CopyToPublishDirectory").Should().Be("PreserveNewest"); + asset.GetMetadata("CopyToOutputDirectory").Should().Be("Never"); + asset.GetMetadata("AssetMergeSource").Should().Be(string.Empty); + asset.GetMetadata("AssetMergeBehavior").Should().Be(string.Empty); + asset.GetMetadata("AssetKind").Should().Be("All"); + asset.GetMetadata("AssetMode").Should().Be("All"); + asset.GetMetadata("SourceId").Should().Be("Test"); + asset.GetMetadata("SourceType").Should().Be("Discovered"); + asset.GetMetadata("ContentRoot").Should().Be(Path.Combine(Environment.CurrentDirectory, $"wwwroot{Path.DirectorySeparatorChar}")); + } +} diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ResolveCompressedAssetsTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ResolveCompressedAssetsTest.cs index bd164de346d6..67878b28dce1 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ResolveCompressedAssetsTest.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ResolveCompressedAssetsTest.cs @@ -1,11 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics.Metrics; using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Moq; using NuGet.ContentModel; +using NuGet.Packaging.Core; namespace Microsoft.NET.Sdk.Razor.Tests; @@ -70,6 +72,74 @@ public void ResolvesExplicitlyProvidedAssets() task.AssetsToCompress[1].ItemSpec.Should().EndWith(".br"); } + [Fact] + public void InfersPreCompressedAssetsCorrectly() + { + var errorMessages = new List(); + var buildEngine = new Mock(); + buildEngine.Setup(e => e.LogErrorEvent(It.IsAny())) + .Callback(args => errorMessages.Add(args.Message)); + + var uncompressedCandidate = new StaticWebAsset + { + Identity = Path.Combine(Environment.CurrentDirectory, "wwwroot", "js", "site.js"), + RelativePath = "js/site#[.{fingerprint}]?.js", + BasePath = "_content/Test", + AssetMode = StaticWebAsset.AssetModes.All, + AssetKind = StaticWebAsset.AssetKinds.All, + AssetMergeSource = string.Empty, + SourceId = "Test", + CopyToOutputDirectory = StaticWebAsset.AssetCopyOptions.Never, + Fingerprint = "xtxxf3hu2r", + RelatedAsset = string.Empty, + ContentRoot = Path.Combine(Environment.CurrentDirectory,"wwwroot"), + SourceType = StaticWebAsset.SourceTypes.Discovered, + Integrity = "hRQyftXiu1lLX2P9Ly9xa4gHJgLeR1uGN5qegUobtGo=", + AssetRole = StaticWebAsset.AssetRoles.Primary, + AssetMergeBehavior = string.Empty, + AssetTraitValue = string.Empty, + AssetTraitName = string.Empty, + OriginalItemSpec = Path.Combine("wwwroot", "js", "site.js"), + CopyToPublishDirectory = StaticWebAsset.AssetCopyOptions.PreserveNewest + }; + + var compressedCandidate = new StaticWebAsset + { + Identity = Path.Combine(Environment.CurrentDirectory, "wwwroot", "js", "site.js.gz"), + RelativePath = "js/site.js#[.{fingerprint}]?.gz", + BasePath = "_content/Test", + AssetMode = StaticWebAsset.AssetModes.All, + AssetKind = StaticWebAsset.AssetKinds.All, + AssetMergeSource = string.Empty, + SourceId = "Test", + CopyToOutputDirectory = StaticWebAsset.AssetCopyOptions.Never, + Fingerprint = "es13vhk42b", + RelatedAsset = string.Empty, + ContentRoot = Path.Combine(Environment.CurrentDirectory, "wwwroot"), + SourceType = StaticWebAsset.SourceTypes.Discovered, + Integrity = "zs5Fd3XI6+g9f4N1SFLVdgghuiqdvq+nETAjTbvVxx4=", + AssetRole = StaticWebAsset.AssetRoles.Primary, + AssetMergeBehavior = string.Empty, + AssetTraitValue = string.Empty, + AssetTraitName = string.Empty, + OriginalItemSpec = Path.Combine("wwwroot", "js", "site.js.gz"), + CopyToPublishDirectory = StaticWebAsset.AssetCopyOptions.PreserveNewest + }; + + var task = new ResolveCompressedAssets + { + OutputPath = OutputBasePath, + CandidateAssets = [uncompressedCandidate.ToTaskItem(), compressedCandidate.ToTaskItem()], + Formats = "gzip", + BuildEngine = buildEngine.Object + }; + + var result = task.Execute(); + + result.Should().BeTrue(); + task.AssetsToCompress.Should().HaveCount(0); + } + [Fact] public void ResolvesAssetsMatchingIncludePattern() { diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.files.json b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.files.json new file mode 100644 index 000000000000..817adc62eec6 --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.files.json @@ -0,0 +1,4 @@ +[ + "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css" +] \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.staticwebassets.json new file mode 100644 index 000000000000..d228706df30c --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/Build_Detects_PrecompressedAssets.Build.staticwebassets.json @@ -0,0 +1,1209 @@ +{ + "Version": 1, + "Hash": "__hash__", + "Source": "AppWithP2PReference", + "BasePath": "_content/AppWithP2PReference", + "Mode": "Default", + "ManifestType": "Build", + "ReferencedProjectsConfiguration": [ + { + "Identity": "${ProjectPath}\\ClassLibrary\\ClassLibrary.csproj", + "Version": 2, + "Source": "ClassLibrary", + "GetPublishAssetsTargets": "ComputeReferencedStaticWebAssetsPublishManifest;GetCurrentProjectPublishStaticWebAssetItems", + "AdditionalPublishProperties": "", + "AdditionalPublishPropertiesToRemove": "WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained", + "GetBuildAssetsTargets": "GetCurrentProjectBuildStaticWebAssetItems", + "AdditionalBuildProperties": "", + "AdditionalBuildPropertiesToRemove": "WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained" + } + ], + "DiscoveryPatterns": [ + { + "Name": "ClassLibrary\\wwwroot", + "Source": "ClassLibrary", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "Pattern": "**" + } + ], + "Assets": [ + { + "Identity": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "SourceId": "AppWithP2PReference", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/AppWithP2PReference", + "RelativePath": "AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "AssetKind": "All", + "AssetMode": "CurrentProject", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz" + }, + { + "Identity": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "SourceId": "AppWithP2PReference", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\", + "BasePath": "_content/AppWithP2PReference", + "RelativePath": "AppWithP2PReference#[.{fingerprint}]?.styles.css", + "AssetKind": "All", + "AssetMode": "CurrentProject", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "ScopedCss", + "AssetTraitValue": "ApplicationBundle", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "AssetKind": "All", + "AssetMode": "Reference", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.v4.js.gz", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "ClassLibrary#[.{fingerprint}]!.bundle.scp.css", + "AssetKind": "All", + "AssetMode": "Reference", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "ScopedCss", + "AssetTraitValue": "ProjectBundle", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js.br", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js.gz", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.v4.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js" + } + ], + "Endpoints": [ + { + "Route": "AppWithP2PReference.styles.css.gz", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css.gz", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css.gz" + } + ] + }, + { + "Route": "AppWithP2PReference.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css" + } + ] + }, + { + "Route": "AppWithP2PReference.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css.gz" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js.br", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "br" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "br", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "br" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + } + ] +} \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.files.json b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.files.json new file mode 100644 index 000000000000..4658dfcbf916 --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.files.json @@ -0,0 +1,18 @@ +[ + "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "${OutputPath}\\wwwroot\\AppWithP2PReference.styles.css", + "${OutputPath}\\wwwroot\\AppWithP2PReference.styles.css.br", + "${OutputPath}\\wwwroot\\AppWithP2PReference.styles.css.gz", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\ClassLibrary.__fingerprint__.bundle.scp.css", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\ClassLibrary.__fingerprint__.bundle.scp.css.br", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\ClassLibrary.__fingerprint__.bundle.scp.css.gz", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.js", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.br", + "${OutputPath}\\wwwroot\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "${OutputPath}\\wwwroot\\js\\project-transitive-dep.js.br", + "${OutputPath}\\wwwroot\\js\\project-transitive-dep.js.gz" +] \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.staticwebassets.json new file mode 100644 index 000000000000..d228706df30c --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselines/PublishWorks_With_PrecompressedAssets.Build.staticwebassets.json @@ -0,0 +1,1209 @@ +{ + "Version": 1, + "Hash": "__hash__", + "Source": "AppWithP2PReference", + "BasePath": "_content/AppWithP2PReference", + "Mode": "Default", + "ManifestType": "Build", + "ReferencedProjectsConfiguration": [ + { + "Identity": "${ProjectPath}\\ClassLibrary\\ClassLibrary.csproj", + "Version": 2, + "Source": "ClassLibrary", + "GetPublishAssetsTargets": "ComputeReferencedStaticWebAssetsPublishManifest;GetCurrentProjectPublishStaticWebAssetItems", + "AdditionalPublishProperties": "", + "AdditionalPublishPropertiesToRemove": "WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained", + "GetBuildAssetsTargets": "GetCurrentProjectBuildStaticWebAssetItems", + "AdditionalBuildProperties": "", + "AdditionalBuildPropertiesToRemove": "WebPublishProfileFile;TargetFramework;RuntimeIdentifier;SelfContained" + } + ], + "DiscoveryPatterns": [ + { + "Name": "ClassLibrary\\wwwroot", + "Source": "ClassLibrary", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "Pattern": "**" + } + ], + "Assets": [ + { + "Identity": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "SourceId": "AppWithP2PReference", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/AppWithP2PReference", + "RelativePath": "AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "AssetKind": "All", + "AssetMode": "CurrentProject", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz" + }, + { + "Identity": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "SourceId": "AppWithP2PReference", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\", + "BasePath": "_content/AppWithP2PReference", + "RelativePath": "AppWithP2PReference#[.{fingerprint}]?.styles.css", + "AssetKind": "All", + "AssetMode": "CurrentProject", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "ScopedCss", + "AssetTraitValue": "ApplicationBundle", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "AssetKind": "All", + "AssetMode": "Reference", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.v4.js.gz", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "ClassLibrary#[.{fingerprint}]!.bundle.scp.css", + "AssetKind": "All", + "AssetMode": "Reference", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "ScopedCss", + "AssetTraitValue": "ProjectBundle", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js.br", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "br", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js.gz", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js" + }, + { + "Identity": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "SourceId": "ClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\ClassLibrary\\wwwroot\\", + "BasePath": "_content/ClassLibrary", + "RelativePath": "js/project-transitive-dep.v4.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js" + } + ], + "Endpoints": [ + { + "Route": "AppWithP2PReference.styles.css.gz", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css.gz", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css.gz" + } + ] + }, + { + "Route": "AppWithP2PReference.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\compressed\\_content\\AppWithP2PReference\\AppWithP2PReference#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css" + } + ] + }, + { + "Route": "AppWithP2PReference.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "AppWithP2PReference.__fingerprint__.styles.css", + "AssetFile": "${ProjectPath}\\AppWithP2PReference\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\AppWithP2PReference.styles.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Link", + "Value": "\u003C_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css\u003E; rel=\u0022preload\u0022; as=\u0022style\u0022" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "AppWithP2PReference.styles.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css.gz" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\ClassLibrary#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\compressed\\_content\\ClassLibrary\\js\\project-transitive-dep.v4.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/ClassLibrary.__fingerprint__.bundle.scp.css", + "AssetFile": "${ProjectPath}\\ClassLibrary\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ClassLibrary.bundle.scp.css", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "max-age=31536000, immutable" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/css" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "_content/ClassLibrary/ClassLibrary.bundle.scp.css" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js.br", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "br" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.br", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "br", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "br" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js.gz", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\_content\\ClassLibrary\\js\\project-transitive-dep.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Content-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_content/ClassLibrary/js/project-transitive-dep.v4.js", + "AssetFile": "${ProjectPath}\\ClassLibrary\\wwwroot\\js\\project-transitive-dep.v4.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Accept-Ranges", + "Value": "bytes" + }, + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + } + ] +} \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCompressionIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCompressionIntegrationTest.cs new file mode 100644 index 000000000000..94de9a5784dc --- /dev/null +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsCompressionIntegrationTest.cs @@ -0,0 +1,187 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.IO.Compression; +using System.Net.Http.Headers; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; + +namespace Microsoft.NET.Sdk.Razor.Tests +{ + public class StaticWebAssetsCompressionIntegrationTest : AspNetSdkBaselineTest + { + public StaticWebAssetsCompressionIntegrationTest(ITestOutputHelper log) : base(log, GenerateBaselines) { } + + [Fact] + public void Build_Detects_PrecompressedAssets() + { + var expectedManifest = LoadBuildManifest(); + var testAsset = "RazorAppWithP2PReference"; + ProjectDirectory = CreateAspNetSdkTestAsset(testAsset); + + var file = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js"); + var gzipFile = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js.gz"); + var brotliFile = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js.br"); + + // Compress file into gzip and brotli + using (var gzipStream = new GZipStream(File.Create(gzipFile), CompressionLevel.NoCompression)) + { + using var stream = File.OpenRead(file); + stream.CopyTo(gzipStream); + } + + using (var brotliStream = new BrotliStream(File.Create(brotliFile), CompressionLevel.NoCompression)) + { + using var stream = File.OpenRead(file); + stream.CopyTo(brotliStream); + } + + var build = CreateBuildCommand(ProjectDirectory, "AppWithP2PReference"); + ExecuteCommand(build).Should().Pass(); + + var intermediateOutputPath = build.GetIntermediateDirectory(DefaultTfm, "Debug").ToString(); + var outputPath = build.GetOutputDirectory(DefaultTfm, "Debug").ToString(); + + // GenerateStaticWebAssetsManifest should generate the manifest file. + var path = Path.Combine(intermediateOutputPath, "staticwebassets.build.json"); + new FileInfo(path).Should().Exist(); + var manifest = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(path)); + AssertManifest(manifest, expectedManifest); + + // GenerateStaticWebAssetsManifest should copy the file to the output folder. + var finalPath = Path.Combine(outputPath, "AppWithP2PReference.staticwebassets.runtime.json"); + new FileInfo(finalPath).Should().Exist(); + + var manifest1 = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(Path.Combine(intermediateOutputPath, "staticwebassets.build.json"))); + AssertManifest(manifest1, expectedManifest); + AssertBuildAssets(manifest1, outputPath, intermediateOutputPath); + + var manifest2 = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(Path.Combine(intermediateOutputPath, "staticwebassets.build.json"))); + + var standardEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, file, StringComparison.Ordinal)).ToArray(); + var gzipEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, gzipFile, StringComparison.Ordinal)).ToArray(); + var brotliEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, brotliFile, StringComparison.Ordinal)).ToArray(); + + var gzipAsset = manifest2.Assets.Single(a => string.Equals(a.Identity, gzipFile, StringComparison.Ordinal)); + var brotliAsset = manifest2.Assets.Single(a => string.Equals(a.Identity, brotliFile, StringComparison.Ordinal)); + + standardEndpoints.Should().HaveCount(1); + gzipEndpoints.Should().HaveCount(2); + brotliEndpoints.Should().HaveCount(2); + + var expectedWeakEndpointEtag = new EntityTagHeaderValue( + EntityTagHeaderValue.Parse(standardEndpoints.First().ResponseHeaders.Single(h => h.Name == "ETag").Value).Tag, + isWeak: true); + + foreach (var endpoint in gzipEndpoints) + { + endpoint.ResponseHeaders.Where(e => e.Name == "Content-Encoding").Select(e => e.Value).Single().Should().Be("gzip"); + + var etags = endpoint.ResponseHeaders.Where(e => e.Name == "ETag").Select(e => EntityTagHeaderValue.Parse(e.Value)); + etags.Where(e=> !e.IsWeak).Select(e => e.Tag).Single().Should().BeEquivalentTo($"\"{gzipAsset.Integrity}\""); + if (endpoint.Route.EndsWith(".gz")) + { + continue; + } + etags.Should().Contain(expectedWeakEndpointEtag); + } + + foreach (var endpoint in brotliEndpoints) + { + endpoint.ResponseHeaders.Where(e => e.Name == "Content-Encoding").Select(e => e.Value).Single().Should().Be("br"); + + var etags = endpoint.ResponseHeaders.Where(e => e.Name == "ETag").Select(e => EntityTagHeaderValue.Parse(e.Value)); + etags.Where(e => !e.IsWeak).Select(e => e.Tag).Single().Should().BeEquivalentTo($"\"{brotliAsset.Integrity}\""); + if (endpoint.Route.EndsWith(".br")) + { + continue; + } + etags.Should().Contain(expectedWeakEndpointEtag); + } + } + + [Fact] + public void PublishWorks_With_PrecompressedAssets() + { + var expectedManifest = LoadBuildManifest(); + var testAsset = "RazorAppWithP2PReference"; + ProjectDirectory = CreateAspNetSdkTestAsset(testAsset); + + var file = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js"); + var gzipFile = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js.gz"); + var brotliFile = Path.Combine(ProjectDirectory.Path, "ClassLibrary", "wwwroot", "js", "project-transitive-dep.js.br"); + + // Compress file into gzip and brotli + using (var gzipStream = new GZipStream(File.Create(gzipFile), CompressionLevel.NoCompression)) + { + using var stream = File.OpenRead(file); + stream.CopyTo(gzipStream); + } + + using (var brotliStream = new BrotliStream(File.Create(brotliFile), CompressionLevel.NoCompression)) + { + using var stream = File.OpenRead(file); + stream.CopyTo(brotliStream); + } + + var build = CreatePublishCommand(ProjectDirectory, "AppWithP2PReference"); + ExecuteCommand(build).Should().Pass(); + + var intermediateOutputPath = build.GetIntermediateDirectory(DefaultTfm, "Debug").ToString(); + var outputPath = build.GetOutputDirectory(DefaultTfm, "Debug").ToString(); + + // GenerateStaticWebAssetsManifest should generate the manifest file. + var path = Path.Combine(intermediateOutputPath, "staticwebassets.build.json"); + new FileInfo(path).Should().Exist(); + var manifest = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(path)); + AssertManifest(manifest, expectedManifest); + + + var manifest1 = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(Path.Combine(intermediateOutputPath, "staticwebassets.build.json"))); + AssertManifest(manifest1, expectedManifest); + AssertBuildAssets(manifest1, outputPath, intermediateOutputPath); + + var manifest2 = StaticWebAssetsManifest.FromJsonBytes(File.ReadAllBytes(Path.Combine(intermediateOutputPath, "staticwebassets.publish.json"))); + + var standardEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, file, StringComparison.Ordinal)).ToArray(); + var gzipEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, gzipFile, StringComparison.Ordinal)).ToArray(); + var brotliEndpoints = manifest2.Endpoints.Where(e => string.Equals(e.AssetFile, brotliFile, StringComparison.Ordinal)).ToArray(); + + var gzipAsset = manifest2.Assets.Single(a => string.Equals(a.Identity, gzipFile, StringComparison.Ordinal)); + var brotliAsset = manifest2.Assets.Single(a => string.Equals(a.Identity, brotliFile, StringComparison.Ordinal)); + + standardEndpoints.Should().HaveCount(1); + gzipEndpoints.Should().HaveCount(2); + brotliEndpoints.Should().HaveCount(2); + + var expectedWeakEndpointEtag = new EntityTagHeaderValue( + EntityTagHeaderValue.Parse(standardEndpoints.First().ResponseHeaders.Single(h => h.Name == "ETag").Value).Tag, + isWeak: true); + + foreach (var endpoint in gzipEndpoints) + { + endpoint.ResponseHeaders.Where(e => e.Name == "Content-Encoding").Select(e => e.Value).Single().Should().Be("gzip"); + + var etags = endpoint.ResponseHeaders.Where(e => e.Name == "ETag").Select(e => EntityTagHeaderValue.Parse(e.Value)); + etags.Where(e => !e.IsWeak).Select(e => e.Tag).Single().Should().BeEquivalentTo($"\"{gzipAsset.Integrity}\""); + if (endpoint.Route.EndsWith(".gz")) + { + continue; + } + etags.Should().Contain(expectedWeakEndpointEtag); + } + + foreach (var endpoint in brotliEndpoints) + { + endpoint.ResponseHeaders.Where(e => e.Name == "Content-Encoding").Select(e => e.Value).Single().Should().Be("br"); + + var etags = endpoint.ResponseHeaders.Where(e => e.Name == "ETag").Select(e => EntityTagHeaderValue.Parse(e.Value)); + etags.Where(e => !e.IsWeak).Select(e => e.Tag).Single().Should().BeEquivalentTo($"\"{brotliAsset.Integrity}\""); + if (endpoint.Route.EndsWith(".br")) + { + continue; + } + etags.Should().Contain(expectedWeakEndpointEtag); + } + } + } +} From bf9e89f9ff992d680ce54a08b4a7954dd1010723 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 13:47:53 +0000 Subject: [PATCH 84/97] Update dependencies from https://github.com/dotnet/roslyn build 20241120.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24558.5 -> To Version 4.12.0-3.24570.6 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd15d90e295a..f58a9604fc1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 - + https://github.com/dotnet/roslyn - 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf + 913fb4ecf8382b79d29e8a4434bb5667f7988846 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 934b21cc82b4..9e280d6d7a98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 - 4.12.0-3.24558.5 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 + 4.12.0-3.24570.6 From f4eb7453912d2188794bb21bd97e9fffa4d421b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 13:48:17 +0000 Subject: [PATCH 85/97] Update dependencies from https://github.com/dotnet/msbuild build 20241121.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.9-preview-24524-01 -> To Version 17.12.12-preview-24571-01 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3da372c869d7..7409d3265d40 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd15d90e295a..18b28d577d2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 43a24969a23bd2dd76cd26be26210e2afcd0595e + 1cce77968bca1366760f361c837ffbc3a6af70f0 - + https://github.com/dotnet/msbuild - 43a24969a23bd2dd76cd26be26210e2afcd0595e + 1cce77968bca1366760f361c837ffbc3a6af70f0 - + https://github.com/dotnet/msbuild - 43a24969a23bd2dd76cd26be26210e2afcd0595e + 1cce77968bca1366760f361c837ffbc3a6af70f0 diff --git a/eng/Versions.props b/eng/Versions.props index 934b21cc82b4..79775b08d04a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -196,8 +196,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.9 - 17.12.9-preview-24524-01 + 17.12.12 + 17.12.12-preview-24571-01 17.11.4 17.12 From 0d7e3ad19bb543417002bb10d166eb073e36f7fc Mon Sep 17 00:00:00 2001 From: Wenwen <53243232+Winniexu01@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:26:56 +0800 Subject: [PATCH 86/97] Update Source-Build SDK Diff Tests Baselines (#45003) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff index 8cd6f6c82125..cfd17f75bf9c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/ - ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/WorkloadManifest.Aspire.targets @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll From e2b4f9ea15ca1f5f1869cc319d206f5578764765 Mon Sep 17 00:00:00 2001 From: MichalPavlik Date: Thu, 21 Nov 2024 19:50:02 +0100 Subject: [PATCH 87/97] [release/9.0.1xx] Using ConsoleLogger to prevent unexpected behavior (#45015) --- src/Cli/dotnet/commands/dotnet-run/RunCommand.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs b/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs index 56e10007691a..9f3d8e728201 100644 --- a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs @@ -480,7 +480,9 @@ public void Shutdown() static ILogger MakeTerminalLogger(VerbosityOptions? verbosity) { var msbuildVerbosity = ToLoggerVerbosity(verbosity); - var thing = Assembly.Load("MSBuild").GetType("Microsoft.Build.Logging.TerminalLogger.TerminalLogger")!.GetConstructor([typeof(LoggerVerbosity)])!.Invoke([msbuildVerbosity]) as ILogger; + + // Temporary fix for 9.0.1xx. 9.0.2xx will use the TerminalLogger in the safe way. + var thing = new ConsoleLogger(msbuildVerbosity); return thing!; } From aef12bad75101da169f94b77f23dff50693f6318 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 21 Nov 2024 18:03:15 -0800 Subject: [PATCH 88/97] Enable test timeout dump collection (#44730) Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> Co-authored-by: Daniel Plaisted --- .../ForwardingAppImplementation.cs | 6 +---- src/Cli/Microsoft.DotNet.Cli.Utils/Muxer.cs | 24 +++++++++++++++++-- .../ArgumentForwardingTests.cs | 2 +- test/HelixTasks/AssemblyScheduler.cs | 20 +++++----------- ...omCreateXUnitWorkItemsWithTestExclusion.cs | 23 ++++++------------ 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs index c83369ef56cf..3adcd4539be7 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs @@ -93,11 +93,7 @@ public ForwardingAppImplementation WithEnvironmentVariable(string name, string v return this; } - private string GetHostExeName() - { - // Should instead make this a full path to dotnet - return Environment.ProcessPath; - } + private string GetHostExeName() => new Muxer().MuxerPath; } } diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Muxer.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Muxer.cs index 0417d0e5a823..e58a4946a7fd 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Muxer.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Muxer.cs @@ -34,11 +34,31 @@ public string MuxerPath public Muxer() { + // Best-effort search for muxer. + // SDK sets DOTNET_HOST_PATH as absolute path to current dotnet executable #if NET6_0_OR_GREATER - _muxerPath = Environment.ProcessPath; + string processPath = Environment.ProcessPath; #else - _muxerPath = Process.GetCurrentProcess().MainModule.FileName; + string processPath = Process.GetCurrentProcess().MainModule.FileName; #endif + + // The current process should be dotnet in most normal scenarios except when dotnet.dll is loaded in a custom host like the testhost + if (!Path.GetFileNameWithoutExtension(processPath).Equals("dotnet", StringComparison.OrdinalIgnoreCase)) + { + // SDK sets DOTNET_HOST_PATH as absolute path to current dotnet executable + processPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH"); + if (processPath is null) + { + // fallback to DOTNET_ROOT which typically holds some dotnet executable + var root = Environment.GetEnvironmentVariable("DOTNET_ROOT"); + if (root is not null) + { + processPath = Path.Combine(root, $"dotnet{Constants.ExeSuffix}"); + } + } + } + + _muxerPath = processPath; } public static string GetDataFromAppDomain(string propertyName) diff --git a/test/ArgumentForwarding.Tests/ArgumentForwardingTests.cs b/test/ArgumentForwarding.Tests/ArgumentForwardingTests.cs index e9e5eea66216..405d744b8832 100644 --- a/test/ArgumentForwarding.Tests/ArgumentForwardingTests.cs +++ b/test/ArgumentForwarding.Tests/ArgumentForwardingTests.cs @@ -165,7 +165,7 @@ private string[] EscapeAndEvaluateArgumentString(string[] rawEvaluatedArgument) Console.WriteLine($"STDERR: {commandResult.StdErr}"); - commandResult.ExitCode.Should().Be(0); + commandResult.ExitCode.Should().Be(0, $"STDOUT: {commandResult.StdOut} STDERR: {commandResult.StdErr}"); return ParseReflectorOutput(commandResult.StdOut); } diff --git a/test/HelixTasks/AssemblyScheduler.cs b/test/HelixTasks/AssemblyScheduler.cs index 53349f8f16b4..5a6e909f4cda 100644 --- a/test/HelixTasks/AssemblyScheduler.cs +++ b/test/HelixTasks/AssemblyScheduler.cs @@ -69,20 +69,18 @@ private sealed class AssemblyInfoBuilder private readonly StringBuilder _builder = new(); private readonly string _assemblyPath; private readonly int _methodLimit; - private readonly bool _netFramework; private int _currentId; private List _currentTypeInfoList = new(); - private AssemblyInfoBuilder(string assemblyPath, int methodLimit, bool netFramework = false) + private AssemblyInfoBuilder(string assemblyPath, int methodLimit) { _assemblyPath = assemblyPath; _methodLimit = methodLimit; - _netFramework = netFramework; } internal static void Build(string assemblyPath, int methodLimit, List typeInfoList, out List partitionList, out List assemblyInfoList, bool netFramework = false) { - var builder = new AssemblyInfoBuilder(assemblyPath, methodLimit, netFramework); + var builder = new AssemblyInfoBuilder(assemblyPath, methodLimit); builder.Build(typeInfoList); partitionList = builder._partitionList; assemblyInfoList = builder._assemblyInfoList; @@ -95,19 +93,13 @@ private void Build(List typeInfoList) foreach (var typeInfo in typeInfoList) { _currentTypeInfoList.Add(typeInfo); - if (_netFramework) - { - if (_builder.Length > 0) - { - _builder.Append("|"); - } - _builder.Append($@"{typeInfo.FullName}"); - } - else + if (_builder.Length > 0) { - _builder.Append($@"-class ""{typeInfo.FullName}"" "); + _builder.Append("|"); } + _builder.Append($@"{typeInfo.FullName}"); + CheckForPartitionLimit(done: false); } diff --git a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs index 65f2b992a07d..99f111f3c177 100644 --- a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs +++ b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs @@ -121,11 +121,9 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) // These tests have to be executed slightly differently and we give them a different Identity so ADO can tell them apart var runtimeTargetFrameworkParsed = NuGetFramework.Parse(runtimeTargetFramework); var testIdentityDifferentiator = ""; - bool netFramework = false; if (runtimeTargetFrameworkParsed.Framework == ".NETFramework") { testIdentityDifferentiator = ".netfx"; - netFramework = true; } else if (runtimeTargetFrameworkParsed.Framework != ".NETCoreApp") { @@ -134,9 +132,9 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) // On mac due to https://github.com/dotnet/sdk/issues/3923, we run against workitem directory // but on Windows, if we running against working item diretory, we would hit long path. - string testExecutionDirectory = netFramework ? "-e DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%" : IsPosixShell ? "-testExecutionDirectory $TestExecutionDirectory" : "-testExecutionDirectory %TestExecutionDirectory%"; + string testExecutionDirectory = IsPosixShell ? "-e DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory" : "-e DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%"; - string msbuildAdditionalSdkResolverFolder = netFramework ? "-e DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\\r" : IsPosixShell ? "" : "-msbuildAdditionalSdkResolverFolder %HELIX_CORRELATION_PAYLOAD%\\r"; + string msbuildAdditionalSdkResolverFolder = IsPosixShell ? "" : "-e DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\\r"; if (ExcludeAdditionalParameters.Equals("true")) { @@ -145,23 +143,16 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) } var scheduler = new AssemblyScheduler(methodLimit: !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TestFullMSBuild")) ? 32 : 16); - var assemblyPartitionInfos = scheduler.Schedule(targetPath, netFramework: netFramework); + var assemblyPartitionInfos = scheduler.Schedule(targetPath); var partitionedWorkItem = new List(); foreach (var assemblyPartitionInfo in assemblyPartitionInfos) { string command; - if (netFramework) - { - var testFilter = string.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\""; - command = $"{driver} test {assemblyName} -e HELIX_WORK_ITEM_TIMEOUT={timeout} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} " + - $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .\\ --logger trx {testFilter}"; - } - else - { - command = $"{driver} exec {assemblyName} -e HELIX_WORK_ITEM_TIMEOUT={timeout} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} " + - $"{(XUnitArguments != null ? " " + XUnitArguments : "")} -xml testResults.xml {assemblyPartitionInfo.ClassListArgumentString} {arguments}"; - } + + var testFilter = string.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\""; + command = $"{driver} test {assemblyName} -e HELIX_WORK_ITEM_TIMEOUT={timeout} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} " + + $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}"; Log.LogMessage($"Creating work item with properties Identity: {assemblyName}, PayloadDirectory: {publishDirectory}, Command: {command}"); From d68423b491f7968b46330474dfd40655a2ac22a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 17:20:16 +0000 Subject: [PATCH 89/97] Update dependencies from https://github.com/nuget/nuget.client build 6.12.2.1 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.12.1-rc.1 -> To Version 6.12.2-rc.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88defe4bf43..97631ccb2fb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,74 +143,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d - + https://github.com/nuget/nuget.client - aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 + c097388782da305f47c395f90bea2d7c83909b6d https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 593676230051..f38905fe5608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,18 +153,18 @@ - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 - 6.12.1-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 + 6.12.2-rc.1 From c1130ce1786404c71d0e6d834a8356590830db5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:32:23 -0600 Subject: [PATCH 90/97] [release/9.0.1xx] Update SB dev container image (#44892) --- src/SourceBuild/content/.devcontainer/devcontainer.json | 2 +- .../content/.devcontainer/prebuilt-sdk/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/.devcontainer/devcontainer.json b/src/SourceBuild/content/.devcontainer/devcontainer.json index b0e1db0a471d..545156dc8370 100644 --- a/src/SourceBuild/content/.devcontainer/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // Container contains checked-out source code only { "name": "Default", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json index d7d96d1c191d..411515c3c43b 100644 --- a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json @@ -1,7 +1,7 @@ // Container contains a pre-built SDK { "name": "Pre-built .NET SDK", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" From 1c6924db217b4b4ab92c16d8cbe787701b59be52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:41:46 +0000 Subject: [PATCH 91/97] Update dependencies from https://github.com/dotnet/roslyn build 20241122.7 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24570.6 -> To Version 4.12.0-3.24572.7 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88defe4bf43..40243db85a43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn - 913fb4ecf8382b79d29e8a4434bb5667f7988846 + dfa7fc6bdea31a858a402168384192b633c811fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 593676230051..2ac2ff5edd8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 - 4.12.0-3.24570.6 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 + 4.12.0-3.24572.7 From 37f542e4d6f62877e556d92020dc553e0b49d84e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:42:20 +0000 Subject: [PATCH 92/97] Update dependencies from https://github.com/dotnet/sourcelink build 20241122.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24569.2 -> To Version 9.0.0-beta.24572.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88defe4bf43..48ed447a18af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -460,34 +460,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink - a190fddd4aeb983b59b682c984692639c8c7d100 + 084a76b3adf59dfbdc5c3f7614979e309910fa50 diff --git a/eng/Versions.props b/eng/Versions.props index 593676230051..59fd0bc68916 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24569.2 - 9.0.0-beta.24569.2 - 9.0.0-beta.24569.2 - 9.0.0-beta.24569.2 - 9.0.0-beta.24569.2 - 9.0.0-beta.24569.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 From 242172b5e29bbe0404f11bd6299487792bb609aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 09:19:32 +0000 Subject: [PATCH 93/97] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241124.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.24527.2 -> To Version 3.11.0-beta1.24574.2 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad54035761bc..bfbe566ea0a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,16 +408,16 @@ 1a54480f52703fb45fac2a6b955247d33758383e - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 diff --git a/eng/Versions.props b/eng/Versions.props index 0fcc89477d21..82180137e291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,8 +174,8 @@ - 9.0.0-preview.24527.2 - 3.11.0-beta1.24527.2 + 9.0.0-preview.24574.2 + 3.11.0-beta1.24574.2 From 1b5038af73754e773919dd9f4cf7a8cbbe5dd533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 09:20:23 +0000 Subject: [PATCH 94/97] Update dependencies from https://github.com/dotnet/razor build 20241124.7 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24565.8 -> To Version 9.0.0-preview.24574.7 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad54035761bc..340606f0acc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,20 +325,20 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 diff --git a/eng/Versions.props b/eng/Versions.props index 0fcc89477d21..3838e4f45075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -247,9 +247,9 @@ - 9.0.0-preview.24565.8 - 9.0.0-preview.24565.8 - 9.0.0-preview.24565.8 + 9.0.0-preview.24574.7 + 9.0.0-preview.24574.7 + 9.0.0-preview.24574.7 From 8f0fe517f1ffebb0c21a437001c95a22fa0aba71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:47:38 +0000 Subject: [PATCH 95/97] Update dependencies from https://github.com/dotnet/roslyn build 20241124.8 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24572.7 -> To Version 4.12.0-3.24574.8 --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad54035761bc..3e671e88b9f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,41 +97,41 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa - + https://github.com/dotnet/roslyn dfa7fc6bdea31a858a402168384192b633c811fa diff --git a/eng/Versions.props b/eng/Versions.props index 0fcc89477d21..745cef047d60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 - 4.12.0-3.24572.7 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 + 4.12.0-3.24574.8 From 5c8dfed63dbdbaf1d4f5254869b3d5d55da47708 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:48:05 +0000 Subject: [PATCH 96/97] Update dependencies from https://github.com/dotnet/sourcelink build 20241124.1 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24572.2 -> To Version 9.0.0-beta.24574.1 --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad54035761bc..c11a4c9a64a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -460,32 +460,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 - + https://github.com/dotnet/sourcelink 084a76b3adf59dfbdc5c3f7614979e309910fa50 diff --git a/eng/Versions.props b/eng/Versions.props index 0fcc89477d21..8cbbc3180d97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 + 9.0.0-beta.24574.1 + 9.0.0-beta.24574.1 + 9.0.0-beta.24574.1 + 9.0.0-beta.24574.1 + 9.0.0-beta.24574.1 + 9.0.0-beta.24574.1 From 4b15856324c622b181b188434662941937d04398 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Fri, 29 Nov 2024 00:42:12 -0800 Subject: [PATCH 97/97] Revert the changes in the eng folder --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 510970bdd316..a6769ea98880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -404,16 +404,16 @@ 1a54480f52703fb45fac2a6b955247d33758383e - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 diff --git a/eng/Versions.props b/eng/Versions.props index 2077afdeaf1c..56835faf5bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,8 +177,8 @@ - 9.0.0-preview.24574.2 - 3.11.0-beta1.24574.2 + 9.0.0-preview.24527.2 + 3.11.0-beta1.24527.2