From f9ad8bf8b00004d8735b7b95251d988c068ecd83 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 15 Aug 2024 18:41:34 +0000 Subject: [PATCH 001/702] 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 002/702] 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 003/702] 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 004/702] 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 005/702] 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 006/702] 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 007/702] 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 008/702] 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 009/702] 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 010/702] 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 011/702] 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 012/702] 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 013/702] 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 014/702] 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 015/702] 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 016/702] 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 017/702] 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 018/702] 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 019/702] 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 020/702] 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 021/702] 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 022/702] 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 023/702] 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 024/702] 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 025/702] 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 026/702] 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 027/702] 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 028/702] 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 029/702] 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 030/702] 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 031/702] 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 032/702] 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 033/702] 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 034/702] 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 24bed475f2c67199f839579188f3543af6e2befb Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 24 Sep 2024 23:59:09 +0000 Subject: [PATCH 035/702] Merged PR 43124: [internal/release/8.0.3xx] 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:471db9b4-49ec-4921-de46-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 471db9b4-49ec-4921-de46-08dc11e85c3a - **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 215b4dee67f4..e447f7d590a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,12 +5,18 @@ + + + + + + @@ -22,7 +28,7 @@ - + @@ -31,9 +37,13 @@ + + + + @@ -60,10 +70,14 @@ + + + + @@ -73,7 +87,7 @@ - + @@ -81,6 +95,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56303144bc5a..f07381016bfd 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 1108c26c9fac..9dcf230d5d58 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 56406cc59f8254beb5af50fb2f8d58f33b5ab71c Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 24 Sep 2024 23:59:10 +0000 Subject: [PATCH 036/702] 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 037/702] 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 038/702] 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 039/702] 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 040/702] 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 041/702] 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 042/702] 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 c99d8faa1e07e34c50ae718dc1e7dc1b0fcef6ce Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 3 Oct 2024 09:52:21 -0400 Subject: [PATCH 043/702] Split workload set tests into two classes --- .../WorkloadSetTests.cs | 287 +----------------- .../WorkloadSetTests2.cs | 165 ++++++++++ .../WorkloadSetTestsBase.cs | 144 +++++++++ 3 files changed, 325 insertions(+), 271 deletions(-) create mode 100644 test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs create mode 100644 test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs index afb526660a23..1c46957f732f 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs @@ -9,29 +9,10 @@ namespace Microsoft.DotNet.MsiInstallerTests { - public class WorkloadSetTests : VMTestBase + public class WorkloadSetTests : WorkloadSetTestsBase { - readonly string SdkTestingDirectory = @"C:\SdkTesting"; - - - Lazy> _testWorkloadSetVersions; - string WorkloadSetVersion1 => _testWorkloadSetVersions.Value["version1"]; - string WorkloadSetVersion2 => _testWorkloadSetVersions.Value["version2"]; - string WorkloadSetPreviousBandVersion => _testWorkloadSetVersions.Value.GetValueOrDefault("previousbandversion", "8.0.204"); - public WorkloadSetTests(ITestOutputHelper log) : base(log) { - _testWorkloadSetVersions = new Lazy>(() => - { - string remoteFilePath = @"c:\SdkTesting\workloadsets\testworkloadsetversions.json"; - var versionsFile = VM.GetRemoteFile(remoteFilePath); - if (!versionsFile.Exists) - { - throw new FileNotFoundException($"Could not find file {remoteFilePath} on VM"); - } - - return JsonSerializer.Deserialize>(versionsFile.ReadAllText()); - }); } [Fact] @@ -39,7 +20,7 @@ public void DoesNotUseWorkloadSetsByDefault() { InstallSdk(); - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute() .Should() .PassWithoutWarning(); @@ -48,7 +29,7 @@ public void DoesNotUseWorkloadSetsByDefault() AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute() .Should() .PassWithoutWarning(); @@ -59,42 +40,6 @@ public void DoesNotUseWorkloadSetsByDefault() } - void UpdateAndSwitchToWorkloadSetMode(out string updatedWorkloadVersion, out WorkloadSet rollbackAfterUpdate) - { - var featureBand = new SdkFeatureBand(SdkInstallerVersion).ToStringWithoutPrerelease(); - var originalWorkloadVersion = GetWorkloadVersion(); - originalWorkloadVersion.Should().StartWith($"{featureBand}-manifests."); - - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") - .Execute() - .Should() - .PassWithoutWarning(); - - rollbackAfterUpdate = GetRollback(); - updatedWorkloadVersion = GetWorkloadVersion(); - updatedWorkloadVersion.Should().StartWith($"{featureBand}-manifests."); - updatedWorkloadVersion.Should().NotBe(originalWorkloadVersion); - - GetUpdateMode().Should().Be("manifests"); - - VM.CreateRunCommand("dotnet", "workload", "config", "--update-mode", "workload-set") - .WithDescription("Switch mode to workload-set") - .Execute() - .Should() - .PassWithoutWarning(); - - GetWorkloadVersion().Should().Be(updatedWorkloadVersion); - - var expectedMessage = "Workloads are configured to install and update using workload versions, but none were found. Run \"dotnet workload restore\" to install a workload version."; - - GetDotnetInfo().Should().Contain(expectedMessage) - .And.NotContain("(not installed)"); - GetDotnetWorkloadInfo().Should().Contain(expectedMessage) - .And.NotContain("(not installed)"); - - GetUpdateMode().Should().Be("workload-set"); - } - [Fact] public void UpdateWithWorkloadSets() { @@ -104,7 +49,7 @@ public void UpdateWithWorkloadSets() AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); GetWorkloadVersion().Should().Be(WorkloadSetVersion2); @@ -121,7 +66,7 @@ public void UpdateInWorkloadSetModeWithNoAvailableWorkloadSet() UpdateAndSwitchToWorkloadSetMode(out string updatedWorkloadVersion, out WorkloadSet rollbackAfterUpdate); // Use a nonexistant source because there may be a valid workload set available on NuGet.org - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews", "--source", @"c:\SdkTesting\EmptySource") + CreateInstallingCommand("dotnet", "workload", "update", "--source", @"c:\SdkTesting\EmptySource") .Execute() .Should() .PassWithoutWarning(); @@ -154,7 +99,7 @@ private void UpdateToWorkloadSetVersion(string versionToInstall) AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - VM.CreateRunCommand("dotnet", "workload", "update", "--version", versionToInstall, "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update", "--version", versionToInstall) .Execute() .Should() .PassWithoutWarning(); @@ -172,7 +117,7 @@ private void UpdateToWorkloadSetVersion(string versionToInstall) GetWorkloadVersion().Should().Be(versionToInstall); - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute() .Should() .PassWithoutWarning(); @@ -189,7 +134,7 @@ public void UpdateToUnavailableWorkloadSetVersion() var workloadVersionBeforeUpdate = GetWorkloadVersion(); - VM.CreateRunCommand("dotnet", "workload", "update", "--version", unavailableWorkloadSetVersion, "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update", "--version", unavailableWorkloadSetVersion) .Execute() .Should() .Fail() @@ -215,7 +160,7 @@ public void UpdateWorkloadSetWithoutAvailableManifests() var workloadVersionBeforeUpdate = GetWorkloadVersion(); - VM.CreateRunCommand("dotnet", "workload", "update", "--source", @"c:\SdkTesting\workloadsets", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update", "--source", @"c:\SdkTesting\workloadsets") .Execute() .Should() .Fail(); @@ -236,7 +181,7 @@ public void UpdateToWorkloadSetVersionWithManifestsNotAvailable() var workloadVersionBeforeUpdate = GetWorkloadVersion(); - VM.CreateRunCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion2, "--source", @"c:\SdkTesting\workloadsets", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion2, "--source", @"c:\SdkTesting\workloadsets") .Execute() .Should() .Fail(); @@ -250,150 +195,6 @@ public void UpdateToWorkloadSetVersionWithManifestsNotAvailable() GetWorkloadVersion().Should().Be(workloadVersionBeforeUpdate); } - void SetupWorkloadSetInGlobalJson(out WorkloadSet originalRollback) - { - InstallSdk(); - - var versionToUpdateTo = WorkloadSetVersion2; - - string originalVersion = GetWorkloadVersion(); - - originalRollback = GetRollback(SdkTestingDirectory); - - VM.WriteFile("C:\\SdkTesting\\global.json", @$"{{""sdk"":{{""workloadVersion"":""{versionToUpdateTo}""}}}}").Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion(SdkTestingDirectory).Should().Be(versionToUpdateTo + " (not installed)"); - GetDotnetInfo(SdkTestingDirectory).Should().Contain("Workload version: " + versionToUpdateTo + " (not installed)") - .And.Contain($@"Workload version {versionToUpdateTo}, which was specified in C:\SdkTesting\global.json, was not found"); - GetDotnetWorkloadInfo(SdkTestingDirectory).Should().Contain("Workload version: " + versionToUpdateTo + " (not installed)") - .And.Contain($@"Workload version {versionToUpdateTo}, which was specified in C:\SdkTesting\global.json, was not found"); - - // The version should have changed but not yet the manifests. Since we expect both, getting the rollback should fail. - var result = VM.CreateRunCommand("dotnet", "workload", "update", "--print-rollback") - .WithWorkingDirectory(SdkTestingDirectory) - .WithIsReadOnly(true) - .Execute(); - - result.Should().Fail(); - result.StdErr.Should().Contain("FileNotFoundException"); - result.StdErr.Should().Contain(versionToUpdateTo); - - AddNuGetSource(@"C:\SdkTesting\workloadsets", SdkTestingDirectory); - } - - [Fact] - public void RestoreWorkloadSetViaGlobalJson() - { - InstallSdk(); - - var testProjectFolder = Path.Combine(SdkTestingDirectory, "ConsoleApp"); - VM.CreateRunCommand("dotnet", "new", "console", "-o", "ConsoleApp") - .WithWorkingDirectory(SdkTestingDirectory) - .Execute().Should().PassWithoutWarning(); - - SetupWorkloadSetInGlobalJson(out var originalRollback); - - VM.CreateRunCommand("dotnet", "workload", "restore") - .WithWorkingDirectory(testProjectFolder) - .Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion(SdkTestingDirectory).Should().Be(WorkloadSetVersion2); - - GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); - } - - [Theory] - [InlineData("update")] - [InlineData("install")] - public void UseGlobalJsonToSpecifyWorkloadSet(string command) - { - SetupWorkloadSetInGlobalJson(out var originalRollback); - - string[] args = command.Equals("install") ? ["dotnet", "workload", "install", "aspire"] : ["dotnet", "workload", command]; - VM.CreateRunCommand(args).WithWorkingDirectory(SdkTestingDirectory).Execute().Should().PassWithoutWarning(); - GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); - } - - [Fact] - public void DotnetInfoWithGlobalJson() - { - InstallSdk(); - - // Install a workload before setting up global.json. Commands like "dotnet workload --info" were previously crashing if global.json specified a workload set that wasn't installed - InstallWorkload("aspire", skipManifestUpdate: true); - - SetupWorkloadSetInGlobalJson(out _); - } - - [Fact] - public void InstallWithGlobalJsonAndSkipManifestUpdate() - { - SetupWorkloadSetInGlobalJson(out var originalRollback); - - VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update") - .WithWorkingDirectory(SdkTestingDirectory) - .Execute().Should().Fail() - .And.HaveStdErrContaining("--skip-manifest-update") - .And.HaveStdErrContaining(Path.Combine(SdkTestingDirectory, "global.json")); - } - - [Fact] - public void InstallWithVersionAndSkipManifestUpdate() - { - InstallSdk(); - - VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update", "--version", WorkloadSetVersion1) - .Execute().Should().Fail() - .And.HaveStdErrContaining("--skip-manifest-update") - .And.HaveStdErrContaining("--sdk-version"); - } - - [Fact] - public void InstallWithVersionWhenPinned() - { - InstallSdk(); - - AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - - string originalVersion = GetWorkloadVersion(); - originalVersion.Should().NotBe(WorkloadSetVersion1); - - VM.CreateRunCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion1, "--include-previews") - .Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion().Should().Be(WorkloadSetVersion1); - - VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--version", WorkloadSetVersion2) - .Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion().Should().Be(WorkloadSetVersion2); - } - - [Fact] - public void InstallWithGlobalJsonWhenPinned() - { - SetupWorkloadSetInGlobalJson(out var originalRollback); - - //AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - - string originalVersion = GetWorkloadVersion(); - originalVersion.Should().NotBe(WorkloadSetVersion1); - - VM.CreateRunCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion1, "--include-previews") - .Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion().Should().Be(WorkloadSetVersion1); - - VM.CreateRunCommand("dotnet", "workload", "install", "aspire") - .WithWorkingDirectory(SdkTestingDirectory) - .Execute().Should().PassWithoutWarning(); - - GetWorkloadVersion(SdkTestingDirectory).Should().Be(WorkloadSetVersion2); - - GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); - - } - [Fact] public void UpdateShouldNotPinWorkloadSet() { @@ -410,7 +211,7 @@ public void UpdateShouldNotPinWorkloadSet() VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg", $"Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.bak")) .Execute().Should().PassWithoutWarning(); - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); GetWorkloadVersion().Should().Be(WorkloadSetVersion1); @@ -452,7 +253,7 @@ public void GarbageCollectWorkloadSets() AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); // Update to latest workload set version - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); GetWorkloadVersion().Should().Be(WorkloadSetVersion2); @@ -475,12 +276,12 @@ public void GarbageCollectWorkloadSets() VM.WriteFile("C:\\SdkTesting\\global.json", @$"{{""sdk"":{{""workloadVersion"":""{WorkloadSetVersion1}""}}}}").Execute().Should().PassWithoutWarning(); // Install pinned version - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .WithWorkingDirectory(SdkTestingDirectory) .Execute().Should().PassWithoutWarning(); // Update globally installed version to later version - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); // Check workload versions in global context and global.json directory @@ -495,7 +296,7 @@ public void GarbageCollectWorkloadSets() VM.WriteFile("C:\\SdkTesting\\global.json", "{}").Execute().Should().PassWithoutWarning(); // Run workload update to do a GC - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); // Workload set 1 should have been GC'd @@ -557,7 +358,7 @@ public void WorkloadSearchVersion() var searchResultWorkloadSet = WorkloadSet.FromDictionaryForJson(JsonSerializer.Deserialize>(searchResultJson["manifestVersions"]), new SdkFeatureBand(SdkInstallerVersion)); // Update to the workload set version we got the search info from so we can check to see if the manifest versions match what we expect - VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews", "--version", WorkloadSetVersion2) + CreateInstallingCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion2) .Execute() .Should() .PassWithoutWarning(); @@ -565,61 +366,5 @@ public void WorkloadSearchVersion() GetRollback().ManifestVersions.Should().BeEquivalentTo(searchResultWorkloadSet.ManifestVersions); } - string GetWorkloadVersion(string workingDirectory = null) - { - var result = VM.CreateRunCommand("dotnet", "workload", "--version") - .WithWorkingDirectory(workingDirectory) - .WithIsReadOnly(true) - .Execute(); - - result.Should().PassWithoutWarning(); - - return result.StdOut; - } - - string GetDotnetInfo(string workingDirectory = null) - { - var result = VM.CreateRunCommand("dotnet", "--info") - .WithWorkingDirectory(workingDirectory) - .WithIsReadOnly(true) - .Execute(); - - result.Should().PassWithoutWarning(); - - return result.StdOut; - } - - string GetDotnetWorkloadInfo(string workingDirectory = null) - { - var result = VM.CreateRunCommand("dotnet", "workload", "--info") - .WithWorkingDirectory(workingDirectory) - .WithIsReadOnly(true) - .Execute(); - - result.Should().PassWithoutWarning(); - - return result.StdOut; - } - - string GetUpdateMode() - { - var result = VM.CreateRunCommand("dotnet", "workload", "config", "--update-mode") - .WithIsReadOnly(true) - .Execute(); - - result.Should().PassWithoutWarning(); - - return result.StdOut; - } - - void AddNuGetSource(string source, string directory = null) - { - VM.CreateRunCommand("dotnet", "nuget", "add", "source", source) - .WithWorkingDirectory(directory) - .WithDescription($"Add {source} to NuGet.config") - .Execute() - .Should() - .PassWithoutWarning(); - } } } diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs new file mode 100644 index 000000000000..25b664d704f3 --- /dev/null +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs @@ -0,0 +1,165 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.DotNet.MsiInstallerTests.Framework; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.MsiInstallerTests +{ + public class WorkloadSetTests2 : WorkloadSetTestsBase + { + public WorkloadSetTests2(ITestOutputHelper log) : base(log) + { + } + + void SetupWorkloadSetInGlobalJson(out WorkloadSet originalRollback) + { + InstallSdk(); + + var versionToUpdateTo = WorkloadSetVersion2; + + string originalVersion = GetWorkloadVersion(); + + originalRollback = GetRollback(SdkTestingDirectory); + + VM.WriteFile("C:\\SdkTesting\\global.json", @$"{{""sdk"":{{""workloadVersion"":""{versionToUpdateTo}""}}}}").Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion(SdkTestingDirectory).Should().Be(versionToUpdateTo + " (not installed)"); + GetDotnetInfo(SdkTestingDirectory).Should().Contain("Workload version: " + versionToUpdateTo + " (not installed)") + .And.Contain($@"Workload version {versionToUpdateTo}, which was specified in C:\SdkTesting\global.json, was not found"); + GetDotnetWorkloadInfo(SdkTestingDirectory).Should().Contain("Workload version: " + versionToUpdateTo + " (not installed)") + .And.Contain($@"Workload version {versionToUpdateTo}, which was specified in C:\SdkTesting\global.json, was not found"); + + // The version should have changed but not yet the manifests. Since we expect both, getting the rollback should fail. + var result = VM.CreateRunCommand("dotnet", "workload", "update", "--print-rollback") + .WithWorkingDirectory(SdkTestingDirectory) + .WithIsReadOnly(true) + .Execute(); + + result.Should().Fail(); + result.StdErr.Should().Contain("FileNotFoundException"); + result.StdErr.Should().Contain(versionToUpdateTo); + + AddNuGetSource(@"C:\SdkTesting\workloadsets", SdkTestingDirectory); + } + + [Fact] + public void RestoreWorkloadSetViaGlobalJson() + { + InstallSdk(); + + var testProjectFolder = Path.Combine(SdkTestingDirectory, "ConsoleApp"); + VM.CreateRunCommand("dotnet", "new", "console", "-o", "ConsoleApp") + .WithWorkingDirectory(SdkTestingDirectory) + .Execute().Should().PassWithoutWarning(); + + SetupWorkloadSetInGlobalJson(out var originalRollback); + + VM.CreateRunCommand("dotnet", "workload", "restore") + .WithWorkingDirectory(testProjectFolder) + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion(SdkTestingDirectory).Should().Be(WorkloadSetVersion2); + + GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); + } + + [Theory] + [InlineData("update")] + [InlineData("install")] + public void UseGlobalJsonToSpecifyWorkloadSet(string command) + { + SetupWorkloadSetInGlobalJson(out var originalRollback); + + string[] args = command.Equals("install") ? ["dotnet", "workload", "install", "aspire"] : ["dotnet", "workload", command]; + VM.CreateRunCommand(args).WithWorkingDirectory(SdkTestingDirectory).Execute().Should().PassWithoutWarning(); + GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); + } + + [Fact] + public void InstallWithGlobalJsonAndSkipManifestUpdate() + { + SetupWorkloadSetInGlobalJson(out var originalRollback); + + VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update") + .WithWorkingDirectory(SdkTestingDirectory) + .Execute().Should().Fail() + .And.HaveStdErrContaining("--skip-manifest-update") + .And.HaveStdErrContaining(Path.Combine(SdkTestingDirectory, "global.json")); + } + + [Fact] + public void InstallWithVersionAndSkipManifestUpdate() + { + InstallSdk(); + + VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update", "--version", WorkloadSetVersion1) + .Execute().Should().Fail() + .And.HaveStdErrContaining("--skip-manifest-update") + .And.HaveStdErrContaining("--sdk-version"); + } + + [Fact] + public void InstallWithVersionWhenPinned() + { + InstallSdk(); + + AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); + + string originalVersion = GetWorkloadVersion(); + originalVersion.Should().NotBe(WorkloadSetVersion1); + + CreateInstallingCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion1) + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion().Should().Be(WorkloadSetVersion1); + + VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--version", WorkloadSetVersion2) + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion().Should().Be(WorkloadSetVersion2); + } + + [Fact] + public void InstallWithGlobalJsonWhenPinned() + { + SetupWorkloadSetInGlobalJson(out var originalRollback); + + //AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); + + string originalVersion = GetWorkloadVersion(); + originalVersion.Should().NotBe(WorkloadSetVersion1); + + CreateInstallingCommand("dotnet", "workload", "update", "--version", WorkloadSetVersion1) + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion().Should().Be(WorkloadSetVersion1); + + VM.CreateRunCommand("dotnet", "workload", "install", "aspire") + .WithWorkingDirectory(SdkTestingDirectory) + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion(SdkTestingDirectory).Should().Be(WorkloadSetVersion2); + + GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback); + + } + + [Fact] + public void DotnetInfoWithGlobalJson() + { + InstallSdk(); + + // Install a workload before setting up global.json. Commands like "dotnet workload --info" were previously crashing if global.json specified a workload set that wasn't installed + InstallWorkload("aspire", skipManifestUpdate: true); + + SetupWorkloadSetInGlobalJson(out _); + } + + } +} diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs new file mode 100644 index 000000000000..9d3ffd8406d2 --- /dev/null +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs @@ -0,0 +1,144 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.Json; +using System.Threading.Tasks; +using Microsoft.DotNet.MsiInstallerTests.Framework; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.MsiInstallerTests +{ + public class WorkloadSetTestsBase : VMTestBase + { + protected readonly string SdkTestingDirectory = @"C:\SdkTesting"; + + + protected Lazy> _testWorkloadSetVersions; + protected string WorkloadSetVersion1 => _testWorkloadSetVersions.Value["version1"]; + protected string WorkloadSetVersion2 => _testWorkloadSetVersions.Value["version2"]; + protected string WorkloadSetPreviousBandVersion => _testWorkloadSetVersions.Value.GetValueOrDefault("previousbandversion", "8.0.204"); + + protected bool NeedsIncludePreviews => bool.Parse(_testWorkloadSetVersions.Value.GetValueOrDefault("needsIncludePreviews", "false")); + public WorkloadSetTestsBase(ITestOutputHelper log) : base(log) + { + _testWorkloadSetVersions = new Lazy>(() => + { + string remoteFilePath = @"c:\SdkTesting\workloadsets\testworkloadsetversions.json"; + var versionsFile = VM.GetRemoteFile(remoteFilePath); + if (!versionsFile.Exists) + { + throw new FileNotFoundException($"Could not find file {remoteFilePath} on VM"); + } + + return JsonSerializer.Deserialize>(versionsFile.ReadAllText()); + }); + } + + protected void UpdateAndSwitchToWorkloadSetMode(out string updatedWorkloadVersion, out WorkloadSet rollbackAfterUpdate) + { + var featureBand = new SdkFeatureBand(SdkInstallerVersion).ToStringWithoutPrerelease(); + var originalWorkloadVersion = GetWorkloadVersion(); + originalWorkloadVersion.Should().StartWith($"{featureBand}-manifests."); + + CreateInstallingCommand("dotnet", "workload", "update") + .Execute() + .Should() + .PassWithoutWarning(); + + rollbackAfterUpdate = GetRollback(); + updatedWorkloadVersion = GetWorkloadVersion(); + updatedWorkloadVersion.Should().StartWith($"{featureBand}-manifests."); + updatedWorkloadVersion.Should().NotBe(originalWorkloadVersion); + + GetUpdateMode().Should().Be("manifests"); + + VM.CreateRunCommand("dotnet", "workload", "config", "--update-mode", "workload-set") + .WithDescription("Switch mode to workload-set") + .Execute() + .Should() + .PassWithoutWarning(); + + GetWorkloadVersion().Should().Be(updatedWorkloadVersion); + + var expectedMessage = "Workloads are configured to install and update using workload versions, but none were found. Run \"dotnet workload restore\" to install a workload version."; + + GetDotnetInfo().Should().Contain(expectedMessage) + .And.NotContain("(not installed)"); + GetDotnetWorkloadInfo().Should().Contain(expectedMessage) + .And.NotContain("(not installed)"); + + GetUpdateMode().Should().Be("workload-set"); + } + + internal string GetWorkloadVersion(string workingDirectory = null) + { + var result = VM.CreateRunCommand("dotnet", "workload", "--version") + .WithWorkingDirectory(workingDirectory) + .WithIsReadOnly(true) + .Execute(); + + result.Should().PassWithoutWarning(); + + return result.StdOut; + } + + internal string GetDotnetInfo(string workingDirectory = null) + { + var result = VM.CreateRunCommand("dotnet", "--info") + .WithWorkingDirectory(workingDirectory) + .WithIsReadOnly(true) + .Execute(); + + result.Should().PassWithoutWarning(); + + return result.StdOut; + } + + internal string GetDotnetWorkloadInfo(string workingDirectory = null) + { + var result = VM.CreateRunCommand("dotnet", "workload", "--info") + .WithWorkingDirectory(workingDirectory) + .WithIsReadOnly(true) + .Execute(); + + result.Should().PassWithoutWarning(); + + return result.StdOut; + } + + internal string GetUpdateMode() + { + var result = VM.CreateRunCommand("dotnet", "workload", "config", "--update-mode") + .WithIsReadOnly(true) + .Execute(); + + result.Should().PassWithoutWarning(); + + return result.StdOut; + } + + internal void AddNuGetSource(string source, string directory = null) + { + VM.CreateRunCommand("dotnet", "nuget", "add", "source", source) + .WithWorkingDirectory(directory) + .WithDescription($"Add {source} to NuGet.config") + .Execute() + .Should() + .PassWithoutWarning(); + } + + // Creates a command and possibly adds "--include-previews" to the argument list + internal VMRunAction CreateInstallingCommand(params string[] args) + { + if (NeedsIncludePreviews) + { + args = [.. args, "--include-previews"]; + } + return VM.CreateRunCommand(args); + } + } +} From dddbe450e71dec51c8ba929dd3a897d6b21dceb5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 4 Oct 2024 09:44:28 -0400 Subject: [PATCH 044/702] Improve VM test resiliency --- .../Framework/VMAction.cs | 3 ++ .../Framework/VMTestBase.cs | 2 +- .../Framework/VirtualMachine.cs | 33 ++++++++++++++----- .../WorkloadSetTestsBase.cs | 2 +- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/test/dotnet-MsiInstallation.Tests/Framework/VMAction.cs b/test/dotnet-MsiInstallation.Tests/Framework/VMAction.cs index 9a7cb527cca7..8b57eb4fdc5a 100644 --- a/test/dotnet-MsiInstallation.Tests/Framework/VMAction.cs +++ b/test/dotnet-MsiInstallation.Tests/Framework/VMAction.cs @@ -214,6 +214,9 @@ class SerializedVMAction // Applies to CopyFileToVM, CopyFolderToVM, MoveFolderOnVM, WriteFileToVM, GetRemoteDirectory, GetRemoteFile public string TargetPath { get; set; } + // Applies to GetRemoteDirectory, GetRemoteFile + public bool MustExist { get; set; } + // Applies to CopyFileToVM, CopyFolderToVM, MoveFolderOnVM public string SourcePath { get; set; } diff --git a/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs b/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs index b36257611896..13da5561dec5 100644 --- a/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs +++ b/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs @@ -23,7 +23,7 @@ public VMTestBase(ITestOutputHelper log) : base(log) } else { - var sdkTestingDir = VM.GetRemoteDirectory(@"c:\SdkTesting"); + var sdkTestingDir = VM.GetRemoteDirectory(@"c:\SdkTesting", mustExist: true); string installerPrefix = "dotnet-sdk-"; string installerSuffix = "-win-x64.exe"; diff --git a/test/dotnet-MsiInstallation.Tests/Framework/VirtualMachine.cs b/test/dotnet-MsiInstallation.Tests/Framework/VirtualMachine.cs index d22de7ecce86..b1b9b1d0ec24 100644 --- a/test/dotnet-MsiInstallation.Tests/Framework/VirtualMachine.cs +++ b/test/dotnet-MsiInstallation.Tests/Framework/VirtualMachine.cs @@ -244,14 +244,14 @@ public VMGroupedAction CreateActionGroup(string name, params VMAction[] actions) }; } - public RemoteFile GetRemoteFile(string path) + public RemoteFile GetRemoteFile(string path, bool mustExist = false) { - return new VMRemoteFile(this, path); + return new VMRemoteFile(this, path, mustExist); } - public RemoteDirectory GetRemoteDirectory(string path) + public RemoteDirectory GetRemoteDirectory(string path, bool mustExist = false) { - return new VMRemoteDirectory(this, path); + return new VMRemoteDirectory(this, path, mustExist); } public VMSnapshot CreateSnapshot() @@ -400,6 +400,11 @@ VMActionResult Run(SerializedVMAction action) else { result.Exists = false; + if (action.MustExist) + { + // Sometimes a directory that exists on the VM seems not to be found, this lets us avoid caching a bad result + throw new DirectoryNotFoundException($"Expected to find directory {action.TargetPath} on VM, but it was not found."); + } } return result; } @@ -415,6 +420,11 @@ VMActionResult Run(SerializedVMAction action) else { result.Exists = false; + if (action.MustExist) + { + // Sometimes a file that exists on the VM seems not to be found, this lets us avoid caching a bad result + throw new DirectoryNotFoundException($"Expected to find directory {action.TargetPath} on VM, but it was not found."); + } } return result; } @@ -508,9 +518,11 @@ string SharePathToVMPath(string sharePath) class VMRemoteFile : RemoteFile { VirtualMachine _vm; - public VMRemoteFile(VirtualMachine vm, string path) : base(path) + bool _mustExist; + public VMRemoteFile(VirtualMachine vm, string path, bool mustExist) : base(path) { _vm = vm; + _mustExist = mustExist; } VMActionResult GetResult() @@ -519,7 +531,8 @@ VMActionResult GetResult() { Type = VMActionType.GetRemoteFile, TargetPath = Path, - IsReadOnly = true + IsReadOnly = true, + MustExist = _mustExist }); } @@ -539,9 +552,12 @@ public override string ReadAllText() class VMRemoteDirectory : RemoteDirectory { VirtualMachine _vm; - public VMRemoteDirectory(VirtualMachine vm, string path) : base(path) + bool _mustExist; + + public VMRemoteDirectory(VirtualMachine vm, string path, bool mustExist) : base(path) { _vm = vm; + _mustExist = mustExist; } VMActionResult GetResult() @@ -550,7 +566,8 @@ VMActionResult GetResult() { Type = VMActionType.GetRemoteDirectory, TargetPath = Path, - IsReadOnly = true + IsReadOnly = true, + MustExist = _mustExist }); } diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs index 9d3ffd8406d2..345801d733f0 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs @@ -28,7 +28,7 @@ public WorkloadSetTestsBase(ITestOutputHelper log) : base(log) _testWorkloadSetVersions = new Lazy>(() => { string remoteFilePath = @"c:\SdkTesting\workloadsets\testworkloadsetversions.json"; - var versionsFile = VM.GetRemoteFile(remoteFilePath); + var versionsFile = VM.GetRemoteFile(remoteFilePath, mustExist: true); if (!versionsFile.Exists) { throw new FileNotFoundException($"Could not find file {remoteFilePath} on VM"); From 9636d51670854c6b47d824fe07edbce8cefbddbf Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 4 Oct 2024 09:45:14 -0400 Subject: [PATCH 045/702] Fix test to work with preview and stable workload set versions --- .../WorkloadSetTests.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs index 1c46957f732f..543ad5070d0f 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs @@ -205,10 +205,10 @@ public void UpdateShouldNotPinWorkloadSet() var packageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(WorkloadSetVersion2, out var sdkFeatureBand); - // Rename latest workload set so it won't be installed VM.CreateActionGroup($"Disable {WorkloadSetVersion2}", - VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.nupkg", $"Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.bak"), - VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg", $"Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.bak")) + VM.CreateRunCommand("cmd", "/c", "mkdir", @"c:\SdkTesting\DisabledWorkloadSets"), + VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets"), + VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets")) .Execute().Should().PassWithoutWarning(); CreateInstallingCommand("dotnet", "workload", "update") @@ -218,8 +218,7 @@ public void UpdateShouldNotPinWorkloadSet() // Bring latest workload set version back, so installing workload should update to it VM.CreateActionGroup($"Enable {WorkloadSetVersion2}", - VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.bak", $"Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.nupkg"), - VM.CreateRunCommand("cmd", "/c", "ren", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.bak", $"Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg")) + VM.CreateRunCommand("cmd", "/c", "move", @"c:\SdkTesting\DisabledWorkloadSets\*.nupkg", @"c:\SdkTesting\WorkloadSets")) .Execute().Should().PassWithoutWarning(); InstallWorkload("aspire", skipManifestUpdate: false); @@ -227,14 +226,14 @@ public void UpdateShouldNotPinWorkloadSet() GetWorkloadVersion().Should().Be(WorkloadSetVersion2); } - [Fact] + [Fact(Skip = "Not Implemented")] public void WorkloadSetInstallationRecordIsWrittenCorrectly() { // Should the workload set version or the package version be used in the registry? throw new NotImplementedException(); } - [Fact] + [Fact(Skip = "Not Implemented")] public void TurnOffWorkloadSetUpdateMode() { // If you have a workload set installed and then turn off workload set update mode, what should happen? @@ -319,6 +318,7 @@ public void FinalizerUninstallsWorkloadSets() VM.GetRemoteDirectory(workloadSetPath).Should().NotExist(); } + // Note: this may fail for rtm-branded non-stabilized SDKs: https://github.com/dotnet/sdk/issues/43890 [Fact] public void WorkloadSearchVersion() { From 17d6233c3650faf643c8c9202d13ad89baf3260f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 4 Oct 2024 16:25:38 -0400 Subject: [PATCH 046/702] Add tests for preview / feed change workload set "downgrade" --- .../Framework/VMTestBase.cs | 20 ++++++--- .../WorkloadSetTests.cs | 8 +--- .../WorkloadSetTests2.cs | 45 +++++++++++++++++++ .../WorkloadSetTestsBase.cs | 16 ++++++- 4 files changed, 74 insertions(+), 15 deletions(-) diff --git a/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs b/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs index 13da5561dec5..e245a508ac1c 100644 --- a/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs +++ b/test/dotnet-MsiInstallation.Tests/Framework/VMTestBase.cs @@ -52,6 +52,8 @@ public virtual void Dispose() VM.Dispose(); } + protected virtual bool NeedsIncludePreviews => false; + Lazy _sdkInstallerVersion; private bool _sdkInstalled = false; @@ -130,7 +132,7 @@ protected void DeployStage2Sdk() .WithIsReadOnly(true) .Execute(); - result.Should().Pass(); + result.Should().PassWithoutWarning(); string existingVersionToOverwrite = result.StdOut; @@ -185,13 +187,17 @@ protected string GetInstalledSdkVersion() var command = VM.CreateRunCommand("dotnet", "--version"); command.IsReadOnly = true; var result = command.Execute(); - result.Should().Pass(); + result.Should().PassWithoutWarning(); return result.StdOut; } protected CommandResult InstallWorkload(string workloadName, bool skipManifestUpdate) { - string [] args = { "dotnet", "workload", "install", workloadName, "--include-previews"}; + string [] args = { "dotnet", "workload", "install", workloadName}; + if (NeedsIncludePreviews) + { + args = [.. args, "--include-previews"]; + } if (skipManifestUpdate) { args = [.. args, "--skip-manifest-update"]; @@ -201,7 +207,7 @@ protected CommandResult InstallWorkload(string workloadName, bool skipManifestUp .WithDescription($"Install {workloadName} workload") .Execute(); - result.Should().Pass(); + result.Should().PassWithoutWarning(); return result; } @@ -213,7 +219,7 @@ protected WorkloadSet GetRollback(string directory = null) .WithIsReadOnly(true) .Execute(); - result.Should().Pass(); + result.Should().PassWithoutWarning(); return ParseRollbackOutput(result.StdOut); } @@ -233,7 +239,7 @@ protected string GetWorkloadVersion() .WithIsReadOnly(true) .Execute(); - result.Should().Pass(); + result.Should().PassWithoutWarning(); return result.StdOut; } @@ -244,7 +250,7 @@ protected void AddNuGetSource(string source) .WithDescription($"Add {source} to NuGet.config") .Execute() .Should() - .Pass(); + .PassWithoutWarning(); } } } diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs index 543ad5070d0f..6959b241b2ba 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs @@ -203,13 +203,7 @@ public void UpdateShouldNotPinWorkloadSet() AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); - var packageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(WorkloadSetVersion2, out var sdkFeatureBand); - - VM.CreateActionGroup($"Disable {WorkloadSetVersion2}", - VM.CreateRunCommand("cmd", "/c", "mkdir", @"c:\SdkTesting\DisabledWorkloadSets"), - VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets"), - VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets")) - .Execute().Should().PassWithoutWarning(); + RemoveWorkloadSetFromLocalSource(WorkloadSetVersion2); CreateInstallingCommand("dotnet", "workload", "update") .Execute().Should().PassWithoutWarning(); diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs index 25b664d704f3..bbdc43c839e6 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests2.cs @@ -161,5 +161,50 @@ public void DotnetInfoWithGlobalJson() SetupWorkloadSetInGlobalJson(out _); } + [Theory] + [InlineData(true)] + [InlineData(false)] + public void UpdateDoesNotTryToInstallOlderWorkloadSet(bool usePreview) + { + if (NeedsIncludePreviews && usePreview) + { + // This version of the test can't run when all of the test workload sets are previews + return; + } + + InstallSdk(); + + UpdateAndSwitchToWorkloadSetMode(out string _, out WorkloadSet rollbackAfterUpdate); + + AddNuGetSource(@"c:\SdkTesting\WorkloadSets"); + + if (usePreview) + { + RemoveWorkloadSetFromLocalSource(WorkloadSetVersion2); + } + + VM.CreateRunCommand("dotnet", "workload", "update", "--include-previews") + .Execute().Should().PassWithoutWarning(); + + GetWorkloadVersion().Should().Be(usePreview ? WorkloadSetVersionPreview : WorkloadSetVersion2); + + if (!usePreview) + { + RemoveWorkloadSetFromLocalSource(WorkloadSetVersion2); + } + + InstallWorkload("aspire", skipManifestUpdate: false) + .Should().NotHaveStdOutContaining("Installing workload version") + .And.NotHaveStdOutContaining("microsoft.net.workloads."); + + if (usePreview) + { + GetWorkloadVersion().Should().Be(WorkloadSetVersionPreview); + } + else + { + GetWorkloadVersion().Should().Be(WorkloadSetVersion2); + } + } } } diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs index 345801d733f0..bbb6607ac502 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTestsBase.cs @@ -8,6 +8,7 @@ using System.Text.Json; using System.Threading.Tasks; using Microsoft.DotNet.MsiInstallerTests.Framework; +using Microsoft.DotNet.Workloads.Workload; using Microsoft.NET.Sdk.WorkloadManifestReader; namespace Microsoft.DotNet.MsiInstallerTests @@ -19,10 +20,11 @@ public class WorkloadSetTestsBase : VMTestBase protected Lazy> _testWorkloadSetVersions; protected string WorkloadSetVersion1 => _testWorkloadSetVersions.Value["version1"]; + protected string WorkloadSetVersionPreview => _testWorkloadSetVersions.Value["versionpreview"]; protected string WorkloadSetVersion2 => _testWorkloadSetVersions.Value["version2"]; protected string WorkloadSetPreviousBandVersion => _testWorkloadSetVersions.Value.GetValueOrDefault("previousbandversion", "8.0.204"); - protected bool NeedsIncludePreviews => bool.Parse(_testWorkloadSetVersions.Value.GetValueOrDefault("needsIncludePreviews", "false")); + protected override bool NeedsIncludePreviews => bool.Parse(_testWorkloadSetVersions.Value.GetValueOrDefault("needsIncludePreviews", "false")); public WorkloadSetTestsBase(ITestOutputHelper log) : base(log) { _testWorkloadSetVersions = new Lazy>(() => @@ -140,5 +142,17 @@ internal VMRunAction CreateInstallingCommand(params string[] args) } return VM.CreateRunCommand(args); } + + // Moves workload set packages for a given version from C:\SdkTesting\WorkloadSets to C:\SdkTesting\DisabledWorkloadSets + protected void RemoveWorkloadSetFromLocalSource(string workloadSetVersion) + { + var packageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out var sdkFeatureBand); + + VM.CreateActionGroup($"Disable {workloadSetVersion}", + VM.CreateRunCommand("cmd", "/c", "mkdir", @"c:\SdkTesting\DisabledWorkloadSets"), + VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets"), + VM.CreateRunCommand("cmd", "/c", "move", @$"c:\SdkTesting\WorkloadSets\Microsoft.NET.Workloads.{sdkFeatureBand}.*.{packageVersion}.nupkg", @"c:\SdkTesting\DisabledWorkloadSets")) + .Execute().Should().PassWithoutWarning(); + } } } From 3ea8dc0fe3f07a3b425c2784f802f3e348a26303 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 4 Oct 2024 18:46:02 -0400 Subject: [PATCH 047/702] Test updates --- test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs index 6959b241b2ba..20e2e58f9a29 100644 --- a/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs +++ b/test/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs @@ -56,6 +56,13 @@ public void UpdateWithWorkloadSets() var newRollback = GetRollback(); newRollback.ManifestVersions.Should().NotBeEquivalentTo(rollbackAfterUpdate.ManifestVersions); + + // A second workload update command should not try to install any updates + CreateInstallingCommand("dotnet", "workload", "update") + .Execute().Should().PassWithoutWarning() + .And.HaveStdOutContaining("No workload update found") + .And.NotHaveStdOutContaining("Installing workload version"); + } [Fact] @@ -296,6 +303,7 @@ public void GarbageCollectWorkloadSets() VM.GetRemoteDirectory(workloadSet1Path).Should().NotExist(); } + // Note: this may fail due to https://github.com/dotnet/sdk/issues/43876 [Fact] public void FinalizerUninstallsWorkloadSets() { From 1a18cb6d08ad70f35052023cdbf20c9f6f7274b1 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 4 Oct 2024 18:46:22 -0400 Subject: [PATCH 048/702] Don't try to install same or lower workload set version when updating --- src/Cli/dotnet/commands/InstallingWorkloadCommand.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index 39152b02200f..8f8f2295333b 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -221,6 +221,18 @@ protected void UpdateWorkloadManifests(WorkloadHistoryRecorder recorder, ITransa if (updateToLatestWorkloadSet) { resolvedWorkloadSetVersion = _workloadManifestUpdater.GetAdvertisedWorkloadSetVersion(); + var currentWorkloadVersionInfo = _workloadResolver.GetWorkloadVersion(); + if (resolvedWorkloadSetVersion != null && currentWorkloadVersionInfo.IsInstalled && !currentWorkloadVersionInfo.WorkloadSetsEnabledWithoutWorkloadSet) + { + var currentPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(currentWorkloadVersionInfo.Version, out var currentWorkloadSetSdkFeatureBand); + var advertisedPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(resolvedWorkloadSetVersion, out var advertisedWorkloadSetSdkFeatureBand); + + if (currentWorkloadSetSdkFeatureBand > advertisedWorkloadSetSdkFeatureBand || + new NuGetVersion(currentPackageVersion) >= new NuGetVersion(advertisedPackageVersion)) + { + resolvedWorkloadSetVersion = null; + } + } } } From 15f669987b78af9080051e6bf2852edae434042e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 8 Oct 2024 14:27:32 -0700 Subject: [PATCH 049/702] Switch back to 17.8.3 for the minimum msbuild version Nuget 6.11.1 switched back to depending on 17.8 so we should be able to revert this back --- src/Layout/redist/minimumMSBuildVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layout/redist/minimumMSBuildVersion b/src/Layout/redist/minimumMSBuildVersion index 902d6768567b..616f65ff5653 100644 --- a/src/Layout/redist/minimumMSBuildVersion +++ b/src/Layout/redist/minimumMSBuildVersion @@ -1 +1 @@ -17.9.5 +17.8.3 From 713b2d9c06c3a55077bfd8b4375e81c712133aaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:20:23 +0000 Subject: [PATCH 050/702] 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 051/702] 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 052/702] 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 053/702] 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 054/702] 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 055/702] 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 056/702] 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 057/702] 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 43236e2ea5c40a677a0ec084e6bd79eddb76c5b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 12:51:53 +0000 Subject: [PATCH 058/702] Update dependencies from https://github.com/dotnet/templating build 20241011.9 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.307-servicing.24508.7 -> To Version 8.0.307-servicing.24511.9 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index f69b61d55f93..f43c63d84ffc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 769afe7aef8c..514df3e14f69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - e211ed404673c14b49856df9b4cddfa1e4b2d5e4 + c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac - + https://github.com/dotnet/templating - e211ed404673c14b49856df9b4cddfa1e4b2d5e4 + c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac - + https://github.com/dotnet/templating - e211ed404673c14b49856df9b4cddfa1e4b2d5e4 + c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac diff --git a/eng/Versions.props b/eng/Versions.props index 40bc49b06aab..ff3508811d0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.307-servicing.24508.7 + 8.0.307-servicing.24511.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c387538a3af25290f5feb8d47df9266c5e9658d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 12:52:19 +0000 Subject: [PATCH 059/702] 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 --- 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 769afe7aef8c..38c7b5d8aafe 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 3375757cc49eb5abb4823b13cbd0739162b5c21d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:46:25 +0000 Subject: [PATCH 060/702] Update dependencies from https://github.com/dotnet/razor build 20241011.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24502.3 -> To Version 7.0.0-preview.24511.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50dc0bf96e4e..a27a08040269 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - 0575e9ecbf8262b357fe83ec71911476a23d642d + f58562f808dce796229915605ca9883cbe629779 - + https://github.com/dotnet/razor - 0575e9ecbf8262b357fe83ec71911476a23d642d + f58562f808dce796229915605ca9883cbe629779 - + https://github.com/dotnet/razor - 0575e9ecbf8262b357fe83ec71911476a23d642d + f58562f808dce796229915605ca9883cbe629779 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ff3508811d0c..5eaee49411cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.24502.3 - 7.0.0-preview.24502.3 - 7.0.0-preview.24502.3 + 7.0.0-preview.24511.2 + 7.0.0-preview.24511.2 + 7.0.0-preview.24511.2 From 7f0ea08bbe7ebbd73f94dee5dc3c9a1c89f0f930 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:46:49 +0000 Subject: [PATCH 061/702] Update dependencies from https://github.com/dotnet/roslyn build 20241011.8 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.10.0-3.24468.7 -> To Version 4.10.0-3.24511.8 --- 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 50dc0bf96e4e..804ccd6cc6de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 86f5186deeea364bd8541d51657e52a54b2a96b2 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e36f0755bf88c0e40f5b6a607d4f6b520642b814 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ff3508811d0c..c098bf88422a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,13 +158,13 @@ - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 - 4.10.0-3.24468.7 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 + 4.10.0-3.24511.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 105731ea3d401438b7575f069e495c87ee9e03b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Oct 2024 12:53:10 +0000 Subject: [PATCH 062/702] Update dependencies from https://github.com/dotnet/razor build 20241011.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24502.7 -> To Version 9.0.0-preview.24511.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dc569662f1b..9a5a2f4bb181 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - 8b1b103ae8587094180fd43303622205c83e2f71 + 5d7617757a7a2928f7f475a44b337ba201a70b59 - + https://github.com/dotnet/razor - 8b1b103ae8587094180fd43303622205c83e2f71 + 5d7617757a7a2928f7f475a44b337ba201a70b59 - + https://github.com/dotnet/razor - 8b1b103ae8587094180fd43303622205c83e2f71 + 5d7617757a7a2928f7f475a44b337ba201a70b59 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5555a5b2e789..d98478129dd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24502.7 - 9.0.0-preview.24502.7 - 9.0.0-preview.24502.7 + 9.0.0-preview.24511.3 + 9.0.0-preview.24511.3 + 9.0.0-preview.24511.3 From 8c383f3816cc4da50ec0d390bdacdaf15bc03a18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Oct 2024 01:58:38 +0000 Subject: [PATCH 063/702] 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 62c7d8ddc2d5ee59069f8f98a8e55a744299a4c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Oct 2024 12:52:03 +0000 Subject: [PATCH 064/702] Update dependencies from https://github.com/dotnet/razor build 20241015.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24511.2 -> To Version 7.0.0-preview.24515.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a888bb62e9d0..8c0fa4f9afae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - f58562f808dce796229915605ca9883cbe629779 + 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 - + https://github.com/dotnet/razor - f58562f808dce796229915605ca9883cbe629779 + 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 - + https://github.com/dotnet/razor - f58562f808dce796229915605ca9883cbe629779 + 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a933db6515cb..2810826f8654 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.24511.2 - 7.0.0-preview.24511.2 - 7.0.0-preview.24511.2 + 7.0.0-preview.24515.3 + 7.0.0-preview.24515.3 + 7.0.0-preview.24515.3 From f67975960cef7bce1901549b21434c3634ea216b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Oct 2024 13:01:45 +0000 Subject: [PATCH 065/702] Update dependencies from https://github.com/dotnet/razor build 20241015.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24511.3 -> To Version 9.0.0-preview.24515.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a5a2f4bb181..6589c279ddb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - 5d7617757a7a2928f7f475a44b337ba201a70b59 + b80af7180d114023514743ad1a58cfc1b362666d - + https://github.com/dotnet/razor - 5d7617757a7a2928f7f475a44b337ba201a70b59 + b80af7180d114023514743ad1a58cfc1b362666d - + https://github.com/dotnet/razor - 5d7617757a7a2928f7f475a44b337ba201a70b59 + b80af7180d114023514743ad1a58cfc1b362666d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d98478129dd2..e421e7c9bafa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24511.3 - 9.0.0-preview.24511.3 - 9.0.0-preview.24511.3 + 9.0.0-preview.24515.1 + 9.0.0-preview.24515.1 + 9.0.0-preview.24515.1 From 715fc568f4fef673dd8748573a1d0c68459f50b4 Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Fri, 20 Sep 2024 22:20:05 +0100 Subject: [PATCH 066/702] Change to make "solution" the primary command for SlnCommand and "sln" to a shorthand alias. Additional changes have been made to tests that relied on certain outputs using "sln" and hard-baked calls to "sln" from internal code. --- src/BuiltInTools/dotnet-watch/CommandLineOptions.cs | 6 +++--- src/Cli/dotnet-new3/Dotnet.cs | 2 +- src/Cli/dotnet/ReleasePropertyProjectLocator.cs | 10 +++++----- src/Cli/dotnet/Telemetry/TelemetryFilter.cs | 2 +- src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs | 2 +- .../commands/dotnet-new/DotnetCommandCallbacks.cs | 2 +- .../dotnet/commands/dotnet-sln/SlnArgumentValidator.cs | 2 +- src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs | 10 +++++++++- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 4 ++-- test/dotnet-sln.Tests/GivenDotnetSlnList.cs | 2 +- test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs | 4 ++-- 11 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs index e49c07ba48e2..497fb41c3b66 100644 --- a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs +++ b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs @@ -34,7 +34,7 @@ internal sealed class CommandLineOptions "restore", "run", "sdk", - "sln", + "solution", "store", "test", "tool", @@ -179,7 +179,7 @@ internal sealed class CommandLineOptions BuildProperties = ParseBuildProperties(parseResult.GetValue(propertyOption) ?? []).ToArray(), }; - // Parses name=value pairs passed to --property. Skips invalid input. + // Parses name=value pairs passed to --property. Skips invalid input. // We don't report error here as it will be reported by dotnet run. static IEnumerable<(string key, string value)> ParseBuildProperties(string[] properties) => from property in properties @@ -240,7 +240,7 @@ private static IReadOnlyList GetCommandArguments( { explicitCommand = token; } - else + else { if (!dashDashInserted && i >= unmatchedTokensBeforeDashDash) { diff --git a/src/Cli/dotnet-new3/Dotnet.cs b/src/Cli/dotnet-new3/Dotnet.cs index 6a3a63f48172..a9f244daffb4 100644 --- a/src/Cli/dotnet-new3/Dotnet.cs +++ b/src/Cli/dotnet-new3/Dotnet.cs @@ -72,7 +72,7 @@ internal static Dotnet AddProjectsToSolution(string solutionFile, IReadOnlyList< { List allArgs = new() { - "sln", + "solution", solutionFile, "add" }; diff --git a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs index 6e08a281c671..803a44b0e442 100644 --- a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs +++ b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs @@ -138,7 +138,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() } } } - return null; // If nothing can be found: that's caught by MSBuild XMake::ProcessProjectSwitch -- don't change the behavior by failing here. + return null; // If nothing can be found: that's caught by MSBuild XMake::ProcessProjectSwitch -- don't change the behavior by failing here. } /// An arbitrary existant project in a solution file. Returns null if no projects exist. @@ -205,7 +205,7 @@ public IEnumerable GetCustomDefaultConfigurationValueIfSpecified() /// /// Returns an arbitrary project for the solution. Relies on the .NET SDK PrepareForPublish or _VerifyPackReleaseConfigurations MSBuild targets to catch conflicting values of a given property, like PublishRelease or PackRelease. /// - /// The solution to get an arbitrary project from. + /// The solution to get an arbitrary project from. /// The global properties to load into the project. /// null if no project exists in the solution that can be evaluated properly. Else, the first project in the solution that can be. private ProjectInstance? GetSingleProjectFromSolution(SlnFile sln, Dictionary globalProps) @@ -253,13 +253,13 @@ private bool IsUnanalyzableProjectInSolution(SlnProject project, string projectF return null; } - /// Returns true if the path exists and is a project file type. + /// Returns true if the path exists and is a project file type. private bool IsValidProjectFilePath(string path) { return File.Exists(path) && Path.GetExtension(path).EndsWith("proj"); } - /// Returns true if the path exists and is a sln file type. + /// Returns true if the path exists and is a sln file type. private bool IsValidSlnFilePath(string path) { return File.Exists(path) && Path.GetExtension(path).EndsWith("sln"); @@ -271,7 +271,7 @@ private Dictionary GetUserSpecifiedExplicitMSBuildProperties() Dictionary globalProperties = new(StringComparer.OrdinalIgnoreCase); string[]? globalPropEnumerable = _parseResult.GetValue(CommonOptions.PropertiesOption); - + if ( globalPropEnumerable != null ) { foreach (var keyEqValString in globalPropEnumerable) diff --git a/src/Cli/dotnet/Telemetry/TelemetryFilter.cs b/src/Cli/dotnet/Telemetry/TelemetryFilter.cs index 997e34b43476..d0990bd3652b 100644 --- a/src/Cli/dotnet/Telemetry/TelemetryFilter.cs +++ b/src/Cli/dotnet/Telemetry/TelemetryFilter.cs @@ -84,7 +84,7 @@ public IEnumerable Filter(object objectToFilter) private static List ParseResultLogRules => new() { new AllowListToSendFirstArgument(new HashSet {"new", "help"}), - new AllowListToSendFirstAppliedOptions(new HashSet {"add", "remove", "list", "sln", "nuget"}), + new AllowListToSendFirstAppliedOptions(new HashSet {"add", "remove", "list", "solution", "nuget"}), new TopLevelCommandNameAndOptionToLog ( topLevelCommandName: new HashSet {"build", "publish"}, diff --git a/src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs index 5b9f6e028abe..983a73b439f5 100644 --- a/src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs +++ b/src/Cli/dotnet/commands/dotnet-help/HelpUsageText.cs @@ -50,7 +50,7 @@ internal static class HelpUsageText restore {LocalizableStrings.RestoreDefinition} run {LocalizableStrings.RunDefinition} sdk {LocalizableStrings.SdkDefinition} - sln {LocalizableStrings.SlnDefinition} + solution {LocalizableStrings.SlnDefinition} store {LocalizableStrings.StoreDefinition} test {LocalizableStrings.TestDefinition} tool {LocalizableStrings.ToolDefinition} diff --git a/src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs b/src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs index 61f85961af19..ea41a6182efb 100644 --- a/src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs +++ b/src/Cli/dotnet/commands/dotnet-new/DotnetCommandCallbacks.cs @@ -46,7 +46,7 @@ internal static bool AddProjectsToSolution(string solutionPath, IReadOnlyList commandArgs = new[] { "sln", solutionPath, "add" }.Concat(projectsToAdd); + IEnumerable commandArgs = new[] { "solution", solutionPath, "add" }.Concat(projectsToAdd); if (!string.IsNullOrWhiteSpace(solutionFolder)) { commandArgs = commandArgs.Append(SlnAddParser.SolutionFolderOption.Name).Append(solutionFolder); diff --git a/src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs b/src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs index b1b1ebbb861e..5ebab9458a60 100644 --- a/src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs +++ b/src/Cli/dotnet/commands/dotnet-sln/SlnArgumentValidator.cs @@ -52,7 +52,7 @@ public static void ParseAndValidateArguments(string _fileOrDirectory, IReadOnlyC { string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, slnFile), CommonLocalizableStrings.DidYouMean, - $" dotnet sln {slnFile} {command} {args}{projectArgs}" + $" dotnet solution {slnFile} {command} {args}{projectArgs}" }); } } diff --git a/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs b/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs index 927b2d05b940..cb1197abdfd4 100644 --- a/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.CommandLine; +using NuGet.Packaging; using LocalizableStrings = Microsoft.DotNet.Tools.Sln.LocalizableStrings; namespace Microsoft.DotNet.Cli @@ -10,6 +11,8 @@ internal static class SlnCommandParser { public static readonly string DocsLink = "https://aka.ms/dotnet-sln"; + public static readonly string CommandName = "solution"; + public static readonly string[] CommandAliases = ["sln"]; public static readonly CliArgument SlnArgument = new CliArgument(LocalizableStrings.SolutionArgumentName) { HelpName = LocalizableStrings.SolutionArgumentName, @@ -26,7 +29,12 @@ public static CliCommand GetCommand() private static CliCommand ConstructCommand() { - DocumentedCommand command = new("sln", DocsLink, LocalizableStrings.AppFullName); + DocumentedCommand command = new(CommandName, DocsLink, LocalizableStrings.AppFullName); + + for (int i = 0; i < CommandAliases.Length; i++) + { + command.Aliases.Add(CommandAliases[i]); + } command.Arguments.Add(SlnArgument); command.Subcommands.Add(SlnAddParser.GetCommand()); diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index d26273805b53..4a685eea3d3e 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -14,7 +14,7 @@ public class GivenDotnetSlnAdd : SdkTest Add one or more projects to a solution file. Usage: - dotnet sln add [...] [options] + dotnet solution add [...] [options] Arguments: The solution file to operate on. If not specified, the command will search the current directory for one. [default: {PathUtility.EnsureTrailingSlash(defaultVal)}] @@ -1347,7 +1347,7 @@ private void VerifySuggestionAndUsage(string arguments) cmd.StdErr.Should().BeVisuallyEquivalentTo( string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, "App.sln") + Environment.NewLine + CommonLocalizableStrings.DidYouMean + Environment.NewLine - + $" dotnet sln App.sln add {arguments} Lib {projectArg}" + + $" dotnet solution App.sln add {arguments} Lib {projectArg}" ); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnList.cs b/test/dotnet-sln.Tests/GivenDotnetSlnList.cs index edc2c390cd8e..5b1bddf7e7fa 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnList.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnList.cs @@ -14,7 +14,7 @@ public class GivenDotnetSlnList : SdkTest List all projects in a solution file. Usage: - dotnet sln list [options] + dotnet solution list [options] Arguments: The solution file to operate on. If not specified, the command will search the current directory for one. [default: {PathUtility.EnsureTrailingSlash(defaultVal)}] diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs index ff1f95711c00..89803ff9d7d4 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs @@ -13,7 +13,7 @@ public class GivenDotnetSlnRemove : SdkTest Remove one or more projects from a solution file. Usage: - dotnet sln remove [...] [options] + dotnet solution remove [...] [options] Arguments: The solution file to operate on. If not specified, the command will search the current directory for one. [default: {PathUtility.EnsureTrailingSlash(defaultVal)}] @@ -744,7 +744,7 @@ public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage() cmd.StdErr.Should().BeVisuallyEquivalentTo( string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, "App.sln") + Environment.NewLine + CommonLocalizableStrings.DidYouMean + Environment.NewLine - + $" dotnet sln App.sln remove {projectArg}" + + $" dotnet solution App.sln remove {projectArg}" ); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } From 2879057b68ba623b0e2cf20743745a46bc563853 Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Fri, 20 Sep 2024 23:17:54 +0100 Subject: [PATCH 067/702] Add additional command test change to fit new primary command name. --- test/dotnet-watch.Tests/CommandLineOptionsTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs index 1ac5b5e49470..00b40547dcc5 100644 --- a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs +++ b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs @@ -99,7 +99,7 @@ public void ImplicitCommand() [InlineData("restore")] [InlineData("run")] [InlineData("sdk")] - [InlineData("sln")] + [InlineData("solution")] [InlineData("store")] [InlineData("test")] [InlineData("tool")] @@ -183,7 +183,7 @@ public void RunOptions_NoProfile_Both() public void RemainingOptions() { var options = VerifyOptions(["-watchArg", "--verbose", "run", "-runArg"]); - + Assert.True(options.GlobalOptions.Verbose); Assert.Equal("run", options.Command); Assert.Equal(["-watchArg", "-runArg"], options.CommandArguments); From f9a8b7be8e5012eab34d24e5cc8bfde72b6ed535 Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Fri, 20 Sep 2024 23:24:18 +0100 Subject: [PATCH 068/702] Update top level command test --- test/dotnet.Tests/CommandTests/CompleteCommandTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs index 88ee00d47099..6a0f49a583a1 100644 --- a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs @@ -45,7 +45,7 @@ public void GivenOnlyDotnetItSuggestsTopLevelCommandsAndOptions() "remove", "restore", "run", - "sln", + "solution", "store", "test", "tool", From f62842445c04076fbd5fc7dfe7065b5559a13a96 Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Sat, 21 Sep 2024 00:43:44 +0100 Subject: [PATCH 069/702] Add change for solution in show help code. --- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 0a0992944554..665671557b0b 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -52,7 +52,7 @@ remove Remove a package or reference from a .NET project. restore Restore dependencies specified in a .NET project. run Build and run a .NET project output. sdk Manage .NET SDK installation. - sln Modify Visual Studio solution files. + solution Modify Visual Studio solution files. store Store the specified assemblies in the runtime package store. test Run unit tests using the test runner specified in a .NET project. tool Install or manage tools that extend the .NET experience. From 2da80f5592303e8088cfe3cdea82a47a88dca59b Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Sat, 21 Sep 2024 01:00:45 +0100 Subject: [PATCH 070/702] Telemetry change to solution as hashed value. Possible issue with things downstream expecting SLN such as aspire, etc? Will need someone with more knowledge to check if this could affect things downstream. --- test/dotnet.Tests/TelemetryCommandTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/TelemetryCommandTest.cs b/test/dotnet.Tests/TelemetryCommandTest.cs index e7fc9a77bab5..39cb9ed6882a 100644 --- a/test/dotnet.Tests/TelemetryCommandTest.cs +++ b/test/dotnet.Tests/TelemetryCommandTest.cs @@ -213,7 +213,7 @@ public void DotnetSlnCommandFirstArgumentShouldBeSentToTelemetry() e.Properties.ContainsKey("argument") && e.Properties["argument"] == Sha256Hasher.Hash(argumentToSend.ToUpper()) && e.Properties.ContainsKey("verb") && - e.Properties["verb"] == Sha256Hasher.Hash("SLN")); + e.Properties["verb"] == Sha256Hasher.Hash("SOLUTION")); } [Fact] From daf5b67c789fba6e06d72109044687a2840b60a4 Mon Sep 17 00:00:00 2001 From: SourceCodeWhen Date: Sat, 21 Sep 2024 02:08:43 +0100 Subject: [PATCH 071/702] Add in sln so the alias gets correctly represented in desired toplevel command options --- test/dotnet.Tests/CommandTests/CompleteCommandTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs index 6a0f49a583a1..28737029377c 100644 --- a/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/CompleteCommandTests.cs @@ -45,6 +45,7 @@ public void GivenOnlyDotnetItSuggestsTopLevelCommandsAndOptions() "remove", "restore", "run", + "sln", "solution", "store", "test", From e9c5c5cfaad0c5c0ae6558afc6fb7c19455f1b0e Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Sat, 28 Sep 2024 14:55:13 +0100 Subject: [PATCH 072/702] Fix: Remove unnecessary for loop --- src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs b/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs index cb1197abdfd4..dc5693470b86 100644 --- a/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-sln/SlnCommandParser.cs @@ -12,7 +12,7 @@ internal static class SlnCommandParser public static readonly string DocsLink = "https://aka.ms/dotnet-sln"; public static readonly string CommandName = "solution"; - public static readonly string[] CommandAliases = ["sln"]; + public static readonly string CommandAlias = "sln"; public static readonly CliArgument SlnArgument = new CliArgument(LocalizableStrings.SolutionArgumentName) { HelpName = LocalizableStrings.SolutionArgumentName, @@ -31,10 +31,7 @@ private static CliCommand ConstructCommand() { DocumentedCommand command = new(CommandName, DocsLink, LocalizableStrings.AppFullName); - for (int i = 0; i < CommandAliases.Length; i++) - { - command.Aliases.Add(CommandAliases[i]); - } + command.Aliases.Add(CommandAlias); command.Arguments.Add(SlnArgument); command.Subcommands.Add(SlnAddParser.GetCommand()); From 9533e6d938b63f81110f9973827b32cc5d8e4867 Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Sat, 28 Sep 2024 16:13:53 +0100 Subject: [PATCH 073/702] Added extra parameterse for solution command to existing tests --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 418 +++++++++++++-------- 1 file changed, 258 insertions(+), 160 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 4a685eea3d3e..45702bec6d2d 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -408,56 +408,71 @@ public GivenDotnetSlnAdd(ITestOutputHelper log) : base(log) "; [Theory] - [InlineData("--help")] - [InlineData("-h")] - [InlineData("-?")] - [InlineData("/?")] - public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg) + [InlineData("sln", "--help")] + [InlineData("sln", "-h")] + [InlineData("sln", "-?")] + [InlineData("sln", "/?")] + [InlineData("solution", "--help")] + [InlineData("solution", "-h")] + [InlineData("solution", "-?")] + [InlineData("solution", "/?")] + public void WhenHelpOptionIsPassedItPrintsUsage(string solutionCommand, string helpArg) { var cmd = new DotnetCommand(Log) - .Execute($"sln", "add", helpArg); + .Execute(solutionCommand, "add", helpArg); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText(Directory.GetCurrentDirectory())); } [Theory] - [InlineData("")] - [InlineData("unknownCommandName")] - public void WhenNoCommandIsPassedItPrintsError(string commandName) + [InlineData("sln", "")] + [InlineData("sln", "unknownCommandName")] + [InlineData("solution", "")] + [InlineData("solution", "unknownCommandName")] + public void WhenNoCommandIsPassedItPrintsError(string solutionCommand, string commandName) { var cmd = new DotnetCommand(Log) - .Execute($"sln {commandName}".Trim().Split()); + .Execute($"{solutionCommand} {commandName}".Trim().Split()); cmd.Should().Fail(); cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); } - [Fact] - public void WhenTooManyArgumentsArePassedItPrintsError() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenTooManyArgumentsArePassedItPrintsError(string solutionCommand) { var cmd = new DotnetCommand(Log) - .Execute("sln", "one.sln", "two.sln", "three.sln", "add"); + .Execute(solutionCommand, "one.sln", "two.sln", "three.sln", "add"); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo($@"{string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "two.sln")} {string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "three.sln")}"); } [Theory] - [InlineData("idontexist.sln")] - [InlineData("ihave?invalidcharacters")] - [InlineData("ihaveinv@lidcharacters")] - [InlineData("ihaveinvalid/characters")] - [InlineData("ihaveinvalidchar\\acters")] - public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionName) + [InlineData("sln", "idontexist.sln")] + [InlineData("sln", "ihave?invalidcharacters")] + [InlineData("sln", "ihaveinv@lidcharacters")] + [InlineData("sln", "ihaveinvalid/characters")] + [InlineData("sln", "ihaveinvalidchar\\acters")] + [InlineData("solution", "idontexist.sln")] + [InlineData("solution", "ihave?invalidcharacters")] + [InlineData("solution", "ihaveinv@lidcharacters")] + [InlineData("solution", "ihaveinvalid/characters")] + [InlineData("solution", "ihaveinvalidchar\\acters")] + public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand, string solutionName) { var cmd = new DotnetCommand(Log) - .Execute($"sln", solutionName, "add", "p.csproj"); + .Execute(solutionCommand, solutionName, "add", "p.csproj"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindSolutionOrDirectory, solutionName)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution", identifier: "GivenDotnetSlnAdd") @@ -467,14 +482,16 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "InvalidSolution.sln", "add", projectToAdd); + .Execute(solutionCommand, "InvalidSolution.sln", "add", projectToAdd); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, "InvalidSolution.sln", LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsFoundAddPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsFoundAddPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution") @@ -485,14 +502,16 @@ public void WhenInvalidSolutionIsFoundAddPrintsErrorAndUsage() var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "add", projectToAdd); + .Execute(solutionCommand, "add", projectToAdd); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, solutionPath, LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoProjectIsPassedItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: "GivenDotnetSlnAdd") @@ -501,14 +520,16 @@ public void WhenNoProjectIsPassedItPrintsErrorAndUsage() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute(@"sln", "App.sln", "add"); + .Execute(solutionCommand, "App.sln", "add"); cmd.Should().Fail(); cmd.StdErr.Should().Be(CommonLocalizableStrings.SpecifyAtLeastOneProjectToAdd); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoSolutionExistsInTheDirectoryAddPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoSolutionExistsInTheDirectoryAddPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -518,14 +539,16 @@ public void WhenNoSolutionExistsInTheDirectoryAddPrintsErrorAndUsage() var solutionPath = Path.Combine(projectDirectory, "App"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(solutionPath) - .Execute(@"sln", "add", "App.csproj"); + .Execute(solutionCommand, "add", "App.csproj"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.SolutionDoesNotExist, solutionPath + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithMultipleSlnFiles", identifier: "GivenDotnetSlnAdd") @@ -535,14 +558,16 @@ public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "add", projectToAdd); + .Execute(solutionCommand, "add", projectToAdd); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneSolutionInDirectory, projectDirectory + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNestedProjectIsAddedSolutionFoldersAreCreated() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") @@ -552,7 +577,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated() var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -567,9 +592,11 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated() } [Theory] - [InlineData(true)] - [InlineData(false)] - public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(bool fooFirst) + [InlineData("sln", true)] + [InlineData("sln", false)] + [InlineData("solution", true)] + [InlineData("solution", false)] + public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVS") @@ -583,14 +610,14 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(bool fooFirst projectToAdd = "foo"; cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); } projectToAdd = Path.Combine("foo", "bar"); cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); if (!fooFirst) @@ -598,7 +625,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(bool fooFirst projectToAdd = "foo"; cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); } @@ -609,37 +636,41 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(bool fooFirst } - [Fact] - public void WhenNestedDuplicateProjectIsAddedToASolutionFolder() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNestedDuplicateProjectIsAddedToASolutionFolder(string solutionCommand) { - var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVSErrors") - .WithSource() - .Path; + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVSErrors") + .WithSource() + .Path; string projectToAdd; CommandResult cmd; projectToAdd = Path.Combine("Base", "Second", "TestCollision.csproj"); cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Fail() .And.HaveStdErrContaining("TestCollision") .And.HaveStdErrContaining("Base"); - projectToAdd = Path.Combine("Base", "Second", "Third", "Second.csproj"); + projectToAdd = Path.Combine("Base", "Second", "Third", "Second.csproj"); cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Fail() .And.HaveStdErrContaining("Second") .And.HaveStdErrContaining("Base"); } [Theory] - [InlineData("TestAppWithSlnAndCsprojFiles")] - [InlineData("TestAppWithSlnAnd472CsprojFiles")] - public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string testAsset) + [InlineData("sln", "TestAppWithSlnAndCsprojFiles")] + [InlineData("sln", "TestAppWithSlnAnd472CsprojFiles")] + [InlineData("solution", "TestAppWithSlnAndCsprojFiles")] + [InlineData("solution", "TestAppWithSlnAnd472CsprojFiles")] + public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager .CopyTestAsset(testAsset) @@ -648,7 +679,7 @@ public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string testAsset var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "add", "Lib"); + .Execute(solutionCommand, "add", "Lib"); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -657,8 +688,10 @@ public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string testAsset .Should().BeVisuallyEquivalentTo(expectedSlnContents); } - [Fact] - public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -671,7 +704,7 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "add", directoryToAdd); + .Execute(solutionCommand, "add", directoryToAdd); cmd.Should().Fail(); cmd.StdErr.Should().Be( string.Format( @@ -682,8 +715,10 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() .Should().BeVisuallyEquivalentTo(contentBefore); } - [Fact] - public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -696,7 +731,7 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "add", directoryToAdd); + .Execute(solutionCommand, "add", directoryToAdd); cmd.Should().Fail(); cmd.StdErr.Should().Be( string.Format( @@ -707,8 +742,10 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() .Should().BeVisuallyEquivalentTo(contentBefore); } - [Fact] - public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -718,7 +755,7 @@ public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated() var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln")); @@ -728,8 +765,10 @@ public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated() slnFile.Sections.GetSection("NestedProjects").Should().BeNull(); } - [Fact] - public void WhenSharedProjectAddedShouldStillBuild() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSharedProjectAddedShouldStillBuild(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -739,7 +778,7 @@ public void WhenSharedProjectAddedShouldStillBuild() var projectToAdd = Path.Combine("Shared", "Shared.shproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); cmd.StdErr.Should().BeEmpty(); @@ -750,9 +789,11 @@ public void WhenSharedProjectAddedShouldStillBuild() } [Theory] - [InlineData(".")] - [InlineData("")] - public void WhenSolutionFolderExistsItDoesNotGetAdded(string firstComponent) + [InlineData("sln", ".")] + [InlineData("sln", "")] + [InlineData("solution", ".")] + [InlineData("solution", "")] + public void WhenSolutionFolderExistsItDoesNotGetAdded(string solutionCommand, string firstComponent) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndSolutionFolders", identifier: firstComponent) @@ -762,7 +803,7 @@ public void WhenSolutionFolderExistsItDoesNotGetAdded(string firstComponent) var projectToAdd = Path.Combine($"{firstComponent}", "src", "src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln")); @@ -788,10 +829,14 @@ public void WhenSolutionFolderExistsItDoesNotGetAdded(string firstComponent) } [Theory] - [InlineData("TestAppWithSlnAndCsprojFiles", ExpectedSlnFileAfterAddingLibProj, "")] - [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles", ExpectedSlnFileAfterAddingLibProj, "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")] - [InlineData("TestAppWithEmptySln", ExpectedSlnFileAfterAddingLibProjToEmptySln, "")] + [InlineData("sln", "TestAppWithSlnAndCsprojFiles", ExpectedSlnFileAfterAddingLibProj, "")] + [InlineData("sln", "TestAppWithSlnAndCsprojProjectGuidFiles", ExpectedSlnFileAfterAddingLibProj, "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")] + [InlineData("sln", "TestAppWithEmptySln", ExpectedSlnFileAfterAddingLibProjToEmptySln, "")] + [InlineData("solution", "TestAppWithSlnAndCsprojFiles", ExpectedSlnFileAfterAddingLibProj, "")] + [InlineData("solution", "TestAppWithSlnAndCsprojProjectGuidFiles", ExpectedSlnFileAfterAddingLibProj, "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")] + [InlineData("solution", "TestAppWithEmptySln", ExpectedSlnFileAfterAddingLibProjToEmptySln, "")] public void WhenValidProjectIsPassedBuildConfigsAreAdded( + string solutionCommand, string testAsset, string expectedSlnContentsTemplate, string expectedProjectGuid) @@ -804,7 +849,7 @@ public void WhenValidProjectIsPassedBuildConfigsAreAdded( var projectToAdd = "Lib/Lib.csproj"; var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -819,10 +864,13 @@ public void WhenValidProjectIsPassedBuildConfigsAreAdded( } [Theory] - [InlineData("TestAppWithSlnAndCsprojFiles")] - [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] - [InlineData("TestAppWithEmptySln")] - public void WhenValidProjectIsPassedItGetsAdded(string testAsset) + [InlineData("sln", "TestAppWithSlnAndCsprojFiles")] + [InlineData("sln", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("sln", "TestAppWithEmptySln")] + [InlineData("solution", "TestAppWithSlnAndCsprojFiles")] + [InlineData("solution", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("solution", "TestAppWithEmptySln")] + public void WhenValidProjectIsPassedItGetsAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager .CopyTestAsset(testAsset) @@ -833,14 +881,16 @@ public void WhenValidProjectIsPassedItGetsAdded(string testAsset) var projectPath = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectPath)); cmd.StdErr.Should().BeEmpty(); } - [Fact] - public void WhenProjectIsAddedSolutionHasUTF8BOM() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectIsAddedSolutionHasUTF8BOM(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithEmptySln") @@ -850,7 +900,7 @@ public void WhenProjectIsAddedSolutionHasUTF8BOM() var projectToAdd = "Lib/Lib.csproj"; var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var preamble = Encoding.UTF8.GetPreamble(); @@ -866,10 +916,13 @@ public void WhenProjectIsAddedSolutionHasUTF8BOM() } [Theory] - [InlineData("TestAppWithSlnAndCsprojFiles")] - [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] - [InlineData("TestAppWithEmptySln")] - public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string testAsset) + [InlineData("sln", "TestAppWithSlnAndCsprojFiles")] + [InlineData("sln", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("sln", "TestAppWithEmptySln")] + [InlineData("solution", "TestAppWithSlnAndCsprojFiles")] + [InlineData("solution", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("solution", "TestAppWithEmptySln")] + public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager .CopyTestAsset(testAsset) @@ -881,8 +934,8 @@ public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string testAsset) var expectedNumberOfProjects = slnFile.Projects.Count(); var cmd = new DotnetCommand(Log) - .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .WithWorkingDirectory(projectDirectory) + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); cmd.StdOut.Should().BeEmpty(); cmd.StdErr.Should().Match(string.Format(CommonLocalizableStrings.InvalidProjectWithExceptionMessage, '*', '*')); @@ -892,10 +945,13 @@ public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string testAsset) } [Theory] - [InlineData("TestAppWithSlnAndCsprojFiles")] - [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] - [InlineData("TestAppWithEmptySln")] - public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) + [InlineData("sln", "TestAppWithSlnAndCsprojFiles")] + [InlineData("sln", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("sln", "TestAppWithEmptySln")] + [InlineData("solution", "TestAppWithSlnAndCsprojFiles")] + [InlineData("solution", "TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("solution", "TestAppWithEmptySln")] + public void WhenValidProjectIsPassedTheSlnBuilds(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager .CopyTestAsset(testAsset) @@ -904,7 +960,7 @@ public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute(@"sln", "App.sln", "add", "App/App.csproj", "Lib/Lib.csproj"); + .Execute(solutionCommand, "App.sln", "add", "App/App.csproj", "Lib/Lib.csproj"); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -933,9 +989,11 @@ public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) } [Theory] - [InlineData("TestAppWithSlnAndExistingCsprojReferences")] - [InlineData("TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep")] - public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string testAsset) + [InlineData("sln", "TestAppWithSlnAndExistingCsprojReferences")] + [InlineData("sln", "TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep")] + [InlineData("solution", "TestAppWithSlnAndExistingCsprojReferences")] + [InlineData("solution", "TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep")] + public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager .CopyTestAsset(testAsset) @@ -946,14 +1004,16 @@ public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string testAsset var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.SolutionAlreadyContainsProject, solutionPath, projectToAdd)); cmd.StdErr.Should().BeEmpty(); } - [Fact] - public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOperation() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -966,7 +1026,7 @@ public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOper var projectToAdd = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd, "idonotexist.csproj"); + .Execute(solutionCommand, "App.sln", "add", projectToAdd, "idonotexist.csproj"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindProjectOrDirectory, "idonotexist.csproj")); @@ -974,8 +1034,10 @@ public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOper .Should().BeVisuallyEquivalentTo(contentBefore); } - [Fact(Skip = "https://github.com/dotnet/sdk/issues/522")] - public void WhenPassedAnUnknownProjectTypeItFails() + [Theory(Skip = "https://github.com/dotnet/sdk/issues/522")] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedAnUnknownProjectTypeItFails(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProject") @@ -988,7 +1050,7 @@ public void WhenPassedAnUnknownProjectTypeItFails() var projectToAdd = Path.Combine("UnknownProject", "UnknownProject.unknownproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo("has an unknown project type and cannot be added to the solution file. Contact your SDK provider for support."); @@ -997,12 +1059,18 @@ public void WhenPassedAnUnknownProjectTypeItFails() } [Theory] - [InlineData("SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] - [InlineData("SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] - [InlineData("SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] - [InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] - [InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("sln", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] + [InlineData("sln", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] + [InlineData("sln", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] + [InlineData("sln", "FileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("sln", "FileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("solution", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] + [InlineData("solution", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] + [InlineData("solution", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] + [InlineData("solution", "FileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("solution", "FileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( + string solutionCommand, string testAsset, string projectDir, string projectName, @@ -1016,7 +1084,7 @@ public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( var projectToAdd = Path.Combine(projectDir, projectName); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); cmd.StdErr.Should().BeEmpty(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); @@ -1028,8 +1096,10 @@ public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( nonSolutionFolderProjects.Single().TypeGuid.Should().Be(expectedTypeGuid); } - [Fact] - public void WhenPassedAProjectWithoutATypeGuidItErrors() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedAProjectWithoutATypeGuidItErrors(string solutionCommand) { var solutionDirectory = _testAssetsManager .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProjectType") @@ -1042,7 +1112,7 @@ public void WhenPassedAProjectWithoutATypeGuidItErrors() var projectToAdd = Path.Combine("UnknownProject", "UnknownProject.unknownproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(solutionDirectory) - .Execute($"sln", "add", projectToAdd); + .Execute(solutionCommand, "add", projectToAdd); cmd.Should().Pass(); cmd.StdErr.Should().Be( string.Format( @@ -1055,8 +1125,10 @@ public void WhenPassedAProjectWithoutATypeGuidItErrors() .BeVisuallyEquivalentTo(contentBefore); } - [Fact] - private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDuplicate() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDuplicate(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCaseSensitiveSolutionFolders") @@ -1066,7 +1138,7 @@ private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDupl var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", projectToAdd); cmd.Should().Pass(); var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln")); @@ -1075,8 +1147,10 @@ private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDupl solutionFolderProjects.Count().Should().Be(1); } - [Fact] - public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAvailable() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAvailable(string solutionCommand) { var slnDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndProjectConfigs") @@ -1087,15 +1161,17 @@ public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAv var result = new DotnetCommand(Log) .WithWorkingDirectory(slnDirectory) - .Execute($"sln", "add", "ProjectWithoutMatchingConfigs"); + .Execute(solutionCommand, "add", "ProjectWithoutMatchingConfigs"); result.Should().Pass(); File.ReadAllText(slnFullPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithoutMatchingConfigs); } - [Fact] - public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll(string solutionCommand) { var slnDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndProjectConfigs") @@ -1106,15 +1182,17 @@ public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll() var result = new DotnetCommand(Log) .WithWorkingDirectory(slnDirectory) - .Execute($"sln", "add", "ProjectWithMatchingConfigs"); + .Execute(solutionCommand, "add", "ProjectWithMatchingConfigs"); result.Should().Pass(); File.ReadAllText(slnFullPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithMatchingConfigs); } - [Fact] - public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem(string solutionCommand) { var slnDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndProjectConfigs") @@ -1125,15 +1203,17 @@ public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem var result = new DotnetCommand(Log) .WithWorkingDirectory(slnDirectory) - .Execute($"sln", "add", "ProjectWithAdditionalConfigs"); + .Execute(solutionCommand, "add", "ProjectWithAdditionalConfigs"); result.Should().Pass(); File.ReadAllText(slnFullPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithAdditionalConfigs); } - [Fact] - public void ItAddsACSharpProjectThatIsMultitargeted() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void ItAddsACSharpProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") @@ -1144,15 +1224,17 @@ public void ItAddsACSharpProjectThatIsMultitargeted() new DotnetCommand(Log) .WithWorkingDirectory(solutionDirectory) - .Execute($"sln", "add", projectToAdd) + .Execute(solutionCommand, "add", projectToAdd) .Should() .Pass() .And .HaveStdOutContaining(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); } - [Fact] - public void ItAddsAVisualBasicProjectThatIsMultitargeted() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void ItAddsAVisualBasicProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") @@ -1163,15 +1245,17 @@ public void ItAddsAVisualBasicProjectThatIsMultitargeted() new DotnetCommand(Log) .WithWorkingDirectory(solutionDirectory) - .Execute($"sln", "add", projectToAdd) + .Execute(solutionCommand, "add", projectToAdd) .Should() .Pass() .And .HaveStdOutContaining(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); } - [Fact] - public void ItAddsAnFSharpProjectThatIsMultitargeted() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void ItAddsAnFSharpProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") @@ -1183,15 +1267,17 @@ public void ItAddsAnFSharpProjectThatIsMultitargeted() new DotnetCommand(Log) .WithWorkingDirectory(solutionDirectory) - .Execute($"sln", "add", projectToAdd) + .Execute(solutionCommand, "add", projectToAdd) .Should() .Pass() .And .HaveStdOutContaining(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); } - [Fact] - public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreCreated() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreCreated(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") @@ -1201,7 +1287,7 @@ public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreC var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", "--in-root", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", "--in-root", projectToAdd); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -1210,8 +1296,10 @@ public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreC .Should().BeVisuallyEquivalentTo(expectedSlnContents); } - [Fact] - public void WhenSolutionFolderIsPassedProjectsAreAddedThere() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionFolderIsPassedProjectsAreAddedThere(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") @@ -1221,7 +1309,7 @@ public void WhenSolutionFolderIsPassedProjectsAreAddedThere() var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", "--solution-folder", "TestFolder", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", "--solution-folder", "TestFolder", projectToAdd); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -1230,8 +1318,10 @@ public void WhenSolutionFolderIsPassedProjectsAreAddedThere() .Should().BeVisuallyEquivalentTo(expectedSlnContents); } - [Fact] - public void WhenSolutionFolderAndInRootIsPassedItFails() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionFolderAndInRootIsPassedItFails(string solutionCommand) { var solutionDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") @@ -1244,7 +1334,7 @@ public void WhenSolutionFolderAndInRootIsPassedItFails() var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(solutionDirectory) - .Execute($"sln", "App.sln", "add", "--solution-folder", "blah", "--in-root", projectToAdd); + .Execute(solutionCommand, "App.sln", "add", "--solution-folder", "blah", "--in-root", projectToAdd); cmd.Should().Fail(); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); cmd.StdErr.Should().Be(Tools.Sln.LocalizableStrings.SolutionFolderAndInRootMutuallyExclusive); @@ -1256,9 +1346,11 @@ public void WhenSolutionFolderAndInRootIsPassedItFails() } [Theory] - [InlineData("/TestFolder//", "ForwardSlash")] - [InlineData("\\TestFolder\\\\", "BackwardSlash")] - public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCorrect(string solutionFolder, string testIdentifier) + [InlineData("sln", "/TestFolder//", "ForwardSlash")] + [InlineData("sln", "\\TestFolder\\\\", "BackwardSlash")] + [InlineData("solution", "/TestFolder//", "ForwardSlash")] + [InlineData("solution", "\\TestFolder\\\\", "BackwardSlash")] + public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCorrect(string solutionCommand, string solutionFolder, string testIdentifier) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: testIdentifier) @@ -1268,7 +1360,7 @@ public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCor var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "add", "--solution-folder", solutionFolder, projectToAdd); + .Execute(solutionCommand, "App.sln", "add", "--solution-folder", solutionFolder, projectToAdd); cmd.Should().Pass(); var slnPath = Path.Combine(projectDirectory, "App.sln"); @@ -1315,24 +1407,30 @@ private string GetExpectedSlnContents( return slnContents; } - [Fact] - public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand) { - VerifySuggestionAndUsage(""); + VerifySuggestionAndUsage(solutionCommand, ""); } - [Fact] - public void WhenSolutionIsPassedAsProjectWithInRootItPrintsSuggestionAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionIsPassedAsProjectWithInRootItPrintsSuggestionAndUsage(string solutionCommand) { - VerifySuggestionAndUsage("--in-root"); + VerifySuggestionAndUsage(solutionCommand, "--in-root"); } - [Fact] - public void WhenSolutionIsPassedAsProjectWithSolutionFolderItPrintsSuggestionAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionIsPassedAsProjectWithSolutionFolderItPrintsSuggestionAndUsage(string solutionCommand) { - VerifySuggestionAndUsage("--solution-folder"); + VerifySuggestionAndUsage(solutionCommand, "--solution-folder"); } - private void VerifySuggestionAndUsage(string arguments) + private void VerifySuggestionAndUsage(string solutionCommand, string arguments) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -1342,7 +1440,7 @@ private void VerifySuggestionAndUsage(string arguments) var projectArg = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "add", arguments, "Lib", "App.sln", projectArg); + .Execute(solutionCommand, "add", arguments, "Lib", "App.sln", projectArg); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo( string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, "App.sln") + Environment.NewLine From 7a02533c040b60500d19157a2cc9a0334e6ca540 Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Sat, 28 Sep 2024 16:23:10 +0100 Subject: [PATCH 074/702] Add parameters for solution command to existing tests --- test/dotnet-sln.Tests/GivenDotnetSlnList.cs | 111 ++++++++++++-------- 1 file changed, 69 insertions(+), 42 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnList.cs b/test/dotnet-sln.Tests/GivenDotnetSlnList.cs index 5b1bddf7e7fa..77670963b1ad 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnList.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnList.cs @@ -29,54 +29,67 @@ public GivenDotnetSlnList(ITestOutputHelper log) : base(log) } [Theory] - [InlineData("--help")] - [InlineData("-h")] - public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg) + [InlineData("sln", "--help")] + [InlineData("sln", "-h")] + [InlineData("solution", "--help")] + [InlineData("solution", "-h")] + public void WhenHelpOptionIsPassedItPrintsUsage(string solutionCommand, string helpArg) { var cmd = new DotnetCommand(Log) - .Execute($"sln", "list", helpArg); + .Execute(solutionCommand, "list", helpArg); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText(Directory.GetCurrentDirectory())); } [Theory] - [InlineData("")] - [InlineData("unknownCommandName")] - public void WhenNoCommandIsPassedItPrintsError(string commandName) + [InlineData("sln", "")] + [InlineData("sln", "unknownCommandName")] + [InlineData("solution", "")] + [InlineData("solution", "unknownCommandName")] + public void WhenNoCommandIsPassedItPrintsError(string solutionCommand, string commandName) { var cmd = new DotnetCommand(Log) - .Execute($"sln", commandName); + .Execute(solutionCommand, commandName); cmd.Should().Fail(); cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); } - [Fact] - public void WhenTooManyArgumentsArePassedItPrintsError() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenTooManyArgumentsArePassedItPrintsError(string solutionCommand) { var cmd = new DotnetCommand(Log) - .Execute("sln", "one.sln", "two.sln", "three.sln", "list"); + .Execute(solutionCommand, "one.sln", "two.sln", "three.sln", "list"); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo($@"{string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "two.sln")} {string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "three.sln")}"); } [Theory] - [InlineData("idontexist.sln")] - [InlineData("ihave?invalidcharacters.sln")] - [InlineData("ihaveinv@lidcharacters.sln")] - [InlineData("ihaveinvalid/characters")] - [InlineData("ihaveinvalidchar\\acters")] - public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionName) + [InlineData("sln", "idontexist.sln")] + [InlineData("sln", "ihave?invalidcharacters.sln")] + [InlineData("sln", "ihaveinv@lidcharacters.sln")] + [InlineData("sln", "ihaveinvalid/characters")] + [InlineData("sln", "ihaveinvalidchar\\acters")] + [InlineData("solution", "idontexist.sln")] + [InlineData("solution", "ihave?invalidcharacters.sln")] + [InlineData("solution", "ihaveinv@lidcharacters.sln")] + [InlineData("solution", "ihaveinvalid/characters")] + [InlineData("solution", "ihaveinvalidchar\\acters")] + public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand, string solutionName) { var cmd = new DotnetCommand(Log) - .Execute($"sln", solutionName, "list"); + .Execute(solutionCommand, solutionName, "list"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindSolutionOrDirectory, solutionName)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution", identifier: "GivenDotnetSlnList") @@ -85,14 +98,16 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "InvalidSolution.sln", "list"); + .Execute(solutionCommand, "InvalidSolution.sln", "list"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, "InvalidSolution.sln", LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsFoundListPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsFoundListPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution") @@ -102,14 +117,16 @@ public void WhenInvalidSolutionIsFoundListPrintsErrorAndUsage() var solutionFullPath = Path.Combine(projectDirectory, "InvalidSolution.sln"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, solutionFullPath, LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoSolutionExistsInTheDirectoryListPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoSolutionExistsInTheDirectoryListPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -119,14 +136,16 @@ public void WhenNoSolutionExistsInTheDirectoryListPrintsErrorAndUsage() var solutionDir = Path.Combine(projectDirectory, "App"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(solutionDir) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.SolutionDoesNotExist, solutionDir + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithMultipleSlnFiles", identifier: "GivenDotnetSlnList") @@ -135,14 +154,16 @@ public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneSolutionInDirectory, projectDirectory + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoProjectsArePresentInTheSolutionItPrintsANoProjectMessage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoProjectsArePresentInTheSolutionItPrintsANoProjectMessage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithEmptySln") @@ -151,13 +172,15 @@ public void WhenNoProjectsArePresentInTheSolutionItPrintsANoProjectMessage() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Pass(); cmd.StdOut.Should().Be(CommonLocalizableStrings.NoProjectsFound); } - [Fact] - public void WhenProjectsPresentInTheSolutionItListsThem() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectsPresentInTheSolutionItListsThem(string solutionCommand) { var expectedOutput = $@"{CommandLocalizableStrings.ProjectsHeader} {new string('-', CommandLocalizableStrings.ProjectsHeader.Length)} @@ -171,13 +194,15 @@ public void WhenProjectsPresentInTheSolutionItListsThem() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentTo(expectedOutput); } - [Fact] - public void WhenProjectsPresentInTheReadonlySolutionItListsThem() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectsPresentInTheReadonlySolutionItListsThem(string solutionCommand) { var expectedOutput = $@"{CommandLocalizableStrings.ProjectsHeader} {new string('-', CommandLocalizableStrings.ProjectsHeader.Length)} @@ -195,13 +220,15 @@ public void WhenProjectsPresentInTheReadonlySolutionItListsThem() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list"); + .Execute(solutionCommand, "list"); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentTo(expectedOutput); } - [Fact] - public void WhenProjectsInSolutionFoldersPresentInTheSolutionItListsSolutionFolderPaths() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectsInSolutionFoldersPresentInTheSolutionItListsSolutionFolderPaths(string solutionCommand) { string[] expectedOutput = { $"{CommandLocalizableStrings.SolutionFolderHeader}", $"{new string('-', CommandLocalizableStrings.SolutionFolderHeader.Length)}", @@ -214,7 +241,7 @@ public void WhenProjectsInSolutionFoldersPresentInTheSolutionItListsSolutionFold var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "list", "--solution-folders"); + .Execute(solutionCommand, "list", "--solution-folders"); cmd.Should().Pass(); cmd.StdOut.Should().ContainAll(expectedOutput); } From 2c4871542ba893abbb094abb52bb1244306cb86d Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Sat, 28 Sep 2024 16:31:17 +0100 Subject: [PATCH 075/702] Added new parameters to tests for solution command --- test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs | 215 +++++++++++------- 1 file changed, 134 insertions(+), 81 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs index 89803ff9d7d4..4ee0ad87e512 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs @@ -242,54 +242,67 @@ public GivenDotnetSlnRemove(ITestOutputHelper log) : base(log) } [Theory] - [InlineData("--help")] - [InlineData("-h")] - public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg) + [InlineData("sln", "--help")] + [InlineData("sln", "-h")] + [InlineData("solution", "--help")] + [InlineData("solution", "-h")] + public void WhenHelpOptionIsPassedItPrintsUsage(string solutionCommand, string helpArg) { var cmd = new DotnetCommand(Log) - .Execute($"sln", "remove", helpArg); + .Execute(solutionCommand, "remove", helpArg); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText(Directory.GetCurrentDirectory())); } - [Fact] - public void WhenTooManyArgumentsArePassedItPrintsError() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenTooManyArgumentsArePassedItPrintsError(string solutionCommand) { var cmd = new DotnetCommand(Log) - .Execute("sln", "one.sln", "two.sln", "three.sln", "remove"); + .Execute(solutionCommand, "one.sln", "two.sln", "three.sln", "remove"); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo($@"{string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "two.sln")} {string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, "three.sln")}"); } [Theory] - [InlineData("")] - [InlineData("unknownCommandName")] - public void WhenNoCommandIsPassedItPrintsError(string commandName) + [InlineData("sln", "")] + [InlineData("sln", "unknownCommandName")] + [InlineData("solution", "")] + [InlineData("solution", "unknownCommandName")] + public void WhenNoCommandIsPassedItPrintsError(string solutionCommand, string commandName) { var cmd = new DotnetCommand(Log) - .Execute($"sln", commandName); + .Execute(solutionCommand, commandName); cmd.Should().Fail(); cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed); } [Theory] - [InlineData("idontexist.sln")] - [InlineData("ihave?invalidcharacters")] - [InlineData("ihaveinv@lidcharacters")] - [InlineData("ihaveinvalid/characters")] - [InlineData("ihaveinvalidchar\\acters")] - public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionName) + [InlineData("sln", "idontexist.sln")] + [InlineData("sln", "ihave?invalidcharacters")] + [InlineData("sln", "ihaveinv@lidcharacters")] + [InlineData("sln", "ihaveinvalid/characters")] + [InlineData("sln", "ihaveinvalidchar\\acters")] + [InlineData("solution", "idontexist.sln")] + [InlineData("solution", "ihave?invalidcharacters")] + [InlineData("solution", "ihaveinv@lidcharacters")] + [InlineData("solution", "ihaveinvalid/characters")] + [InlineData("solution", "ihaveinvalidchar\\acters")] + public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand, string solutionName) { var cmd = new DotnetCommand(Log) - .Execute($"sln", solutionName, "remove", "p.csproj"); + .Execute(solutionCommand, solutionName, "remove", "p.csproj"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindSolutionOrDirectory, solutionName)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution", identifier: "GivenDotnetSlnRemove") @@ -299,14 +312,16 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "InvalidSolution.sln", "remove", projectToRemove); + .Execute(solutionCommand, "InvalidSolution.sln", "remove", projectToRemove); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, "InvalidSolution.sln", LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenInvalidSolutionIsFoundRemovePrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenInvalidSolutionIsFoundRemovePrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("InvalidSolution") @@ -317,14 +332,16 @@ public void WhenInvalidSolutionIsFoundRemovePrintsErrorAndUsage() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, solutionPath, LocalizableStrings.FileHeaderMissingError)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoProjectIsPassedItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: "GivenDotnetSlnRemove") @@ -333,14 +350,16 @@ public void WhenNoProjectIsPassedItPrintsErrorAndUsage() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute(@"sln", "App.sln", "remove"); + .Execute(solutionCommand, "App.sln", "remove"); cmd.Should().Fail(); cmd.StdErr.Should().Be(CommonLocalizableStrings.SpecifyAtLeastOneProjectToRemove); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenNoSolutionExistsInTheDirectoryRemovePrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNoSolutionExistsInTheDirectoryRemovePrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -350,14 +369,16 @@ public void WhenNoSolutionExistsInTheDirectoryRemovePrintsErrorAndUsage() var solutionPath = Path.Combine(projectDirectory, "App"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(solutionPath) - .Execute(@"sln", "remove", "App.csproj"); + .Execute(solutionCommand, "remove", "App.csproj"); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.SolutionDoesNotExist, solutionPath + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithMultipleSlnFiles", identifier: "GivenDotnetSlnRemove") @@ -367,14 +388,16 @@ public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Fail(); cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneSolutionInDirectory, projectDirectory + Path.DirectorySeparatorChar)); cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenPassedAReferenceNotInSlnItPrintsStatus() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedAReferenceNotInSlnItPrintsStatus(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") @@ -385,15 +408,17 @@ public void WhenPassedAReferenceNotInSlnItPrintsStatus() var contentBefore = File.ReadAllText(solutionPath); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "remove", "referenceDoesNotExistInSln.csproj"); + .Execute(solutionCommand, "remove", "referenceDoesNotExistInSln.csproj"); cmd.Should().Pass(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectNotFoundInTheSolution, "referenceDoesNotExistInSln.csproj")); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(contentBefore); } - [Fact] - public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") @@ -407,7 +432,7 @@ public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectRemovedFromTheSolution, projectToRemove)); @@ -416,8 +441,10 @@ public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences() slnFile.Projects[0].FilePath.Should().Be(Path.Combine("App", "App.csproj")); } - [Fact] - public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("SlnFileWithSolutionItemsInNestedFolders") @@ -430,7 +457,7 @@ public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved() var projectToRemove = Path.Combine("ConsoleApp1", "ConsoleApp1.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectRemovedFromTheSolution, projectToRemove)); @@ -440,8 +467,10 @@ public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved() .BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveProjectInSolutionWithNestedSolutionItems); } - [Fact] - public void WhenDuplicateReferencesArePresentItRemovesThemAll() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDuplicateReferencesArePresentItRemovesThemAll(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndDuplicateProjectReferences") @@ -455,7 +484,7 @@ public void WhenDuplicateReferencesArePresentItRemovesThemAll() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); string outputText = string.Format(CommonLocalizableStrings.ProjectRemovedFromTheSolution, projectToRemove); @@ -467,8 +496,10 @@ public void WhenDuplicateReferencesArePresentItRemovesThemAll() slnFile.Projects[0].FilePath.Should().Be(Path.Combine("App", "App.csproj")); } - [Fact] - public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneThatExists() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneThatExists(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") @@ -482,7 +513,7 @@ public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneT var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", "idontexist.csproj", projectToRemove, "idontexisteither.csproj"); + .Execute(solutionCommand, "remove", "idontexist.csproj", projectToRemove, "idontexisteither.csproj"); cmd.Should().Pass(); string outputText = $@"{string.Format(CommonLocalizableStrings.ProjectNotFoundInTheSolution, "idontexist.csproj")} @@ -496,8 +527,10 @@ public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneT slnFile.Projects[0].FilePath.Should().Be(Path.Combine("App", "App.csproj")); } - [Fact] - public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -511,15 +544,17 @@ public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemove); } - [Fact] - public void WhenDirectoryContainingProjectIsGivenProjectIsRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDirectoryContainingProjectIsGivenProjectIsRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -532,15 +567,17 @@ public void WhenDirectoryContainingProjectIsGivenProjectIsRemoved() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "remove", "Lib"); + .Execute(solutionCommand, "remove", "Lib"); cmd.Should().Pass(); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemove); } - [Fact] - public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -550,7 +587,7 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", directoryToRemove); + .Execute(solutionCommand, "remove", directoryToRemove); cmd.Should().Fail(); cmd.StdErr.Should().Be( string.Format( @@ -559,8 +596,10 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation() cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -570,7 +609,7 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", directoryToRemove); + .Execute(solutionCommand, "remove", directoryToRemove); cmd.Should().Fail(); cmd.StdErr.Should().Be( string.Format( @@ -579,8 +618,10 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation() cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(""); } - [Fact] - public void WhenReferenceIsRemovedSlnBuilds() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenReferenceIsRemovedSlnBuilds(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -594,7 +635,7 @@ public void WhenReferenceIsRemovedSlnBuilds() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); new DotnetCommand(Log) @@ -618,8 +659,10 @@ public void WhenReferenceIsRemovedSlnBuilds() outputDirectory.Should().HaveFile("App.dll"); } - [Fact] - public void WhenProjectIsRemovedSolutionHasUTF8BOM() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectIsRemovedSolutionHasUTF8BOM(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -629,7 +672,7 @@ public void WhenProjectIsRemovedSolutionHasUTF8BOM() var projectToRemove = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "App.sln", "remove", projectToRemove); + .Execute(solutionCommand, "App.sln", "remove", projectToRemove); cmd.Should().Pass(); var preamble = Encoding.UTF8.GetPreamble(); @@ -644,8 +687,10 @@ public void WhenProjectIsRemovedSolutionHasUTF8BOM() } } - [Fact] - public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") @@ -660,7 +705,7 @@ public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved() var libPath = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", libPath, appPath); + .Execute(solutionCommand, "remove", libPath, appPath); cmd.Should().Pass(); var solutionContents = File.ReadAllText(solutionPath); @@ -668,8 +713,10 @@ public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved() solutionContents.Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveAllProjects); } - [Fact] - public void WhenNestedProjectIsRemovedItsSolutionFoldersAreRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenNestedProjectIsRemovedItsSolutionFoldersAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirToRemove") @@ -681,15 +728,17 @@ public void WhenNestedProjectIsRemovedItsSolutionFoldersAreRemoved() var projectToRemove = Path.Combine("src", "NotLastProjInSrc", "NotLastProjInSrc.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveNestedProj); } - [Fact] - public void WhenFinalNestedProjectIsRemovedSolutionFoldersAreRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenFinalNestedProjectIsRemovedSolutionFoldersAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndLastCsprojInSubDirToRemove") @@ -701,15 +750,17 @@ public void WhenFinalNestedProjectIsRemovedSolutionFoldersAreRemoved() var projectToRemove = Path.Combine("src", "Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveLastNestedProj); } - [Fact] - public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnProjectDependencyToRemove") @@ -721,15 +772,17 @@ public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved() var projectToRemove = Path.Combine("Second", "Second.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute($"sln", "remove", projectToRemove); + .Execute(solutionCommand, "remove", projectToRemove); cmd.Should().Pass(); File.ReadAllText(solutionPath) .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveProjectWithDependencies); } - [Fact] - public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage() + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager .CopyTestAsset("TestAppWithSlnAndCsprojFiles") @@ -739,7 +792,7 @@ public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage() var projectArg = Path.Combine("Lib", "Lib.csproj"); var cmd = new DotnetCommand(Log) .WithWorkingDirectory(projectDirectory) - .Execute("sln", "remove", "App.sln", projectArg); + .Execute(solutionCommand, "remove", "App.sln", projectArg); cmd.Should().Fail(); cmd.StdErr.Should().BeVisuallyEquivalentTo( string.Format(CommonLocalizableStrings.SolutionArgumentMisplaced, "App.sln") + Environment.NewLine From 2639ac3c521ae016c6c9beabd5b6b72b481ef634 Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Sat, 28 Sep 2024 16:56:58 +0100 Subject: [PATCH 076/702] Fix: Modify test filenames to point to correct place --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 45702bec6d2d..6e4cc929d0a1 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -1062,13 +1062,13 @@ public void WhenPassedAnUnknownProjectTypeItFails(string solutionCommand) [InlineData("sln", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] [InlineData("sln", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] [InlineData("sln", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] - [InlineData("sln", "FileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] - [InlineData("sln", "FileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("sln", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] [InlineData("solution", "SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] [InlineData("solution", "SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] [InlineData("solution", "SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] - [InlineData("solution", "FileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] - [InlineData("solution", "FileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] + [InlineData("solution", "SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( string solutionCommand, string testAsset, From ed1fe4b090de65e932bb1fa188d0cbfbff39c581 Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Wed, 9 Oct 2024 18:45:14 +0100 Subject: [PATCH 077/702] Fix: test parameters passed to copytestasset --- test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 6e4cc929d0a1..8c13d746f746 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -475,7 +475,7 @@ public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solution public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("InvalidSolution", identifier: "GivenDotnetSlnAdd") + .CopyTestAsset("InvalidSolution", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -494,7 +494,7 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionComm public void WhenInvalidSolutionIsFoundAddPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("InvalidSolution") + .CopyTestAsset("InvalidSolution", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -514,7 +514,7 @@ public void WhenInvalidSolutionIsFoundAddPrintsErrorAndUsage(string solutionComm public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: "GivenDotnetSlnAdd") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -532,7 +532,7 @@ public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) public void WhenNoSolutionExistsInTheDirectoryAddPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -599,7 +599,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVS") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVS", identifier: $"{solutionCommand}{fooFirst}") .WithSource() .Path; string projectToAdd; @@ -642,7 +642,7 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string soluti public void WhenNestedDuplicateProjectIsAddedToASolutionFolder(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVSErrors") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVSErrors", identifier: $"{solutionCommand}") .WithSource() .Path; string projectToAdd; @@ -673,7 +673,7 @@ public void WhenNestedDuplicateProjectIsAddedToASolutionFolder(string solutionCo public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, identifier: $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -694,7 +694,7 @@ public void WhenDirectoryContainingProjectIsGivenProjectIsAdded(string solutionC public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -721,7 +721,7 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string soluti public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -748,7 +748,7 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -771,7 +771,7 @@ public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated(string solut public void WhenSharedProjectAddedShouldStillBuild(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", $"{solutionCommand}") .WithSource() .Path; @@ -796,7 +796,7 @@ public void WhenSharedProjectAddedShouldStillBuild(string solutionCommand) public void WhenSolutionFolderExistsItDoesNotGetAdded(string solutionCommand, string firstComponent) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndSolutionFolders", identifier: firstComponent) + .CopyTestAsset("TestAppWithSlnAndSolutionFolders", identifier: $"{solutionCommand}{firstComponent}") .WithSource() .Path; @@ -842,7 +842,7 @@ public void WhenValidProjectIsPassedBuildConfigsAreAdded( string expectedProjectGuid) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -873,7 +873,7 @@ public void WhenValidProjectIsPassedBuildConfigsAreAdded( public void WhenValidProjectIsPassedItGetsAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, identifier: $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -893,7 +893,7 @@ public void WhenValidProjectIsPassedItGetsAdded(string solutionCommand, string t public void WhenProjectIsAddedSolutionHasUTF8BOM(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithEmptySln") + .CopyTestAsset("TestAppWithEmptySln", $"{solutionCommand}") .WithSource() .Path; @@ -925,7 +925,7 @@ public void WhenProjectIsAddedSolutionHasUTF8BOM(string solutionCommand) public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -954,7 +954,7 @@ public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string solutionCommand, public void WhenValidProjectIsPassedTheSlnBuilds(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, identifier: $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -996,7 +996,7 @@ public void WhenValidProjectIsPassedTheSlnBuilds(string solutionCommand, string public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string solutionCommand, string testAsset) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, identifier: $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -1016,7 +1016,7 @@ public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string solutionC public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1040,7 +1040,7 @@ public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOper public void WhenPassedAnUnknownProjectTypeItFails(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProject") + .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProject", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1077,7 +1077,7 @@ public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( string expectedTypeGuid) { var projectDirectory = _testAssetsManager - .CopyTestAsset(testAsset) + .CopyTestAsset(testAsset, identifier: $"{solutionCommand}{testAsset}") .WithSource() .Path; @@ -1102,7 +1102,7 @@ public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( public void WhenPassedAProjectWithoutATypeGuidItErrors(string solutionCommand) { var solutionDirectory = _testAssetsManager - .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProjectType") + .CopyTestAsset("SlnFileWithNoProjectReferencesAndUnknownProjectType", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1131,7 +1131,7 @@ public void WhenPassedAProjectWithoutATypeGuidItErrors(string solutionCommand) private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDuplicate(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCaseSensitiveSolutionFolders") + .CopyTestAsset("TestAppWithSlnAndCaseSensitiveSolutionFolders", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1153,7 +1153,7 @@ private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDupl public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAvailable(string solutionCommand) { var slnDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndProjectConfigs") + .CopyTestAsset("TestAppWithSlnAndProjectConfigs", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1174,7 +1174,7 @@ public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAv public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll(string solutionCommand) { var slnDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndProjectConfigs") + .CopyTestAsset("TestAppWithSlnAndProjectConfigs", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1195,7 +1195,7 @@ public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll(string s public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem(string solutionCommand) { var slnDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndProjectConfigs") + .CopyTestAsset("TestAppWithSlnAndProjectConfigs", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1216,7 +1216,7 @@ public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem public void ItAddsACSharpProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager - .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") + .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1237,7 +1237,7 @@ public void ItAddsACSharpProjectThatIsMultitargeted(string solutionCommand) public void ItAddsAVisualBasicProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager - .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") + .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1258,7 +1258,7 @@ public void ItAddsAVisualBasicProjectThatIsMultitargeted(string solutionCommand) public void ItAddsAnFSharpProjectThatIsMultitargeted(string solutionCommand) { var solutionDirectory = _testAssetsManager - .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects") + .CopyTestAsset("TestAppsWithSlnAndMultitargetedProjects", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1280,7 +1280,7 @@ public void ItAddsAnFSharpProjectThatIsMultitargeted(string solutionCommand) public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreCreated(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1302,7 +1302,7 @@ public void WhenNestedProjectIsAddedAndInRootOptionIsPassedNoSolutionFoldersAreC public void WhenSolutionFolderIsPassedProjectsAreAddedThere(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1324,7 +1324,7 @@ public void WhenSolutionFolderIsPassedProjectsAreAddedThere(string solutionComma public void WhenSolutionFolderAndInRootIsPassedItFails(string solutionCommand) { var solutionDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -1353,7 +1353,7 @@ public void WhenSolutionFolderAndInRootIsPassedItFails(string solutionCommand) public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCorrect(string solutionCommand, string solutionFolder, string testIdentifier) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: testIdentifier) + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDir", identifier: $"{solutionCommand}{testIdentifier}") .WithSource() .Path; @@ -1433,7 +1433,7 @@ public void WhenSolutionIsPassedAsProjectWithSolutionFolderItPrintsSuggestionAnd private void VerifySuggestionAndUsage(string solutionCommand, string arguments) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}{arguments}") .WithSource() .Path; From 95630ac3c3fb8e4e34d7629b0bc4b381638b5981 Mon Sep 17 00:00:00 2001 From: Sourcecodewhen Date: Wed, 9 Oct 2024 18:52:09 +0100 Subject: [PATCH 078/702] Fix: test parameters passed to copytestasset --- test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs index 4ee0ad87e512..b54349830c48 100644 --- a/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs +++ b/test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs @@ -305,7 +305,7 @@ public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solution public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("InvalidSolution", identifier: "GivenDotnetSlnRemove") + .CopyTestAsset("InvalidSolution", identifier: $"{solutionCommand}GivenDotnetSlnRemove") .WithSource() .Path; @@ -324,7 +324,7 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionComm public void WhenInvalidSolutionIsFoundRemovePrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("InvalidSolution") + .CopyTestAsset("InvalidSolution", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -344,7 +344,7 @@ public void WhenInvalidSolutionIsFoundRemovePrintsErrorAndUsage(string solutionC public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: "GivenDotnetSlnRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}GivenDotnetSlnRemove") .WithSource() .Path; @@ -362,7 +362,7 @@ public void WhenNoProjectIsPassedItPrintsErrorAndUsage(string solutionCommand) public void WhenNoSolutionExistsInTheDirectoryRemovePrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -381,7 +381,7 @@ public void WhenNoSolutionExistsInTheDirectoryRemovePrintsErrorAndUsage(string s public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithMultipleSlnFiles", identifier: "GivenDotnetSlnRemove") + .CopyTestAsset("TestAppWithMultipleSlnFiles", identifier: $"{solutionCommand}GivenDotnetSlnRemove") .WithSource() .Path; @@ -400,7 +400,7 @@ public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage(str public void WhenPassedAReferenceNotInSlnItPrintsStatus(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") + .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -421,7 +421,7 @@ public void WhenPassedAReferenceNotInSlnItPrintsStatus(string solutionCommand) public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") + .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -447,7 +447,7 @@ public void WhenPassedAReferenceItRemovesTheReferenceButNotOtherReferences(strin public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("SlnFileWithSolutionItemsInNestedFolders") + .CopyTestAsset("SlnFileWithSolutionItemsInNestedFolders", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -473,7 +473,7 @@ public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved(string solu public void WhenDuplicateReferencesArePresentItRemovesThemAll(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndDuplicateProjectReferences") + .CopyTestAsset("TestAppWithSlnAndDuplicateProjectReferences", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -502,7 +502,7 @@ public void WhenDuplicateReferencesArePresentItRemovesThemAll(string solutionCom public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneThatExists(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences") + .CopyTestAsset("TestAppWithSlnAndExistingCsprojReferences", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -533,7 +533,7 @@ public void WhenPassedMultipleReferencesAndOneOfThemDoesNotExistItRemovesTheOneT public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -557,7 +557,7 @@ public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved(string solutionComm public void WhenDirectoryContainingProjectIsGivenProjectIsRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -580,7 +580,7 @@ public void WhenDirectoryContainingProjectIsGivenProjectIsRemoved(string solutio public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; var directoryToRemove = "Empty"; @@ -602,7 +602,7 @@ public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation(string soluti public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; var directoryToRemove = "Multiple"; @@ -624,7 +624,7 @@ public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation(string public void WhenReferenceIsRemovedSlnBuilds(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -665,7 +665,7 @@ public void WhenReferenceIsRemovedSlnBuilds(string solutionCommand) public void WhenProjectIsRemovedSolutionHasUTF8BOM(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -693,7 +693,7 @@ public void WhenProjectIsRemovedSolutionHasUTF8BOM(string solutionCommand) public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -719,7 +719,7 @@ public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved(string solutionCo public void WhenNestedProjectIsRemovedItsSolutionFoldersAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirToRemove") + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -741,7 +741,7 @@ public void WhenNestedProjectIsRemovedItsSolutionFoldersAreRemoved(string soluti public void WhenFinalNestedProjectIsRemovedSolutionFoldersAreRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndLastCsprojInSubDirToRemove") + .CopyTestAsset("TestAppWithSlnAndLastCsprojInSubDirToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -763,7 +763,7 @@ public void WhenFinalNestedProjectIsRemovedSolutionFoldersAreRemoved(string solu public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnProjectDependencyToRemove") + .CopyTestAsset("TestAppWithSlnProjectDependencyToRemove", identifier: $"{solutionCommand}") .WithSource() .Path; @@ -785,7 +785,7 @@ public void WhenProjectIsRemovedThenDependenciesOnProjectAreAlsoRemoved(string s public void WhenSolutionIsPassedAsProjectItPrintsSuggestionAndUsage(string solutionCommand) { var projectDirectory = _testAssetsManager - .CopyTestAsset("TestAppWithSlnAndCsprojFiles") + .CopyTestAsset("TestAppWithSlnAndCsprojFiles", identifier: $"{solutionCommand}") .WithSource() .Path; From 9ef33f1c1cad6b3cd178ed77c19409dd7c8ad665 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 12:47:43 +0000 Subject: [PATCH 079/702] Update dependencies from https://github.com/dotnet/roslyn build 20241015.13 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.10.0-3.24511.8 -> To Version 4.10.0-3.24515.13 --- 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 8c0fa4f9afae..d5d73018a24d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 86f5186deeea364bd8541d51657e52a54b2a96b2 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + https://github.com/dotnet/roslyn - e36f0755bf88c0e40f5b6a607d4f6b520642b814 + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2810826f8654..96157a692281 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,13 +158,13 @@ - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 - 4.10.0-3.24511.8 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 + 4.10.0-3.24515.13 $(MicrosoftNetCompilersToolsetPackageVersion) From d912388c92e09f0567d1ac369414a2d0c710d7d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 12:55:41 +0000 Subject: [PATCH 080/702] Update dependencies from https://github.com/dotnet/razor build 20241015.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24515.1 -> To Version 9.0.0-preview.24515.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6589c279ddb1..5dd445e954dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - b80af7180d114023514743ad1a58cfc1b362666d + a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 - + https://github.com/dotnet/razor - b80af7180d114023514743ad1a58cfc1b362666d + a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 - + https://github.com/dotnet/razor - b80af7180d114023514743ad1a58cfc1b362666d + a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e421e7c9bafa..4d80a25daceb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24515.1 - 9.0.0-preview.24515.1 - 9.0.0-preview.24515.1 + 9.0.0-preview.24515.6 + 9.0.0-preview.24515.6 + 9.0.0-preview.24515.6 From 061d34f499c48d62ab125614abb870841edbd1af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 21:35:54 +0000 Subject: [PATCH 081/702] 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 1bc8838ad4bfd4d2816bc7909ebdbe9638e6c2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 21:36:11 +0000 Subject: [PATCH 082/702] 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 6589c279ddb1..8a85f78b94cb 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 e421e7c9bafa..8e1976a8265a 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.24508.1 + 8.0.0-beta.24516.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.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 89831470653e42b8769ec990ae1bfe364cf82786 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 21:39:40 +0000 Subject: [PATCH 083/702] 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 8c0fa4f9afae..e66f1744cfc6 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 2810826f8654..4057fe79e514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24508.1 + 8.0.0-beta.24516.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.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 084/702] 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 085/702] 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 8922654d563cdf7a693e0f24cd2cd28af65f95d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 12:21:19 +0000 Subject: [PATCH 086/702] Update dependencies from https://github.com/dotnet/templating build 20241017.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.307-servicing.24511.9 -> To Version 8.0.307-servicing.24517.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index f43c63d84ffc..530384809dc1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07866638fcfc..84c3238a8e0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac + ded032dc3046c039313fcd61e47bb37af78013b7 - + https://github.com/dotnet/templating - c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac + ded032dc3046c039313fcd61e47bb37af78013b7 - + https://github.com/dotnet/templating - c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac + ded032dc3046c039313fcd61e47bb37af78013b7 diff --git a/eng/Versions.props b/eng/Versions.props index 1a3c9f9a2d5f..fae581ef8e70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.307-servicing.24511.9 + 8.0.307-servicing.24517.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a5af630154488a86f268bde9557986f7828109fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 12:21:46 +0000 Subject: [PATCH 087/702] 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 07866638fcfc..82109883b454 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 a4b1a4ef241e5391bf6f60c346c5b415f5d89251 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 12:26:48 +0000 Subject: [PATCH 088/702] Update dependencies from https://github.com/dotnet/templating build 20241017.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.404-servicing.24511.10 -> To Version 8.0.404-servicing.24517.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c49f3431e0f..d7f82f990faa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 291f55112c11..6b8dff75d51d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - b59d68fe7fe0fefa44bda56a7b96e3ece049dfe1 + ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f - + https://github.com/dotnet/templating - b59d68fe7fe0fefa44bda56a7b96e3ece049dfe1 + ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f - + https://github.com/dotnet/templating - b59d68fe7fe0fefa44bda56a7b96e3ece049dfe1 + ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f diff --git a/eng/Versions.props b/eng/Versions.props index 9bf0c4a98984..ca9ac6437939 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.404-servicing.24511.10 + 8.0.404-servicing.24517.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From b34ce685f1c130a7feef574a20c64780c8c70cb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Oct 2024 12:27:41 +0000 Subject: [PATCH 089/702] 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 291f55112c11..64baaa166fe7 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 1ed097ec1a8e88f9427b540ac3f83ac132b3f767 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:54:30 -0500 Subject: [PATCH 090/702] [release/8.0.4xx] [Containers] Fix insecure registry handling to use the correct port for the HTTP protocol (#44234) Co-authored-by: Dameng <313880747@qq.com> --- .../FallbackToHttpMessageHandler.cs | 23 +++++- .../Registry/DefaultRegistryAPI.cs | 6 +- .../FallbackToHttpMessageHandlerTests.cs | 75 +++++++++++++++++++ 3 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 test/Microsoft.NET.Build.Containers.UnitTests/FallbackToHttpMessageHandlerTests.cs diff --git a/src/Containers/Microsoft.NET.Build.Containers/FallbackToHttpMessageHandler.cs b/src/Containers/Microsoft.NET.Build.Containers/FallbackToHttpMessageHandler.cs index 5f7754d58bb1..7fcb85735605 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/FallbackToHttpMessageHandler.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/FallbackToHttpMessageHandler.cs @@ -12,13 +12,16 @@ namespace Microsoft.NET.Build.Containers; /// internal sealed partial class FallbackToHttpMessageHandler : DelegatingHandler { + private readonly string _registryName; private readonly string _host; private readonly int _port; private readonly ILogger _logger; private bool _fallbackToHttp; - public FallbackToHttpMessageHandler(string host, int port, HttpMessageHandler innerHandler, ILogger logger) : base(innerHandler) + public FallbackToHttpMessageHandler(string registryName, string host, int port, HttpMessageHandler innerHandler, ILogger logger) + : base(innerHandler) { + _registryName = registryName; _host = host; _port = port; _logger = logger; @@ -38,7 +41,7 @@ protected override async Task SendAsync(HttpRequestMessage { if (canFallback && _fallbackToHttp) { - FallbackToHttp(request); + FallbackToHttp(_registryName, request); canFallback = false; } @@ -51,7 +54,7 @@ protected override async Task SendAsync(HttpRequestMessage { // Try falling back. _logger.LogTrace("Attempt to fall back to http for {uri}.", uri); - FallbackToHttp(request); + FallbackToHttp(_registryName, request); HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false); // Fall back was successful. Use http for all new requests. @@ -76,10 +79,22 @@ internal static bool ShouldAttemptFallbackToHttp(HttpRequestException exception) return exception.HttpRequestError == HttpRequestError.SecureConnectionError; } - private static void FallbackToHttp(HttpRequestMessage request) + private static bool RegistryNameContainsPort(string registryName) + { + // use `container` scheme which does not have a default port. + return new Uri($"container://{registryName}").Port != -1; + } + + private static void FallbackToHttp(string registryName, HttpRequestMessage request) { var uriBuilder = new UriBuilder(request.RequestUri!); uriBuilder.Scheme = "http"; + if (RegistryNameContainsPort(registryName) == false) + { + // registeryName does not contains port number, so reset the port number to -1, otherwise it will be https default port 443 + uriBuilder.Port = -1; + } + request.RequestUri = uriBuilder.Uri; } } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs index dff5a8921cc2..7a5ae043e319 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs @@ -37,7 +37,7 @@ internal DefaultRegistryAPI(string registryName, Uri baseUri, bool isInsecureReg private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger logger, bool isInsecureRegistry, RegistryMode mode) { - HttpMessageHandler innerHandler = CreateHttpHandler(baseUri, isInsecureRegistry, logger); + HttpMessageHandler innerHandler = CreateHttpHandler(registryName, baseUri, isInsecureRegistry, logger); HttpMessageHandler clientHandler = new AuthHandshakeMessageHandler(registryName, innerHandler, logger, mode); @@ -56,7 +56,7 @@ private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger return client; } - private static HttpMessageHandler CreateHttpHandler(Uri baseUri, bool allowInsecure, ILogger logger) + private static HttpMessageHandler CreateHttpHandler(string registryName, Uri baseUri, bool allowInsecure, ILogger logger) { var socketsHttpHandler = new SocketsHttpHandler() { @@ -75,7 +75,7 @@ private static HttpMessageHandler CreateHttpHandler(Uri baseUri, bool allowInsec RemoteCertificateValidationCallback = IgnoreCertificateErrorsForSpecificHost(baseUri.Host) }; - return new FallbackToHttpMessageHandler(baseUri.Host, baseUri.Port, socketsHttpHandler, logger); + return new FallbackToHttpMessageHandler(registryName, baseUri.Host, baseUri.Port, socketsHttpHandler, logger); } private static RemoteCertificateValidationCallback IgnoreCertificateErrorsForSpecificHost(string host) diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/FallbackToHttpMessageHandlerTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/FallbackToHttpMessageHandlerTests.cs new file mode 100644 index 000000000000..0c6933f94473 --- /dev/null +++ b/test/Microsoft.NET.Build.Containers.UnitTests/FallbackToHttpMessageHandlerTests.cs @@ -0,0 +1,75 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging.Abstractions; + +namespace Microsoft.NET.Build.Containers.UnitTests +{ + public class FallbackToHttpMessageHandlerTests + { + [Theory] + [InlineData("mcr.microsoft.com", 80)] + [InlineData("mcr.microsoft.com:443", 443)] + [InlineData("mcr.microsoft.com:80", 80)] + [InlineData("mcr.microsoft.com:5555", 5555)] + [InlineData("[2408:8120:245:49a0:f041:d7bb:bb13:5b64]", 80)] + [InlineData("[2408:8120:245:49a0:f041:d7bb:bb13:5b64]:443", 443)] + [InlineData("[2408:8120:245:49a0:f041:d7bb:bb13:5b64]:80", 80)] + [InlineData("[2408:8120:245:49a0:f041:d7bb:bb13:5b64]:5555", 5555)] + public async Task FallBackToHttpPortShouldAsExpected(string registry, int expectedPort) + { + var uri = new Uri($"https://{registry}"); + var handler = new FallbackToHttpMessageHandler( + registry, + uri.Host, + uri.Port, + new ServerMessageHandler(request => + { + // only accept http requests, reject https requests with a secure connection error + + if (request.RequestUri!.Scheme == Uri.UriSchemeHttps) + { + throw new HttpRequestException( + httpRequestError: HttpRequestError.SecureConnectionError + ); + } + else + { + return new HttpResponseMessage(HttpStatusCode.OK) + { + RequestMessage = request, + }; + } + }), + NullLogger.Instance + ); + using var httpClient = new HttpClient(handler); + var response = await httpClient.GetAsync(uri); + Assert.Equal(expectedPort, response.RequestMessage?.RequestUri?.Port); + } + + private sealed class ServerMessageHandler : HttpMessageHandler + { + private readonly Func _server; + + public ServerMessageHandler(Func server) + { + _server = server; + } + + protected override Task SendAsync( + HttpRequestMessage request, + CancellationToken cancellationToken + ) + { + return Task.FromResult(_server(request)); + } + } + } +} From 40966f9a433eb85a0ea3dc0d082cea5934f7ac25 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 17 Oct 2024 22:29:18 +0000 Subject: [PATCH 091/702] Merged PR 43924: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22 - **Build**: 20241016.9 - **Date Produced**: October 17, 2024 1:00:24 AM UTC - **Commit**: 64edceb090bcd73e7f842a47b31b4fc865f48b08 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24516.9][1] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24516.9][1] - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.0][1] - **System.CodeDom**: [from 9.0.0 to 9.0.0][1] - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Convention**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Hosting**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Runtime**: [from 9.0.0 to 9.0.0][1] - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.0][1] - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.0][1] - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1] - **System.Reflection.MetadataLoadContext**: [from 9.0.0 to 9.0.0][1] - **System.Resources.Extensions**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Pkcs**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.ProtectedData**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Xml**: [from 9.0.0 to 9.0.0][1] - **System.Security.Permissions**: [from 9.0.0 to 9.0.0][1] - **System.ServiceProcess.ServiceController**: [from 9.0.0 to 9.0.0][1] - **System.Text.Encoding.CodePages**: [from 9.0.0 to 9.0.0][1] - **System.Text.Json**: [from 9.0.0 to 9.0.0][1] - **System.Windows.Extensions**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24516.9][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24516.9][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24516.9][1] [1]: https:... --- NuGet.config | 3 +- eng/Version.Details.xml | 150 ++++++++++++++++++++-------------------- eng/Versions.props | 8 +-- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8275c6dd295..a1bd6eaf825b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,12 @@ - + @@ -58,6 +58,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a82a3d449442..78d9081a6584 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,41 +16,41 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 @@ -231,28 +231,28 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 https://github.com/dotnet/windowsdesktop @@ -504,88 +504,88 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 @@ -620,8 +620,8 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d5b75a02d961..1c210c8933a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24516.9 9.0.0 9.0.0 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24516.9 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24516.10 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24516.9 + 9.0.0-rtm.24516.9 9.0.0 9.0.0 9.0.0 From bc1f4202dc1e5554dea34634169ad55f65a2d153 Mon Sep 17 00:00:00 2001 From: tmat Date: Thu, 17 Oct 2024 16:47:29 -0700 Subject: [PATCH 092/702] Continue printing out redirected process output after we detect browser launch URL. --- .../dotnet-watch/Browser/BrowserConnector.cs | 9 ++++++++- test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs index e5e90a0bf361..080cc603dcdc 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs @@ -112,6 +112,8 @@ public bool TryGetRefreshServer(ProjectGraphNode projectNode, [NotNullWhen(true) return null; } + bool matchFound = false; + return handler; void handler(object sender, DataReceivedEventArgs eventArgs) @@ -119,13 +121,18 @@ void handler(object sender, DataReceivedEventArgs eventArgs) // We've redirected the output, but want to ensure that it continues to appear in the user's console. Console.WriteLine(eventArgs.Data); + if (matchFound) + { + return; + } + var match = s_nowListeningRegex.Match(eventArgs.Data ?? ""); if (!match.Success) { return; } - ((Process)sender).OutputDataReceived -= handler; + matchFound = true; var projectAddedToAttemptedSet = ImmutableInterlocked.Update(ref _browserLaunchAttempted, static (set, projectNode) => set.Add(projectNode), projectNode); if (projectAddedToAttemptedSet) diff --git a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs index 087a1ce74c49..6c5ec44ea1db 100644 --- a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs +++ b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs @@ -22,8 +22,11 @@ public async Task LaunchesBrowserOnStart() App.Start(testAsset, [], testFlags: TestFlags.MockBrowser); + // check that all app output is printed out: + await App.AssertOutputLine(line => line.Contains("Content root path:")); + // Verify we launched the browser. - await App.AssertOutputLineStartsWith("dotnet watch ⌚ Launching browser: https://localhost:5001/"); + Assert.Contains(App.Process.Output, line => line.Contains("Launching browser: https://localhost:5001/")); } [Fact] From 391030ba389fed9b5113a4ee9c22a079648dfac9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 23:56:51 +0000 Subject: [PATCH 093/702] 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 c85dc1e4c0ea36830ef379564926ab89ecf89ce5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 23:56:57 +0000 Subject: [PATCH 094/702] 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 829708d8ed6b..42cdfb24ba90 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,29 @@ - - - + + + + + + + + + + + + + @@ -29,6 +39,7 @@ + @@ -41,7 +52,15 @@ + + + + + + + + @@ -70,13 +89,25 @@ + + + + + + + + + + + + @@ -87,6 +118,7 @@ + @@ -95,7 +127,15 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab378ca96b99..958c25f39432 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ c4f355e05e7e0e8e4fe79381a540feeb4ba9a7ac - + 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 c4d80397805bec06b354d20aeb1773e243c6add0 - + 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 54144ffb2557..afe20386e707 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 095/702] 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 b9adb861366f4ebae2b34b734224560212b804fc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 09:53:18 +0000 Subject: [PATCH 096/702] 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 42cdfb24ba90..85db9475e521 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,15 +19,7 @@ - - - - - - - - - + @@ -88,15 +80,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 958c25f39432..fdabd167414b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + 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 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 - + 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 afe20386e707..7a47f7957d34 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 6d37797c52f5228840dd8cc9b8be0ed11727fa3f Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 18 Oct 2024 13:26:26 +0000 Subject: [PATCH 097/702] Merged PR 43925: [internal/release/9.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 9.0.0-rtm.24517.5 to 9.0.0-rtm.24517.7 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24517.5 to 9.0.0-rtm.24517.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241017.6 - **Date Produced**: October 17, 2024 11:00:54 PM UTC - **Commit**: 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][4] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6][4] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6][4] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24517.5 to 9.0.0-rtm.24517.7][5] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4][6] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24517.5 to 9.0.0-rtm.24517.7][5] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCf03451de6f16843c3e500897b88c64b62d72f768&targetVersion=GC62df8b9a0cf4a9959e74ff5ea8d661acb6282261&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfbbc5b5c8ef7cbe6230b7fda555b0fc313287b57&targetVersion=GCd2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC7735f31438f7743e2d5d9d951760c54d8d4c48ec&targetVersion=GCd23e6a34d404b5feffbd13c121b13d3f1963eb2f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 3 +- eng/Version.Details.xml | 38 +++++----- eng/Versions.props | 10 +-- eng/pipelines/templates/steps/vmr-prepare.yml | 9 ++- eng/pipelines/vmr-build-pr-internal.yml | 73 +++++++++++++++++++ 5 files changed, 105 insertions(+), 28 deletions(-) create mode 100644 eng/pipelines/vmr-build-pr-internal.yml diff --git a/NuGet.config b/NuGet.config index a1bd6eaf825b..e2830a7138eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,7 +29,7 @@ - + @@ -66,6 +66,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edefe47f4cfd..0c11136f678c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -255,25 +255,25 @@ 64edceb090bcd73e7f842a47b31b4fc865f48b08 - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 - - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 - - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c https://github.com/dotnet/aspnetcore @@ -390,13 +390,13 @@ - - https://github.com/dotnet/winforms - 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + d23e6a34d404b5feffbd13c121b13d3f1963eb2f - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 79eb45ce1e1f..ca4d5564d5f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24515.14 + 9.0.0-rtm.24517.4 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24516.7 - 9.0.0-rtm.24516.7 + 9.0.0-rtm.24517.6 + 9.0.0-rtm.24517.6 9.0.0 9.0.0 @@ -248,8 +248,8 @@ - 9.0.0-rtm.24515.3 - 9.0.0-rtm.24515.3 + 9.0.0-rtm.24517.7 + 9.0.0-rtm.24517.7 diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 0a34630a5400..8cb5bae7815c 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -10,9 +10,12 @@ steps: displayName: Clone dotnet/dotnet path: vmr clean: true + fetchTags: true + fetchDepth: 0 - - script: | - git checkout --track origin/${{ parameters.vmrBranch }} - echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}" + - powershell: | + $branchName = "${{ parameters.vmrBranch }}" -replace "refs/heads/", "" + git checkout --track origin/$branchName || exit 1 + echo "##vso[task.setvariable variable=vmrBranch]$branchName" displayName: Check out ${{ parameters.vmrBranch }} workingDirectory: $(Agent.BuildDirectory)/vmr diff --git a/eng/pipelines/vmr-build-pr-internal.yml b/eng/pipelines/vmr-build-pr-internal.yml new file mode 100644 index 000000000000..61a764d172f6 --- /dev/null +++ b/eng/pipelines/vmr-build-pr-internal.yml @@ -0,0 +1,73 @@ +# This YAML is used by these PR pipelines: +# +# - dotnet-sdk-source-build-internal +# https://dev.azure.com/dnceng/internal/_build?definitionId=1378 + +trigger: none +pr: + branches: + include: + - internal/release/* + exclude: + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to push to + type: string + default: ' ' + +- name: disableBuild + displayName: Skip the VMR Build stage + type: boolean + default: false + +variables: +- template: /eng/common/templates/variables/pool-providers.yml@self + +- ${{ if ne(parameters.vmrBranch, ' ') }}: + - name: VmrBranch + value: ${{ replace(parameters.vmrBranch, ' ', '') }} +- ${{ else }}: + - name: VmrBranch + value: ${{ replace(replace(variables['System.PullRequest.TargetBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} + +# enable source-only build for pipelines with the -source-build suffix +- name: isSourceOnlyBuild + value: ${{ contains(variables['Build.DefinitionName'], '-source-build') }} + +resources: + repositories: + - repository: vmr + name: dotnet-dotnet + type: git + ref: ${{ variables.VmrBranch }} + +stages: +# You can temporarily disable the VMR Build stage by setting the disableBuild variable +- ${{ if not(parameters.disableBuild) }}: + - template: templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + isBuiltFromVmr: false + isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }} + ${{ if contains(variables['Build.DefinitionName'], '-full') }}: + scope: full + ${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}: + scope: ultralite + ${{ else }}: + scope: lite + +# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate +# that the PR can be merged and later synchronized into the VMR without problems. +- ${{ else }}: + - stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + noPush: true From f97a8ebffe3925de867f29c458136552df39bb8e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 18 Oct 2024 16:12:20 +0000 Subject: [PATCH 098/702] Merged PR 43939: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.0-rtm.24515.1 to 9.0.0-rtm.24517.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.0 to 9.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.0-rtm.24515.1 to 9.0.0-rtm.24517.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22 - **Build**: 20241017.11 - **Date Produced**: October 18, 2024 1:51:45 AM UTC - **Commit**: 77833cfe67d875e65b84538d7d310ef6d67010c4 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24516.9 to 9.0.0-rtm.24517.11][1] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24516.9 to 9.0.0-rtm.24517.11][1] - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.0][1] - **System.CodeDom**: [from 9.0.0 to 9.0.0][1] - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Convention**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Hosting**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Runtime**: [from 9.0.0 to 9.0.0][1] - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.0][1] - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.0][1] - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1] - **System.Reflection.Metadata... --- NuGet.config | 6 +-- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2830a7138eb..9d3bf3020bf2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c11136f678c..afaaf42b4ee8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 5054dd35a56010d8f6232408e56e31ad8ccc987a https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 5054dd35a56010d8f6232408e56e31ad8ccc987a - + https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 5054dd35a56010d8f6232408e56e31ad8ccc987a @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://github.com/dotnet/aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index ca4d5564d5f5..1917fb20398c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24516.9 + 9.0.0-rtm.24517.18 9.0.0 9.0.0 - 9.0.0-rtm.24516.9 + 9.0.0-rtm.24517.18 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24516.9 - 9.0.0-rtm.24516.9 + 9.0.0-rtm.24517.18 + 9.0.0-rtm.24517.18 9.0.0 9.0.0 9.0.0 @@ -328,7 +328,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24515.1 + 9.0.0-rtm.24517.2 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From 946edfaaa03e9eea5ea437f50bf620d85b6b99d3 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 18 Oct 2024 16:29:27 +0000 Subject: [PATCH 099/702] Merged PR 43992: [internal/release/9.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 9.0.0-rtm.24517.7 to 9.0.0-rtm.24518.3 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24517.7 to 9.0.0-rtm.24518.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241018.3 - **Date Produced**: October 18, 2024 2:36:15 PM UTC - **Commit**: 6621e3204f9fd1b1b636602a4822da334b6954da - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24517.6 to 9.0.0-rtm.24518.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24517.6 to 9.0.0-rtm.24518.3][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24517.7 to 9.0.0-rtm.24518.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24518.2][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24517.7 to 9.0.0-rtm.24518.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC62df8b9a0cf4a9959e74ff5ea8d661acb6282261&targetVersion=GC6621e3204f9fd1b1b636602a4822da334b6954da&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCd2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c&targetVersion=GC3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCd23e6a34d404b5feffbd13c121b13d3f1963eb2f&targetVersion=GC90c08cb77d1bdbbf0c8230a59876a85a1a265ef6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d3bf3020bf2..a7d6e64315ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,7 +29,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afaaf42b4ee8..751ff2b0d885 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 + 6621e3204f9fd1b1b636602a4822da334b6954da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 + 6621e3204f9fd1b1b636602a4822da334b6954da https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 + 6621e3204f9fd1b1b636602a4822da334b6954da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 + 6621e3204f9fd1b1b636602a4822da334b6954da - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c + 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb https://github.com/dotnet/aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d23e6a34d404b5feffbd13c121b13d3f1963eb2f + 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c + 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1917fb20398c..47fd6e670158 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24517.4 + 9.0.0-rtm.24518.2 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24517.6 - 9.0.0-rtm.24517.6 + 9.0.0-rtm.24518.3 + 9.0.0-rtm.24518.3 9.0.0 9.0.0 @@ -248,8 +248,8 @@ - 9.0.0-rtm.24517.7 - 9.0.0-rtm.24517.7 + 9.0.0-rtm.24518.3 + 9.0.0-rtm.24518.3 From 68f165d29ee02d3b2b32d73857b8fdaf5ffe5c73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 18:29:35 +0000 Subject: [PATCH 100/702] 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 a2e1aa1b21c37fc274558f383977c7a83e4ae4e7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 18:29:36 +0000 Subject: [PATCH 101/702] 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 85db9475e521..748cbc75aab7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,17 +43,7 @@ - - - - - - - - - - - + @@ -110,17 +100,7 @@ - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdabd167414b..dc697c1bd88d 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 7a47f7957d34..fbef588af570 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 ca04700a410f75046f2e3272480fac565fd6c192 Mon Sep 17 00:00:00 2001 From: tmat Date: Fri, 18 Oct 2024 11:36:37 -0700 Subject: [PATCH 102/702] Feedback --- test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs index 6c5ec44ea1db..a17a7f8e2294 100644 --- a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs +++ b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs @@ -25,8 +25,11 @@ public async Task LaunchesBrowserOnStart() // check that all app output is printed out: await App.AssertOutputLine(line => line.Contains("Content root path:")); + Assert.Contains(App.Process.Output, line => line.Contains("Application started. Press Ctrl+C to shut down.")); + Assert.Contains(App.Process.Output, line => line.Contains("Hosting environment: Development")); + // Verify we launched the browser. - Assert.Contains(App.Process.Output, line => line.Contains("Launching browser: https://localhost:5001/")); + Assert.Contains(App.Process.Output, line => line.Contains("dotnet watch ⌚ Launching browser: https://localhost:5001/")); } [Fact] From c684f9960b9663a7a07da0f587c12aad64ec1c62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 20:44:00 +0000 Subject: [PATCH 103/702] 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 748cbc75aab7..bc0e3a514842 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc697c1bd88d..527e37b88f35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + 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 fbef588af570..b1df4b751ef9 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 d2c5dbb924f48c2d0477ecf729da49c39ebe2428 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 20:44:00 +0000 Subject: [PATCH 104/702] 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 5f8fcb160bf5b02b4228009a2b2b53c57da46704 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 19 Oct 2024 01:06:55 +0000 Subject: [PATCH 105/702] Merged PR 44023: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 7c429c14-b12b-40f6-ae9e-395f98f369df - **Build**: 20241018.19 - **Date Produced**: October 18, 2024 11:42:43 PM UTC - **Commit**: 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **dotnet-user-jwts**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **dotnet-user-secrets**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.Analyzers**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Authorization**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.Components.Web**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.AspNetCore.TestHost**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.ObjectPool**: [from 9.0.0 to 9.0.0][1] - **Microsoft.JSInterop**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24518.19][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f&targetVersion=GC64b6ae8cbc37f69c202d64f0dc8c64718892d67b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df) --- NuGet.config | 3 +- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++----- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4249e25e9ac5..bb5e2c8a0804 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -57,6 +57,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1036ed94acab..b7c6f8a56af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b https://github.com/nuget/nuget.client @@ -276,53 +276,53 @@ 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b @@ -344,20 +344,20 @@ - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b https://github.com/dotnet/test-templates @@ -540,8 +540,8 @@ 26f329604f8e2255105f273a82de369fbd17e5cb - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 64b6ae8cbc37f69c202d64f0dc8c64718892d67b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index df940de6ac86..e29b9a72dc44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -227,18 +227,18 @@ 9.0.0 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 9.0.0 9.0.0 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 + 9.0.0-rtm.24518.19 From eb40b75f9ce5df777d5df7fcf16c1c29925c8e9b Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 19 Oct 2024 01:07:44 +0000 Subject: [PATCH 106/702] Merged PR 44020: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22 - **Build**: 20241018.5 - **Date Produced**: October 18, 2024 9:34:51 PM UTC - **Commit**: e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1] - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.0][1] - **System.CodeDom**: [from 9.0.0 to 9.0.0][1] - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Convention**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Hosting**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Runtime**: [from 9.0.0 to 9.0.0][1] - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.0][1] - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.0][1] - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1] - **System.Reflection.MetadataLoadContext**: [from 9.0.0 to 9.0.0][1] - **System.Resources.Extensions**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Pkcs**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.ProtectedData**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Xml**: [from 9.0.0 to 9.0.0][1] - **System.Security.Permissions**: [from 9.0.0 to 9.0.0][1] - **System.ServiceProcess.ServiceController**: [from 9.0.0 to 9.0.0][1] - **System.Text.Encoding.CodePages**: [from 9.0.0 to 9.0.0][1] - **System.Text.Json**: [from 9.0.0 to 9.0.0][1] - **System.Windows.Extensions**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1] [1]: https:... --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb5e2c8a0804..4e716196f564 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,12 @@ + - @@ -60,12 +60,12 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7c6f8a56af6..955e76bf1806 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + e8d255286ddb19ea56ba86bd81429cf90dbd00e7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index e29b9a72dc44..5537faa499b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24517.18 + 9.0.0-rtm.24518.5 9.0.0 9.0.0 - 9.0.0-rtm.24517.18 + 9.0.0-rtm.24518.5 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24517.18 - 9.0.0-rtm.24517.18 + 9.0.0-rtm.24518.5 + 9.0.0-rtm.24518.5 9.0.0 9.0.0 9.0.0 From 4a21cf25954d365a0311de2d5186c5d917419e78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Oct 2024 11:30:23 +0000 Subject: [PATCH 107/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.38 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.23 -> To Version 6.13.0-preview.1.38 --- 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 a07148564de4..9b05c8f7db4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 - + https://github.com/nuget/nuget.client - 1a8ca6067347fd68340090e29464ef58a0c9ef62 + 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 2f4fe113a48a..0e663d48816c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 - 6.13.0-preview.1.23 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 + 6.13.0-preview.1.38 From 583814a91a0d0d4cde9fc3fb70619ed95e210d82 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 20 Oct 2024 20:07:25 -0700 Subject: [PATCH 108/702] Update System.Text.Json to 8.0.5 --- .../Microsoft.NET.Build.Containers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj index 62f494d2e357..56dd698e49ab 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj @@ -48,7 +48,7 @@ - 8.0.4 + 8.0.5 From 5bcd402409e5dad4bb595d6b9916a3282153d8ef Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 21 Oct 2024 17:25:17 +0000 Subject: [PATCH 109/702] Merged PR 44028: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 57bb26e6-6f64-40cf-a4ea-5b973f41bc22 - **Build**: 20241018.14 - **Date Produced**: October 19, 2024 5:07:58 AM UTC - **Commit**: 9c52987919f0223531191d4cfaa6487647bbf52c - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1] - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.0][1] - **System.CodeDom**: [from 9.0.0 to 9.0.0][1] - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Convention**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Hosting**: [from 9.0.0 to 9.0.0][1] - **System.Composition.Runtime**: [from 9.0.0 to 9.0.0][1] - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.0][1] - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.0][1] - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1] - **System.Reflection.MetadataLoadContext**: [from 9.0.0 to 9.0.0][1] - **System.Resources.Extensions**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Pkcs**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.ProtectedData**: [from 9.0.0 to 9.0.0][1] - **System.Security.Cryptography.Xml**: [from 9.0.0 to 9.0.0][1] - **System.Security.Permissions**: [from 9.0.0 to 9.0.0][1] - **System.ServiceProcess.ServiceController**: [from 9.0.0 to 9.0.0][1] - **System.Text.Encoding.CodePages**: [from 9.0.0 to 9.0.0][1] - **System.Text.Json**: [from 9.0.0 to 9.0.0][1] - **System.Windows.Extensions**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1] [1]: https... --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e716196f564..a2b53f8fab22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,12 @@ - + @@ -60,12 +60,12 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3aac15b297e3..674cea8ef559 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e8d255286ddb19ea56ba86bd81429cf90dbd00e7 + 9c52987919f0223531191d4cfaa6487647bbf52c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 0c6bac3d2771..18de8644c3d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24518.5 + 9.0.0-rtm.24518.14 9.0.0 9.0.0 - 9.0.0-rtm.24518.5 + 9.0.0-rtm.24518.14 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24518.5 - 9.0.0-rtm.24518.5 + 9.0.0-rtm.24518.14 + 9.0.0-rtm.24518.14 9.0.0 9.0.0 9.0.0 From f0a49a77333c400e6d9d5fe995fdaebbb4a8d1c0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 18:12:17 +0000 Subject: [PATCH 110/702] 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 bc0e3a514842..6bc590e76843 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 527e37b88f35..83dd316b0d44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + 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 b1df4b751ef9..6efb2036e6f3 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 ab2a66083158ff24ac1d3430cf017c2d7355b8cd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 18:12:18 +0000 Subject: [PATCH 111/702] 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 71adf5539c16f3f80d93ebb4f6c855bf6fdd7243 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 21 Oct 2024 18:14:05 +0000 Subject: [PATCH 112/702] Merged PR 44025: [internal/release/9.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 9.0.0-rtm.24518.6 to 9.0.0-rtm.24521.4 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24518.2 to 9.0.0-rtm.24521.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24518.6 to 9.0.0-rtm.24521.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241021.3 - **Date Produced**: October 21, 2024 3:05:47 PM UTC - **Commit**: d3c394733377a409bfdea569a088c2e22c8a2965 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24518.7 to 9.0.0-rtm.24521.3][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24518.7 to 9.0.0-rtm.24521.3][3] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24518.6 to 9.0.0-rtm.24521.4][4] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24518.2 to 9.0.0-rtm.24521.1][5] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24518.6 to 9.0.0-rtm.24521.4][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC9a816eb72c124ea885bd62a1852ca1101303aef6&targetVersion=GCd3c394733377a409bfdea569a088c2e22c8a2965&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCbad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7&targetVersion=GC1534d6c1ae447b5dcc661d08f2abaa334b045140&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC90c08cb77d1bdbbf0c8230a59876a85a1a265ef6&targetVersion=GC3fe741b12b6b0d5b000232def507a39247f972ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2b53f8fab22..a27dd0c9e60e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,11 @@ + + @@ -28,9 +30,10 @@ + - + @@ -57,6 +60,7 @@ + @@ -68,7 +72,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 674cea8ef559..0961236c21fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6621e3204f9fd1b1b636602a4822da334b6954da + d3c394733377a409bfdea569a088c2e22c8a2965 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6621e3204f9fd1b1b636602a4822da334b6954da + d3c394733377a409bfdea569a088c2e22c8a2965 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6621e3204f9fd1b1b636602a4822da334b6954da + d3c394733377a409bfdea569a088c2e22c8a2965 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6621e3204f9fd1b1b636602a4822da334b6954da + d3c394733377a409bfdea569a088c2e22c8a2965 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb + 1534d6c1ae447b5dcc661d08f2abaa334b045140 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 + 3fe741b12b6b0d5b000232def507a39247f972ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb + 1534d6c1ae447b5dcc661d08f2abaa334b045140 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 18de8644c3d2..4bca18f54f18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24518.2 + 9.0.0-rtm.24521.1 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24518.3 - 9.0.0-rtm.24518.3 + 9.0.0-rtm.24521.3 + 9.0.0-rtm.24521.3 9.0.0 9.0.0 @@ -250,8 +250,8 @@ - 9.0.0-rtm.24518.3 - 9.0.0-rtm.24518.3 + 9.0.0-rtm.24521.4 + 9.0.0-rtm.24521.4 From f7156c242681722ac1db4d5ef3b5f0eb5d80066d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Oct 2024 18:23:41 +0000 Subject: [PATCH 113/702] Update dependencies from https://github.com/dotnet/aspire build 20241019.4 Microsoft.SourceBuild.Intermediate.aspire , Microsoft.NET.Sdk.Aspire.Manifest-8.0.100 From Version 8.2.1-preview.1.24473.4 -> To Version 8.2.2-preview.1.24519.4 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17de450e797d..dd9b5b0a98ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + @@ -28,6 +28,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2417d1b955ed..f159fdc335b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -650,14 +650,14 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7 + 2c38f6c884b5026a7f278cdfe6e1f816810093f9 - + https://github.com/dotnet/aspire - 137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7 + 2c38f6c884b5026a7f278cdfe6e1f816810093f9 diff --git a/eng/Versions.props b/eng/Versions.props index 83c7c0cb5caf..5802396a58b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -321,7 +321,7 @@ 8.0.100 - 8.2.1 + 8.2.2 9.0.100-rc.2 9.0.0-rc.2.24503.2 35.0.0-rc.2.152 From beebd7bff538099f2c709c58a758f90fd88480c9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 18:33:52 +0000 Subject: [PATCH 114/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24518.19 -> To Version 9.0.0-rtm.24521.5 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index a27dd0c9e60e..1add46bda3ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,8 +12,7 @@ - - + @@ -60,8 +59,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0961236c21fa..0dcc4b468e31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 64b6ae8cbc37f69c202d64f0dc8c64718892d67b + 4377305293d13820feffdc223bb7be30147e0ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4bca18f54f18..b76b09c1cd78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,18 +229,18 @@ 9.0.0 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 9.0.0 9.0.0 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 - 9.0.0-rtm.24518.19 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.5 From bef8e9def5759744f81d45915b1768336f36140b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 21:51:29 +0000 Subject: [PATCH 115/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.9 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24521.5 -> To Version 9.0.0-rtm.24521.9 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1add46bda3ca..81af2415980f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dcc4b468e31..ea0da474c3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4377305293d13820feffdc223bb7be30147e0ab5 + 4130e2c8f44c47a36712ef50197e35d455b9c8ff https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b76b09c1cd78..7bcdc9a9ed84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,18 +229,18 @@ 9.0.0 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 9.0.0 9.0.0 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 - 9.0.0-rtm.24521.5 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.9 From 8104eee961ccb1e29cf82854dc173cdfb6305c5e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 01:00:30 +0000 Subject: [PATCH 116/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.13 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24521.9 -> To Version 9.0.0-rtm.24521.13 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 81af2415980f..41fe2c8f5bdc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea0da474c3de..55e9fc796d62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4130e2c8f44c47a36712ef50197e35d455b9c8ff + 4f6ca25639e9dd2010535850faa4abbf83bc1532 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7bcdc9a9ed84..28ebf7ad1608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,18 +229,18 @@ 9.0.0 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 9.0.0 9.0.0 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 - 9.0.0-rtm.24521.9 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.13 From 4b4ba042556b07390f4f38d711758156cc13b241 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 01:39:34 +0000 Subject: [PATCH 117/702] 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 6bc590e76843..e96fc10540ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83dd316b0d44..905f869b49d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 - + 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 6efb2036e6f3..f08febf4ab6a 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 c1cdd6cb4aff5a1aee18d273753b85273d17c663 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 01:39:36 +0000 Subject: [PATCH 118/702] 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 73e797c9e02244eddd2ff2d8caf88d01733cacbe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 02:06:53 +0000 Subject: [PATCH 119/702] 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 e96fc10540ad..e392f64b7bc1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,7 +43,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905f869b49d4..7d1b7f2facbd 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 f08febf4ab6a..6a0ce9c7e785 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 8ddc0835e6d55e28c258dee035cd97e2d9ba61d7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 02:06:55 +0000 Subject: [PATCH 120/702] 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 d41e240a8043518fbb40ee61a8b12ef261e7274a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 03:10:14 +0000 Subject: [PATCH 121/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241021.19 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24521.13 -> To Version 9.0.0-rtm.24521.19 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41fe2c8f5bdc..01eac735306f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55e9fc796d62..9dfc29043de9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4f6ca25639e9dd2010535850faa4abbf83bc1532 + 85435709e560642610e746831682cf4f8fe77c34 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 28ebf7ad1608..56974bed878f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,18 +229,18 @@ 9.0.0 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 9.0.0 9.0.0 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 - 9.0.0-rtm.24521.13 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 + 9.0.0-rtm.24521.19 From 483dc66ba27cb1fc4a972d18406be2668d4cbe0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:21:29 -0700 Subject: [PATCH 122/702] [release/9.0.1xx] Update dependencies from dotnet/sourcelink (#44356) Co-authored-by: dotnet-maestro[bot] --- 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 feff1ef39700..be82de9b484f 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 - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 - + https://github.com/dotnet/sourcelink - 24760f9b1ed7478863d699b7f6634e82d1b25bd1 + c579a775e65111c54555df734ca98e87bdb1dc27 diff --git a/eng/Versions.props b/eng/Versions.props index 2e0d3ba80371..547a9bebdd1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -290,12 +290,12 @@ - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24521.1 + 9.0.0-beta.24521.1 + 9.0.0-beta.24521.1 + 9.0.0-beta.24521.1 + 9.0.0-beta.24521.1 + 9.0.0-beta.24521.1 From d6d829d46a75f5b046544621e13102a7d00db12f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:21:38 -0700 Subject: [PATCH 123/702] [release/9.0.1xx] Update dependencies from dotnet/msbuild (#44355) Co-authored-by: dotnet-maestro[bot] --- 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 fd5d89e77cae..b609b995bbca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be82de9b484f..534a964ad4b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8be5676af1ccf568b258133788a24aedd1a80994 - + https://github.com/dotnet/msbuild - db5f6012cb7f6e2dd7066c50c573c0d352713407 + 5b866566089bfdd756730948f6418e2759b8850f - + https://github.com/dotnet/msbuild - db5f6012cb7f6e2dd7066c50c573c0d352713407 + 5b866566089bfdd756730948f6418e2759b8850f - + https://github.com/dotnet/msbuild - db5f6012cb7f6e2dd7066c50c573c0d352713407 + 5b866566089bfdd756730948f6418e2759b8850f diff --git a/eng/Versions.props b/eng/Versions.props index 547a9bebdd1c..7868fff97b8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -194,8 +194,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.12.6 - 17.12.6-preview-24518-05 + 17.12.7 + 17.12.7-preview-24522-03 17.11.4 From 25911f487cebbaa7e4412710a89ae16343678052 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 22 Oct 2024 10:36:53 -0700 Subject: [PATCH 124/702] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2566476 --- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 83e82fbfc2ae..7b39baa177f7 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Die Ausrichtung auf .NET 9.0 oder höher in Visual Studio 2022 17.11 wird nicht unterstützt. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index b91c5e72138c..d7bd73780193 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Le ciblage de .NET 9.0 ou version ultérieure dans Visual Studio 2022 17.11 n’est pas pris en charge. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 32dd3403df41..f15e0756566c 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Visual Studio 2022 17.11에서 .NET 9.0 이상을 대상으로 지정하는 것은 지원되지 않습니다. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index f68aa8dd9b9c..8f17d1e078c9 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: não há suporte para o direcionamento do .NET 9.0 ou superior no Visual Studio 2022 17.11. {StrBegin="NETSDK1223: "} From 48a3378356c879fe85a13c37379cbed16233ca21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Oct 2024 18:52:08 +0000 Subject: [PATCH 125/702] Update dependencies from https://github.com/dotnet/xdt build 20241022.1 Microsoft.SourceBuild.Intermediate.xdt , Microsoft.Web.Xdt From Version 9.0.0-preview.24476.1 -> To Version 9.0.0-preview.24522.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 534a964ad4b5..2894130c7495 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -398,14 +398,14 @@ https://github.com/dotnet/wpf 375aed28c289639ec572af58067a31c3d7742ef9 - + https://github.com/dotnet/xdt - 4ddd8113a29852380b7b929117bfe67f401ac320 + e4324899bb1cb7be5189c89e116a6eacbb12a791 - + https://github.com/dotnet/xdt - 4ddd8113a29852380b7b929117bfe67f401ac320 + e4324899bb1cb7be5189c89e116a6eacbb12a791 diff --git a/eng/Versions.props b/eng/Versions.props index 7868fff97b8b..113aa9f7cf85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - 9.0.0-preview.24476.1 + 9.0.0-preview.24522.1 1.0.0-20230414.1 2.22.0 2.0.1-servicing-26011-01 From c79dbc74ba4c4ca4af51ed5c3a5949fbe1d32292 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Oct 2024 19:45:00 +0000 Subject: [PATCH 126/702] Update dependencies from https://github.com/dotnet/xdt build 20241022.2 Microsoft.SourceBuild.Intermediate.xdt , Microsoft.Web.Xdt From Version 9.0.0-preview.24522.1 -> To Version 9.0.0-preview.24522.2 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b609b995bbca..22a2dc42a84f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,6 +28,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2894130c7495..0c76e5a4198e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -398,14 +398,14 @@ https://github.com/dotnet/wpf 375aed28c289639ec572af58067a31c3d7742ef9 - + https://github.com/dotnet/xdt - e4324899bb1cb7be5189c89e116a6eacbb12a791 + 1a54480f52703fb45fac2a6b955247d33758383e - + https://github.com/dotnet/xdt - e4324899bb1cb7be5189c89e116a6eacbb12a791 + 1a54480f52703fb45fac2a6b955247d33758383e diff --git a/eng/Versions.props b/eng/Versions.props index 113aa9f7cf85..4934d0b5e472 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - 9.0.0-preview.24522.1 + 9.0.0-preview.24522.2 1.0.0-20230414.1 2.22.0 2.0.1-servicing-26011-01 From 02baa35e8bf99e89aed81f5ba7ee306161f9fac3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 22 Oct 2024 14:24:40 -0700 Subject: [PATCH 127/702] Use non-stable SDK version for SB artifacts (#44362) --- .../content/eng/finish-source-only.proj | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/content/eng/finish-source-only.proj b/src/SourceBuild/content/eng/finish-source-only.proj index c00cc0d68089..a1d68f88d40b 100644 --- a/src/SourceBuild/content/eng/finish-source-only.proj +++ b/src/SourceBuild/content/eng/finish-source-only.proj @@ -30,16 +30,27 @@ OutputPath="$(ArtifactsLogDir)" /> + + + + + + + $([System.Text.RegularExpressions.Regex]::Split('$([System.IO.File]::ReadAllText('%(SdkVersionFileItem.Identity)'))', '\r\n|\r|\n')[3]) + + + + DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion"> - $(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) - $(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkNonStableVersion)-$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkNonStableVersion)-$(TargetRid)$(ArchiveExtension) @@ -162,10 +173,10 @@ - $(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension) + $(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkNonStableVersion).$(TargetRid)$(ArchiveExtension) $(ResultingPrebuiltPackagesDir) @@ -182,7 +193,7 @@ + DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion;ResolveProjectReferences"> + Date: Tue, 22 Oct 2024 22:53:43 +0000 Subject: [PATCH 128/702] Update dependencies from https://github.com/dotnet/razor build 20241022.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.24518.3 -> To Version 9.0.0-preview.24522.7 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b609b995bbca..22a2dc42a84f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,6 +28,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 534a964ad4b5..f6be1e0c0563 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/razor - 13fe97052e82683ec4c9fc916531eba5c751037f + 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d - + https://github.com/dotnet/razor - 13fe97052e82683ec4c9fc916531eba5c751037f + 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d - + https://github.com/dotnet/razor - 13fe97052e82683ec4c9fc916531eba5c751037f + 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d - + https://github.com/dotnet/razor - 13fe97052e82683ec4c9fc916531eba5c751037f + 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d diff --git a/eng/Versions.props b/eng/Versions.props index 7868fff97b8b..58dec7ed0c8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -244,9 +244,9 @@ - 9.0.0-preview.24518.3 - 9.0.0-preview.24518.3 - 9.0.0-preview.24518.3 + 9.0.0-preview.24522.7 + 9.0.0-preview.24522.7 + 9.0.0-preview.24522.7 From 30bf4011ee5aa73d2a6a10a511b6769de0182e2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 04:53:21 +0000 Subject: [PATCH 129/702] Update dependencies from https://github.com/dotnet/fsharp build 20241022.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.100-beta.24510.7 -> To Version 9.0.100-beta.24522.2 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b609b995bbca..22a2dc42a84f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,6 +28,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 534a964ad4b5..4d502ae842fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,14 +87,14 @@ 5b866566089bfdd756730948f6418e2759b8850f - + https://github.com/dotnet/fsharp - c3eb162ec7bcf7449ca54b2218ab0d0c4d67c1d0 + f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/fsharp - c3eb162ec7bcf7449ca54b2218ab0d0c4d67c1d0 + f07a91420bec3f657153e16c9f047cf151c1179f diff --git a/eng/Versions.props b/eng/Versions.props index 7868fff97b8b..469540ad660c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -213,7 +213,7 @@ - 12.9.100-beta.24510.7 + 12.9.100-beta.24522.2 From b96158e8914fcfc7da40fa8810c87cb1337151c7 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 22 Oct 2024 23:51:58 -0700 Subject: [PATCH 130/702] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2566964 --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 2 +- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 745f6c580aa4..e43b90dadcca 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Cílení na .NET 9.0 nebo vyšší se v sadě Visual Studio 2022 17.11 nepodporuje. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index a775524d96f7..b3c53c7036f1 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: no se admite el destino de .NET 9.0 o posterior en Visual Studio 2022 17.11. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index e0aa70fa5034..66b3d2c57d30 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: la destinazione .NET 9.0 o versione successiva in Visual Studio 2022 17.11 non è supportata. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 33f9c2705507..9bd079f5a95f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Visual Studio 2022 17.11 では .NET 9.0 以上をターゲットにすることはできません。 {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index fe8ccdb83ae8..c9aa5a6709cd 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: platforma docelowa .NET 9.0 lub nowsza w programie Visual Studio 2022 17.11 nie jest obsługiwana. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index c44f4f7c60f5..6b38f53ed323 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Нацеливание на .NET 9.0 или более поздней версии в Visual Studio 2022 17.11 не поддерживается. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 58d5dbdbc453..16e411678844 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: Visual Studio 2022 17.11'de .NET 9.0 veya daha üst sürümünü hedefleme desteklenmiyor. {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 3eda03e223cf..80062bef664e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: 不支持在 Visual Studio 2022 17.11 中以 .NET 9.0 或更高版本为目标。 {StrBegin="NETSDK1223: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index e1f4bfefbc10..587bdf837d0f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -643,7 +643,7 @@ The following are names of parameters or literal values and should not be transl NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. - NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported. + NETSDK1223: 不支援在 Visual Studio 2022 17.11 中以 .NET 9.0 或更高版本為目標。 {StrBegin="NETSDK1223: "} From 456ea6ae6b5b182e4dedcdb5d00e76248668dabf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 11:23:48 +0000 Subject: [PATCH 131/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.39 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.38 -> To Version 6.13.0-preview.1.39 --- 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 9b05c8f7db4d..20e88b1ea9bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 - + https://github.com/nuget/nuget.client - 8b88f9e28677f39bd871f4edded2ea4f68b01ac7 + bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0e663d48816c..974c93333853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 - 6.13.0-preview.1.38 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 + 6.13.0-preview.1.39 From 49392154f66baa1dce357898a1d39e257879be66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 11:31:48 +0000 Subject: [PATCH 132/702] Update dependencies from https://github.com/dotnet/test-templates build 20241023.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24521.3 -> To Version 1.1.0-rtm.24523.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 eb0995198e18..dbf1206b6dfb 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 - f6920c348761980e1601632a2031920b24921772 + 9f08d31cd17a7c2d91dad330ba77ccda22598976 - + https://github.com/dotnet/test-templates - f6920c348761980e1601632a2031920b24921772 + 9f08d31cd17a7c2d91dad330ba77ccda22598976 diff --git a/eng/Versions.props b/eng/Versions.props index e4914cd448a1..d346a0b50876 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24521.3 + 1.1.0-rtm.24523.1 From bf46b68d318f9437fc3e7016228674ec40a558f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 11:37:59 +0000 Subject: [PATCH 133/702] Update dependencies from https://github.com/dotnet/razor build 20241023.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24522.7 -> To Version 9.0.0-preview.24523.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb0995198e18..e6704a56ac1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/razor - 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d + ad2bd3e7a405afd7787cf0c045897e90270013a3 - + https://github.com/dotnet/razor - 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d + ad2bd3e7a405afd7787cf0c045897e90270013a3 - + https://github.com/dotnet/razor - 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d + ad2bd3e7a405afd7787cf0c045897e90270013a3 - + https://github.com/dotnet/razor - 6ab58e84b97012bbfe67bbbdeabfa633e2c03b8d + ad2bd3e7a405afd7787cf0c045897e90270013a3 diff --git a/eng/Versions.props b/eng/Versions.props index e4914cd448a1..b7083f49c00f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -244,9 +244,9 @@ - 9.0.0-preview.24522.7 - 9.0.0-preview.24522.7 - 9.0.0-preview.24522.7 + 9.0.0-preview.24523.1 + 9.0.0-preview.24523.1 + 9.0.0-preview.24523.1 From b64cb92af482b8e9f436d3faf5735c1de386d182 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 12:49:42 +0000 Subject: [PATCH 134/702] Update dependencies from https://github.com/dotnet/razor build 20241023.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24515.3 -> To Version 7.0.0-preview.24523.2 --- NuGet.config | 28 ---------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index f43c63d84ffc..4901f74f8527 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,15 +21,6 @@ - - - - - - - - - @@ -42,11 +33,6 @@ - - - - - @@ -89,15 +75,6 @@ - - - - - - - - - @@ -113,11 +90,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07866638fcfc..d71521c71866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 + 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e - + https://github.com/dotnet/razor - 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 + 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e - + https://github.com/dotnet/razor - 2ea52456adcb9d1ca04cf28025a02b2576c3c2e3 + 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1a3c9f9a2d5f..808f81c4a4da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.24515.3 - 7.0.0-preview.24515.3 - 7.0.0-preview.24515.3 + 7.0.0-preview.24523.2 + 7.0.0-preview.24523.2 + 7.0.0-preview.24523.2 From 16b3e6a25e47b307e49c74720b95aeb89afa99be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 12:59:51 +0000 Subject: [PATCH 135/702] Update dependencies from https://github.com/dotnet/roslyn build 20241022.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.24516.15 -> To Version 4.12.0-3.24522.8 --- 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 eb0995198e18..1a29d67eabdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 - + https://github.com/dotnet/roslyn - 3bff3622487486dec7794dfd0c71e05a52c313a4 + 1d59d9f40a804971aa2a4ddee7097dd668d48902 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e4914cd448a1..0e7008feb214 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,14 +217,14 @@ - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 - 4.12.0-3.24516.15 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 + 4.12.0-3.24522.8 From 392948fda4c8e5eba8990032f123868750af86af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 13:01:28 +0000 Subject: [PATCH 136/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241022.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.24521.1 -> To Version 9.0.0-beta.24522.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 eb0995198e18..05f1196fe1d7 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 - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink - c579a775e65111c54555df734ca98e87bdb1dc27 + 1f252d795c563515fe55a228f499e399b915363f diff --git a/eng/Versions.props b/eng/Versions.props index e4914cd448a1..4c2bfdd368d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -290,12 +290,12 @@ - 9.0.0-beta.24521.1 - 9.0.0-beta.24521.1 - 9.0.0-beta.24521.1 - 9.0.0-beta.24521.1 - 9.0.0-beta.24521.1 - 9.0.0-beta.24521.1 + 9.0.0-beta.24522.2 + 9.0.0-beta.24522.2 + 9.0.0-beta.24522.2 + 9.0.0-beta.24522.2 + 9.0.0-beta.24522.2 + 9.0.0-beta.24522.2 From 67ae194f139b9af5514e39203b4acafe4e173083 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:42:18 -0500 Subject: [PATCH 137/702] [release/9.0.1xx] Upgrade Fedora CI legs to 41 (#44375) Co-authored-by: Michael Simons --- eng/pipelines/templates/variables/vmr-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index e6287d3f5679..20b9c3badec1 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -21,7 +21,7 @@ variables: - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41 - name: ubuntuContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04 - name: ubuntuArmContainer @@ -56,7 +56,7 @@ variables: - name: centOSStreamName value: CentOSStream9 - name: fedoraName - value: Fedora40 + value: Fedora41 - name: ubuntuName value: Ubuntu2404 @@ -75,7 +75,7 @@ variables: - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid - value: fedora.40-x64 + value: fedora.41-x64 - name: ubuntux64Rid value: ubuntu.24.04-x64 - name: ubuntuArm64Rid From 6bde55af4a8dc8f2f39008566cc22bffb750264a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 13:42:41 +0000 Subject: [PATCH 138/702] Update dependencies from https://github.com/dotnet/test-templates build 20241023.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.1 -> To Version 1.1.0-rtm.24523.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 dbf1206b6dfb..4329402b060d 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 - 9f08d31cd17a7c2d91dad330ba77ccda22598976 + 6be1945e663153cd1db4ccd31f6ca38e7f35330d - + https://github.com/dotnet/test-templates - 9f08d31cd17a7c2d91dad330ba77ccda22598976 + 6be1945e663153cd1db4ccd31f6ca38e7f35330d diff --git a/eng/Versions.props b/eng/Versions.props index d346a0b50876..0f3405cfd807 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24523.1 + 1.1.0-rtm.24523.2 From fe52c99d5c8999819abe28bcae7b1412e0ff1c8d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 15:30:41 +0000 Subject: [PATCH 139/702] Merged PR 44177: [internal/release/9.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 9.0.0-rtm.24521.4 to 9.0.0-rtm.24522.3 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24521.1 to 9.0.0-rtm.24522.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24521.4 to 9.0.0-rtm.24522.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241023.1 - **Date Produced**: October 23, 2024 10:31:13 AM UTC - **Commit**: c328fcebfb70f2c9e429d51a4fc5b620003720eb - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24521.3 to 9.0.0-rtm.24523.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24521.3 to 9.0.0-rtm.24523.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24521.4 to 9.0.0-rtm.24522.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24521.1 to 9.0.0-rtm.24522.3][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24521.4 to 9.0.0-rtm.24522.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd3c394733377a409bfdea569a088c2e22c8a2965&targetVersion=GCc328fcebfb70f2c9e429d51a4fc5b620003720eb&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC1534d6c1ae447b5dcc661d08f2abaa334b045140&targetVersion=GC42170a8179ee2744f25e203ab235144125ddc361&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC3fe741b12b6b0d5b000232def507a39247f972ba&targetVersion=GCf1cbb10e281b9545b9980a148caae895de895f67&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 7 +++++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15ad45e9ae70..cadbc2c6c1e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + @@ -26,6 +27,7 @@ + @@ -33,7 +35,7 @@ - + @@ -63,6 +65,7 @@ + @@ -71,7 +74,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b62d0926316..70519d2b79f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3c394733377a409bfdea569a088c2e22c8a2965 + c328fcebfb70f2c9e429d51a4fc5b620003720eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3c394733377a409bfdea569a088c2e22c8a2965 + c328fcebfb70f2c9e429d51a4fc5b620003720eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3c394733377a409bfdea569a088c2e22c8a2965 + c328fcebfb70f2c9e429d51a4fc5b620003720eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3c394733377a409bfdea569a088c2e22c8a2965 + c328fcebfb70f2c9e429d51a4fc5b620003720eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1534d6c1ae447b5dcc661d08f2abaa334b045140 + 42170a8179ee2744f25e203ab235144125ddc361 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3fe741b12b6b0d5b000232def507a39247f972ba + f1cbb10e281b9545b9980a148caae895de895f67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1534d6c1ae447b5dcc661d08f2abaa334b045140 + 42170a8179ee2744f25e203ab235144125ddc361 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 95013095fff8..bc3286c977b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24521.1 + 9.0.0-rtm.24522.3 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24521.3 - 9.0.0-rtm.24521.3 + 9.0.0-rtm.24523.1 + 9.0.0-rtm.24523.1 9.0.0 9.0.0 @@ -250,8 +250,8 @@ - 9.0.0-rtm.24521.4 - 9.0.0-rtm.24521.4 + 9.0.0-rtm.24522.3 + 9.0.0-rtm.24522.3 From 39f9b0025cf5995837929a4fe951bdbf22d50988 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 23 Oct 2024 10:16:16 -0700 Subject: [PATCH 140/702] Simplify logic for setting the minimum VS version to display in the installer UI --- eng/Versions.props | 5 ++++- .../targets/GenerateMSIs.targets | 18 ------------------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e4914cd448a1..e6db3d2b3612 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,10 +193,13 @@ from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, then use that in Directory.Packages.props. - At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> + 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.7 17.12.7-preview-24522-03 17.11.4 + 17.12 diff --git a/src/Installer/redist-installer/targets/GenerateMSIs.targets b/src/Installer/redist-installer/targets/GenerateMSIs.targets index 8808bc54139b..e13d30e8f24f 100644 --- a/src/Installer/redist-installer/targets/GenerateMSIs.targets +++ b/src/Installer/redist-installer/targets/GenerateMSIs.targets @@ -285,24 +285,6 @@ Overwrite="true" /> - - - %(SDKInternalFiles.Identity) - - - - - - - - $(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.')))) - $([MSBuild]::Add($(MinimumVSVersion), .1)) - - - Date: Wed, 23 Oct 2024 10:21:38 -0700 Subject: [PATCH 141/702] nit spacing --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e6db3d2b3612..ad71ee44110e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, then use that in Directory.Packages.props. - At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. + 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.7 From 78bd7876575bde4d44b474e0d21c681bc7bfb2d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 18:09:07 +0000 Subject: [PATCH 142/702] Update dependencies from https://github.com/dotnet/aspire build 20241021.5 Microsoft.SourceBuild.Intermediate.aspire , Microsoft.NET.Sdk.Aspire.Manifest-8.0.100 From Version 8.2.2-preview.1.24519.4 -> To Version 8.2.2-preview.1.24521.5 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22a2dc42a84f..cb210a88bcd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4329402b060d..fec13ab28bef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -652,12 +652,12 @@ --> https://github.com/dotnet/aspire - 2c38f6c884b5026a7f278cdfe6e1f816810093f9 + 5fa9337a84a52e9bd185d04d156eccbdcf592f74 - + https://github.com/dotnet/aspire - 2c38f6c884b5026a7f278cdfe6e1f816810093f9 + 5fa9337a84a52e9bd185d04d156eccbdcf592f74 From e005aaed03f33396921e00642fde51569f35b793 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 18:18:19 +0000 Subject: [PATCH 143/702] Merged PR 44153: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 7c429c14-b12b-40f6-ae9e-395f98f369df - **Build**: 20241022.6 - **Date Produced**: October 22, 2024 10:32:23 PM UTC - **Commit**: 282167d92299fc4dc1972edfc69193397a4114ad - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **dotnet-user-jwts**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **dotnet-user-secrets**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.Analyzers**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Authorization**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.Components.Web**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.AspNetCore.TestHost**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.ObjectPool**: [from 9.0.0 to 9.0.0][1] - **Microsoft.JSInterop**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.0-rtm.24521.19 to 9.0.0-rtm.24522.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC85435709e560642610e746831682cf4f8fe77c34&targetVersion=GC282167d92299fc4dc1972edfc69193397a4114ad&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df) --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index cadbc2c6c1e9..a6e39b8cf8af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 535d03197d8e..0e8b3a0baa22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3bff3622487486dec7794dfd0c71e05a52c313a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 85435709e560642610e746831682cf4f8fe77c34 + 282167d92299fc4dc1972edfc69193397a4114ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3f8577981c82..94ca49009ac8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,18 +229,18 @@ 9.0.0 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 9.0.0 9.0.0 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 - 9.0.0-rtm.24521.19 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 + 9.0.0-rtm.24522.6 From 6cb2ac9d019c4b40c85158c95b56616a3366c9f5 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 19:12:36 +0000 Subject: [PATCH 144/702] [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-rtm.24517.2 to 9.0.0-rtm.24519.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100: from 9.0.0 to 9.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.SourceBuild.Intermediate.emsdk: from 9.0.0-rtm.24517.2 to 9.0.0-rtm.24519.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Fix conflict --- NuGet.config | 10 ++--- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 53 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6e39b8cf8af..f3d2dafc10e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,7 @@ - - - + @@ -26,8 +24,7 @@ - - + @@ -65,8 +62,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f3c2396c663..c865fe4070e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 5054dd35a56010d8f6232408e56e31ad8ccc987a + cd2146c90fc68d5ff2db715337e696229c74651e https://github.com/dotnet/emsdk - 5054dd35a56010d8f6232408e56e31ad8ccc987a + cd2146c90fc68d5ff2db715337e696229c74651e - + https://github.com/dotnet/emsdk - 5054dd35a56010d8f6232408e56e31ad8ccc987a + cd2146c90fc68d5ff2db715337e696229c74651e @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f138fc4fcab7..0134646448a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24518.14 + 9.0.0-rtm.24522.16 9.0.0 9.0.0 - 9.0.0-rtm.24518.14 + 9.0.0-rtm.24522.16 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24518.14 - 9.0.0-rtm.24518.14 + 9.0.0-rtm.24522.16 + 9.0.0-rtm.24522.16 9.0.0 9.0.0 9.0.0 @@ -333,7 +333,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24517.2 + 9.0.0-rtm.24519.2 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From 71e044cc193608af9315e6440016c8a99413b72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Wed, 23 Oct 2024 21:17:26 +0200 Subject: [PATCH 145/702] Move test templates to SDK repo --- .../.template.config/dotnetcli.host.json | 12 + .../.template.config/ide.host.json | 13 + .../.template.config/ide/icon.ico | Bin 0 -> 47523 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 130 +++++++++ .../content/MSTest-CSharp-TestClass/Test1.cs | 124 +++++++++ .../.template.config/dotnetcli.host.json | 12 + .../.template.config/ide.host.json | 13 + .../.template.config/ide/icon.ico | Bin 0 -> 55748 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 81 ++++++ .../content/MSTest-FSharp-TestClass/Test1.fs | 53 ++++ .../.template.config/dotnetcli.host.json | 12 + .../.template.config/ide.host.json | 13 + .../.template.config/ide/icon.ico | Bin 0 -> 48778 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 81 ++++++ .../MSTest-VisualBasic-TestClass/Test1.vb | 54 ++++ .../.template.config/ide.host.json | 7 + .../.template.config/ide/icon.ico | Bin 0 -> 47523 bytes .../localize/templatestrings.cs.json | 6 + .../localize/templatestrings.de.json | 6 + .../localize/templatestrings.en.json | 6 + .../localize/templatestrings.es.json | 6 + .../localize/templatestrings.fr.json | 6 + .../localize/templatestrings.it.json | 6 + .../localize/templatestrings.ja.json | 6 + .../localize/templatestrings.ko.json | 6 + .../localize/templatestrings.pl.json | 6 + .../localize/templatestrings.pt-BR.json | 6 + .../localize/templatestrings.ru.json | 6 + .../localize/templatestrings.tr.json | 6 + .../localize/templatestrings.zh-Hans.json | 6 + .../localize/templatestrings.zh-Hant.json | 6 + .../.template.config/template.json | 91 +++++++ .../content/NUnit-CSharp-Item/UnitTest1.cs | 38 +++ .../.template.config/ide.host.json | 7 + .../.template.config/ide/icon.ico | Bin 0 -> 55748 bytes .../localize/templatestrings.cs.json | 6 + .../localize/templatestrings.de.json | 6 + .../localize/templatestrings.en.json | 6 + .../localize/templatestrings.es.json | 6 + .../localize/templatestrings.fr.json | 6 + .../localize/templatestrings.it.json | 6 + .../localize/templatestrings.ja.json | 6 + .../localize/templatestrings.ko.json | 6 + .../localize/templatestrings.pl.json | 6 + .../localize/templatestrings.pt-BR.json | 6 + .../localize/templatestrings.ru.json | 6 + .../localize/templatestrings.tr.json | 6 + .../localize/templatestrings.zh-Hans.json | 6 + .../localize/templatestrings.zh-Hant.json | 6 + .../.template.config/template.json | 35 +++ .../content/NUnit-FSharp-Item/UnitTest1.fs | 11 + .../.template.config/ide.host.json | 7 + .../.template.config/ide/icon.ico | Bin 0 -> 48778 bytes .../localize/templatestrings.cs.json | 6 + .../localize/templatestrings.de.json | 6 + .../localize/templatestrings.en.json | 6 + .../localize/templatestrings.es.json | 6 + .../localize/templatestrings.fr.json | 6 + .../localize/templatestrings.it.json | 6 + .../localize/templatestrings.ja.json | 6 + .../localize/templatestrings.ko.json | 6 + .../localize/templatestrings.pl.json | 6 + .../localize/templatestrings.pt-BR.json | 6 + .../localize/templatestrings.ru.json | 6 + .../localize/templatestrings.tr.json | 6 + .../localize/templatestrings.zh-Hans.json | 6 + .../localize/templatestrings.zh-Hant.json | 6 + .../.template.config/template.json | 35 +++ .../NUnit-VisualBasic-Item/UnitTest1.vb | 18 ++ .../.template.config/dotnetcli.host.json | 40 +++ .../.template.config/ide.host.json | 35 +++ .../.template.config/ide/icon.ico | Bin 0 -> 47213 bytes .../localize/templatestrings.cs.json | 54 ++++ .../localize/templatestrings.de.json | 54 ++++ .../localize/templatestrings.en.json | 54 ++++ .../localize/templatestrings.es.json | 54 ++++ .../localize/templatestrings.fr.json | 54 ++++ .../localize/templatestrings.it.json | 54 ++++ .../localize/templatestrings.ja.json | 54 ++++ .../localize/templatestrings.ko.json | 54 ++++ .../localize/templatestrings.pl.json | 54 ++++ .../localize/templatestrings.pt-BR.json | 54 ++++ .../localize/templatestrings.ru.json | 54 ++++ .../localize/templatestrings.tr.json | 54 ++++ .../localize/templatestrings.zh-Hans.json | 54 ++++ .../localize/templatestrings.zh-Hant.json | 54 ++++ .../.template.config/template.json | 253 ++++++++++++++++++ .../MSTest-CSharp/Company.TestProject1.csproj | 72 +++++ .../content/MSTest-CSharp/MSTestSettings.cs | 1 + .../content/MSTest-CSharp/Test1.cs | 58 ++++ .../.template.config/dotnetcli.host.json | 40 +++ .../.template.config/ide.host.json | 35 +++ .../.template.config/ide/icon.ico | Bin 0 -> 55748 bytes .../localize/templatestrings.cs.json | 54 ++++ .../localize/templatestrings.de.json | 54 ++++ .../localize/templatestrings.en.json | 54 ++++ .../localize/templatestrings.es.json | 54 ++++ .../localize/templatestrings.fr.json | 54 ++++ .../localize/templatestrings.it.json | 54 ++++ .../localize/templatestrings.ja.json | 54 ++++ .../localize/templatestrings.ko.json | 54 ++++ .../localize/templatestrings.pl.json | 54 ++++ .../localize/templatestrings.pt-BR.json | 54 ++++ .../localize/templatestrings.ru.json | 54 ++++ .../localize/templatestrings.tr.json | 54 ++++ .../localize/templatestrings.zh-Hans.json | 54 ++++ .../localize/templatestrings.zh-Hant.json | 54 ++++ .../.template.config/template.json | 253 ++++++++++++++++++ .../MSTest-FSharp/Company.TestProject1.fsproj | 82 ++++++ .../content/MSTest-FSharp/MSTestSettings.fs | 6 + .../content/MSTest-FSharp/Test1.fs | 53 ++++ .../.template.config/dotnetcli.host.json | 40 +++ .../.template.config/ide.host.json | 35 +++ .../.template.config/ide/icon.ico | Bin 0 -> 48778 bytes .../localize/templatestrings.cs.json | 54 ++++ .../localize/templatestrings.de.json | 54 ++++ .../localize/templatestrings.en.json | 54 ++++ .../localize/templatestrings.es.json | 54 ++++ .../localize/templatestrings.fr.json | 54 ++++ .../localize/templatestrings.it.json | 54 ++++ .../localize/templatestrings.ja.json | 54 ++++ .../localize/templatestrings.ko.json | 54 ++++ .../localize/templatestrings.pl.json | 54 ++++ .../localize/templatestrings.pt-BR.json | 54 ++++ .../localize/templatestrings.ru.json | 54 ++++ .../localize/templatestrings.tr.json | 54 ++++ .../localize/templatestrings.zh-Hans.json | 54 ++++ .../localize/templatestrings.zh-Hant.json | 54 ++++ .../.template.config/template.json | 253 ++++++++++++++++++ .../Company.TestProject1.vbproj | 72 +++++ .../MSTest-VisualBasic/MSTestSettings.vb | 3 + .../content/MSTest-VisualBasic/Test1.vb | 54 ++++ .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 47213 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 97 +++++++ .../NUnit-CSharp/Company.TestProject1.csproj | 26 ++ .../content/NUnit-CSharp/UnitTest1.cs | 15 ++ .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 55748 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 93 +++++++ .../NUnit-FSharp/Company.TestProject1.fsproj | 26 ++ .../content/NUnit-FSharp/Program.fs | 4 + .../content/NUnit-FSharp/UnitTest1.fs | 11 + .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 48778 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 93 +++++++ .../Company.TestProject1.vbproj | 20 ++ .../content/NUnit-VisualBasic/UnitTest1.vb | 18 ++ .../.template.config/dotnetcli.host.json | 40 +++ .../.template.config/ide.host.json | 35 +++ .../.template.config/ide/icon.ico | Bin 0 -> 47213 bytes .../localize/templatestrings.cs.json | 54 ++++ .../localize/templatestrings.de.json | 54 ++++ .../localize/templatestrings.en.json | 54 ++++ .../localize/templatestrings.es.json | 54 ++++ .../localize/templatestrings.fr.json | 54 ++++ .../localize/templatestrings.it.json | 54 ++++ .../localize/templatestrings.ja.json | 54 ++++ .../localize/templatestrings.ko.json | 54 ++++ .../localize/templatestrings.pl.json | 54 ++++ .../localize/templatestrings.pt-BR.json | 54 ++++ .../localize/templatestrings.ru.json | 54 ++++ .../localize/templatestrings.tr.json | 54 ++++ .../localize/templatestrings.zh-Hans.json | 54 ++++ .../localize/templatestrings.zh-Hant.json | 54 ++++ .../.template.config/template.json | 253 ++++++++++++++++++ .../Company.TestProject1.csproj | 77 ++++++ .../MSTestSettings.cs | 1 + .../content/Playwright-MSTest-CSharp/Test1.cs | 74 +++++ .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 47213 bytes .../localize/templatestrings.cs.json | 15 ++ .../localize/templatestrings.de.json | 15 ++ .../localize/templatestrings.en.json | 15 ++ .../localize/templatestrings.es.json | 15 ++ .../localize/templatestrings.fr.json | 15 ++ .../localize/templatestrings.it.json | 15 ++ .../localize/templatestrings.ja.json | 15 ++ .../localize/templatestrings.ko.json | 15 ++ .../localize/templatestrings.pl.json | 15 ++ .../localize/templatestrings.pt-BR.json | 15 ++ .../localize/templatestrings.ru.json | 15 ++ .../localize/templatestrings.tr.json | 15 ++ .../localize/templatestrings.zh-Hans.json | 15 ++ .../localize/templatestrings.zh-Hant.json | 15 ++ .../.template.config/template.json | 97 +++++++ .../Company.TestProject1.csproj | 30 +++ .../Playwright-NUnit-CSharp/UnitTest1.cs | 27 ++ .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 47213 bytes .../localize/templatestrings.cs.json | 13 + .../localize/templatestrings.de.json | 13 + .../localize/templatestrings.en.json | 13 + .../localize/templatestrings.es.json | 13 + .../localize/templatestrings.fr.json | 13 + .../localize/templatestrings.it.json | 13 + .../localize/templatestrings.ja.json | 13 + .../localize/templatestrings.ko.json | 13 + .../localize/templatestrings.pl.json | 13 + .../localize/templatestrings.pt-BR.json | 13 + .../localize/templatestrings.ru.json | 13 + .../localize/templatestrings.tr.json | 13 + .../localize/templatestrings.zh-Hans.json | 13 + .../localize/templatestrings.zh-Hant.json | 13 + .../.template.config/template.json | 89 ++++++ .../XUnit-CSharp/Company.TestProject1.csproj | 24 ++ .../content/XUnit-CSharp/UnitTest1.cs | 10 + .../.template.config/dotnetcli.host.json | 24 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 55748 bytes .../localize/templatestrings.cs.json | 13 + .../localize/templatestrings.de.json | 13 + .../localize/templatestrings.en.json | 13 + .../localize/templatestrings.es.json | 13 + .../localize/templatestrings.fr.json | 13 + .../localize/templatestrings.it.json | 13 + .../localize/templatestrings.ja.json | 13 + .../localize/templatestrings.ko.json | 13 + .../localize/templatestrings.pl.json | 13 + .../localize/templatestrings.pt-BR.json | 13 + .../localize/templatestrings.ru.json | 13 + .../localize/templatestrings.tr.json | 13 + .../localize/templatestrings.zh-Hans.json | 13 + .../localize/templatestrings.zh-Hant.json | 13 + .../.template.config/template.json | 85 ++++++ .../XUnit-FSharp/Company.TestProject1.fsproj | 24 ++ .../content/XUnit-FSharp/Program.fs | 4 + .../content/XUnit-FSharp/Tests.fs | 8 + .../.template.config/dotnetcli.host.json | 25 ++ .../.template.config/ide.host.json | 10 + .../.template.config/ide/icon.ico | Bin 0 -> 48778 bytes .../localize/templatestrings.cs.json | 13 + .../localize/templatestrings.de.json | 13 + .../localize/templatestrings.en.json | 13 + .../localize/templatestrings.es.json | 13 + .../localize/templatestrings.fr.json | 13 + .../localize/templatestrings.it.json | 13 + .../localize/templatestrings.ja.json | 13 + .../localize/templatestrings.ko.json | 13 + .../localize/templatestrings.pl.json | 13 + .../localize/templatestrings.pt-BR.json | 13 + .../localize/templatestrings.ru.json | 13 + .../localize/templatestrings.tr.json | 13 + .../localize/templatestrings.zh-Hans.json | 13 + .../localize/templatestrings.zh-Hant.json | 13 + .../.template.config/template.json | 85 ++++++ .../Company.TestProject1.vbproj | 18 ++ .../content/XUnit-VisualBasic/UnitTest1.vb | 12 + template_feed/README.md | 4 +- 338 files changed, 9161 insertions(+), 2 deletions(-) create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/Test1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/Test1.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/Test1.vb create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/UnitTest1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/UnitTest1.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/UnitTest1.vb create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj create mode 100644 template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..cfd70169012f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/dotnetcli.host.json @@ -0,0 +1,12 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide.host.json new file mode 100644 index 000000000000..26c748107555 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide.host.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "cs", + "symbolInfo": [ + { + "id": "Fixture", + "isVisible": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6fc7823ecf27fadbc4f503e0dd12bcba09030bc9 GIT binary patch literal 47523 zcmeGl30zFu`^+@cGNnS>vrV3@@Ra3AqM4T^@1=!EmJ}YcR7etP#*)w@vV>?s3sRPN zQkwZAAu8gfqSAXUN}Kj|{^#78J8omjAmsht{dM}z@||zLckVs&-7^4?fE+*v3CIF( zB>;}Vx~?w29j*vKe`NqPH3e;10Pgn#KpFNSe0wSYYlooOsI3W#;rxu@05F;Sww4h9 zw5(**Vu01U1Iu-n4SxErk(4U+Bl>$J%;5jBjXGz1IQ zg)c)b=b6SvATqhnYuKPH|Hbqd0518+H!p%R0l78P<~jqQcpDW`qEq1jxuC>%PH&hjLw+J{m#5{7O*Ch7`&8p0; zvLMKg0xWdNKud!JRQ>>fHWdKs--aN_;)Xe!`mSpLU~lUVnE%6Plu21H&53t^Hs9&y z(teBf-@kvqI5l|Ev&^fj9yv8{ENpQ-XSqDPsHNtG%<}VkI(>XbyHw8l+2wJ_Gxc<* z;=WGvSW{eTmZl$NJy1y&=4XAnEo(}NJ<|ka*|TNYmFwR+y}15(!a9>7 zP0nEf7h2bE3T`ZFHZJ&c!(XNmvC8ChtND747p^VzxH)@Gz8Y9S4muDMqpvfBm*m8m z^|GouIXfkZ<#s>gzD{G^%%DC;bDTW3PoaR7X}hDqn%7T{>78%#d6{LP|Ex8>A%69* z-AL@rveyosjcZ^Z*l9Q;|wDTn3{QMiI@J$^1`SIZ>o>8(i%;l{p@Fx z)fDsUTyGvLBIooEBS==Sdf4p_s7beBja@I5yj{o8uHV(u1`Uqa-`-tWa@XOiW686d z)bco9U3RxA=eK*Aum>$5+nqUf><8zk`$BnJ|1K?$PutBZthRY(>6~Jf^Rl)jv#z?N zJT|{L>s(^l##7@r6_#%vM%vyTXcXTli5zWQ+FX!g9vxqnej;5i0$g-cTwHwW?8@?o zhTH69$v|pFtL?h`g9>IiFK0~1YMe?x89u(jdK?WI%Ti!_w%2B-!t7?$jf`<^MjMj)b6XzTCbJo^X{k9#~K&W zNNmHgLpX7@KIsoI(=njgORK4Li#;q97 z~OGa=5v#Uo}X?bkv2Xu|n(ra?^duVEr!La70X4bUonZ;TQGoR2n+mBzTB1Xg*R(uf8!b(Dc0FcnJsEK2 z-IFv|NOVO1o^oO7DsHeg7r#ss->lV6*YM_hIrWzj7nqx3E1={b${QU5b8 zWV|`q{P+5XW&Y1A2WrMWp*=UKlB&Ab?WVhRl3k7Y$%FJ3S@6g2EOYM9Gu+?kS^Wrd zPX@?ee>HSrR{8P4t>N^Ri4<`6vJL67>oR(O<^E)FvOgtn5(rXLAI4N6-*}l`(2sN- zw#UxtA2i>S9{aakyv7(Z1@zK)Z;aNzeA-8um;Z=!PBD8+_(9Foyo)zSY8#``b^q*2 z>wU6%RPZ*YH#0@)diwLo5up>UE=VhmI|c z;-$sjm_2ssrrm1_lTR)z_mXv3y!ck1kiEbIB{y z8yqUnq*UIqoeVUhIjr#ws^rGqZrvjcUpr5zRPPR^(n`xqUb>oIuTKfmO#ShCQ(5fh zl_*Rc9{^rw1+y>**dd)2#LvS+;y=SlIj&-f3f>T8}Mha%<}=UKKkBw!}4(D(qoIu*awhD?MQk3r<%N zR=R^|ma8>sh4zoYo>z8}{KVHC@_M<1dS*ZqlqNQjHqH1i60^zcHf`D@VdWa?Nu=$v z6;_VGp2Y2{%6|@*V%Pe}4AXSXa38s=N2~)Vx?|ol-y^=|q*IOAj+w9Jr}SerudTYb z_XKD9z*wrqx+a~t+Le!oa4wRM-yaHoEFo2st$WsIolMY6QXC`6Rg&5Fqxh)v3}qgI=Y zK%F_#!|X!-AtOo-7s*z?4aGXCR$SjRSf`C0b@;D?vCctO+#$Z0%&xmtD|QdW#@+3x z1A8Em%B6;BZbf3U0)Mk5J(fYTH_d9K?HZ5qmLC+w4##-MTD+z0LO##rn1n>K?fIRv zifOwrDH%I@%wZnFMDKs-I{B15(nslRw5qZVrsTAc3+!-=^%9FGv|X6I4Cz4^*!KL+ znGa~YFnJk+Ln7E({LWdoXuB}OGNulSVCQ1gM<%&bDN2aC&)l+Mn)VoV+Pa0LUoeR* z_gB$m)sSX^z6<6sFJc}z^v@0QHq0$yT8XO41CbVtDf*G@Wd58ZS+t@FSm)B13v4s2 z(|Layt!NC^DWiXZos3E3?3+X@8jf`iiHTsF@jDOQrWNsN8tX@Za!gEp6L;!HOw5$I z#lyI(z?mnl;~Q46q7T2NRrCVd(VT}5A08dxYR_ADCXO6OW&T#m^Gq6{=kp@CCCRs# zR-p#YM)UUdHF$WyAe!Yi(}uJVV`g$Fk5++s&i0hb9Cj6^pKr)D@(Ij!e#5V-=3-LQ zS6l#Lm?+a$QO9BKNc5d$#lC_$d-$(QspGJqFy^ROu@7RM)h3Im))<*3*PqW}yCBmt zc6z&0t*Iz1mc$*M!=80vvA!!MJl6jG;E*6XQR?h{b0sKzed#bv8d%TppO5Q1r z6gh1WY{lhbGOgFSL(|Z}WGeHtCJhLr{PFUJO9?VMTyJPGLVE|`A zU_>;-==g~f5zCe>dwAMWL4ob*>G^ZP#gQkQX2UJ1M5_o zO#{yCFV$IPc4FKjMKAw=07v)bL79hlQl+!5EcZzR_D@It)zvwW!u_9%=sr zXA<)_qlHa6=TyNh8hEigxFuu*xJU-Bi|tuw`=Y)#2~S#|XaQ>y`=)iKZ7(YOBJ{`N zm8=zgKm-W7c@*}^puU2|t5_>kQD4mSOxt-FUgP4`tQCDxU%W<^?K}*xapXqIh+6k8Q2s5>`#y8zi?ph$glllMVjM+Gg5omgvoAW@E-No~y= z4n^Vms$|-pz*ww@6=?u93TsJNfhGoG(yEDMaHM`UYi&HZvy2Lg_W6N| zW7bUVEq`)0$^rN^TUn)s=`bSGHVz|p-K`rGEOo)0Qk{iTOluM|E=~s04v$KzRWC=9 zYMPy-zz&V5l3G7AGQ!w0ULNVPU{|eQGS;zRJVrxjR+C8>HbrfA4P#B{{G2?E^I`A- z8vHuNY;vTL-8L;)hpPd=4i@ytj~)CK1Ad+VWRBI1jEsP(sVT6wwg!%lj$qTKO<>HP zae#SXGMIkU0$2wu082yc!P*FC;C_V#c5L4ccJAB>jvqS)PMkOacE@;wsK_V)0~Ex^ z$AiOMKM@PjQ-T3@Xbjz}t#SP+e68OEsvitp)Y<^?aHC`~RN>{4}>Ky}EQ~m%p9PX(lU;vf)GFd1Z*-qa%EQ1`wZ$&?peUV+MSUp*+1XvOj!)0j@A)K#_z2Zcqss;N$_2 zi~&v_03n0k9cb{5{5uAU9hm4Hc>;sJ?J^*eZ_7YaY^V~+i!cxut8K}Dm_b|eA7mg( z9%Fz7Co<9d8iQL7){0g!6@_UB8C|5sO4RaM6u z7;Ga?n-Ou1ci33;i$iJC2LSeDL4OA;5DEBoC=PQ`TLu6w5lR8TMr|CzXDO_WL)gz1 zjAIba&qZw<66j-m2>da57yvXQd>pa>Xhm%t@&JH;*gphGsLg%{rBIs-#S=go1al#K z0aQW|GR7g&gNGR75LU4^5prPz9*8bFJ_{l~Tu1~$6mXibFkulsr^2t3g-1KjslWgJ zJNArMbDz>*%Li;qGwIwb7s}sDo|5X0~#6{gzWyS{AYpx zEYP(qAb3tyhhLP5J=FQ)iXFo`v2k^^Zp6>0clB;+7y&i4b{^NH)YKq>cBhj_7y)d$ zf{N(9F=B%e5R9wHy zPH%_6yXj&H5T=VIK%6dyK%41e2(+F4j(`e06a=0j20QKrG!DZ-bUKlMxasdCfYZtH z-C^_*siV4@8gx4%PwBxASP=x_c=sMMR4P>v)bEh+aWyp=s*IwHU>s+Intb|dYE)@# zkgA4=2ne(p$0kD_h>LI>4@xCCACpjIK0Z!UlZE_c)!Lg+?%qQdqbxEXlj;3`LjLa$ zp&oSqB!dbU-Zh}YhPMmEg7@bN@X+lID)6?3jtab=VxR)=qgbe*TOe3i@VPUqHP_b2FHB;a-swl0p=!O{A6 z{_A|(Kevr7gz*gCase6 zyAEmi;0U@27aYmmkbT~9kV6+JID;aq2oG79pTIxl$qI^!3S@af6DZ426&0y6d~DRI zL{d~F;n?rDmH6XA1SP&i@7e;D5h*tDnkZ1#ctxWm1S) zcnYz}9}AcEO{`3Ntr{9MxSQp+5%aunog$45-H~_e*besn>9Q;D4c9!vj8l6MdY1C@ zo-rJ5$-v(pq?;aANtMA7=!5G`{w9E=)c)T9e^t>(OwpX5z9|n&u=5*gujC z?!nyQ-(l|XsHp(_0277(xTFN`9jcYnCGnduZ}_e(&|E^qb_YpsGOmPeta_yP=!eE* zM~`a3Z~6CBR<5n`Ul!Mrot3cLGRn1eQ$b5wLT~xR)2rjwExA;==e)O$)AJ|#*_U5s z=IvbNIEHujrc-lSNkKS=(_A#$`DtJ&qujTaqzsaj!RZy1PT6r8Ct^YpTAOz>R9O?< zBI+w%c%k&+C>xG4Sx+@f&q>EIWBsbaxX7nuwh5Ru%D^D&ULGs|f}gicz{|%CZu#Xp z2J@Rw@kUS|#5de5&@1{8SR7Z2Cv!u3hGlE@Gkj~eeC@dw|7B^dFx$!^bCS};-}k-P z`1bkM#pwr5hD4S=Rv?3r>87Uoy<2|vUG+5ms$uhwK-agdHiyM)DR{W=ZgU31Bkb^6 z`e~SNyJFe0yY~k$erohmpX%YKS8wN)$WE%zxS0Oxw$}wI%|i)JO-GaU{Cwox6m}h0 zU+NTFf3=7;kvHxUU6TwZnVOsXpKh$}>(aE#DQV|V347CDJZ*?6ZOpVgS@V-vrS{yuh zupqqO-sY9O8_^ZzEt#&~ljM9d9$irEYXW@aDjh>2gId37V;w zv*n8Zxk4pYlY422$KI-WTpI9yxw&`LbL%$&FD5A~FhP*cUfvuVm&5w!%c^C0foa2vKY6IF+5@x{m9y2$>i-!G z_2Ip|#Q1$nAC0*e=Qg`Al6c-uhK~DE)yQDtYBf$DUfo*fSpklwXP`V_F~xks^i zPp0aPq^QIV_H+`v-&j}P)ymM~dREf1*!1*{0BtCgkhzdHGf8? zl?RSB&R;=h!(8x9C}G&LauTCaS*dvuoxQ}gd_a9wl`+h2`76T4Vc)s5ERS>3NjDn8 z+*^ZlZ!_;5f0XBU&JVn3uJQ)#Ia_w-=#as}3$~j*^|vYUPl)8A0o+|EUAXv7e){>? zTqP2SDvlp1>v&O#d+B){>A9hFL}MSDSio{ijCwe?ej^>|PJUL{SiVLs7bboVN)Bv# z-sjnsrMIsZg!ggilUESTfce44uU~H5%RN`l&lWy+<%&;~T%8wSTh7)YP4*)-j-^NY zz*eJGz<7E^hU+2qZH>?^UXGMV>lr+`%5Fa!{vD;w%o(_2!=P9tu2p!>u++OvFj0iT z9p-d%!5jamx|8hKu-f(UvMP_3&_SVi7wR+=JpTF>V$&%L1!uQicYFRZ!%vxR?W z2EXOL>RX^-0~2P0VGem#%E3fM6(zb`YVm7!FI#!rC~eE|S?=>^D9VB{M&3EKNru_u zYBpUextE-`b-C;M!P`a|NY~t?%&Yc^ubx)eBsaJI_S&9n*e{&O8!}!f%#vF5W3fOt)_`2J?WZE zr{S=1MqYiy(bJpO>*QW5al4i?c5nS{kLo&QpmD$UKoE*pS;{WJTqV1;LK$c!B&cZ8 zNDg&ZGX?-xS#YReC?$G!{n^;SSKhx!K@0lA7c7nsFxcc-?^M?8aEX^3W3`Q&aQBQ# zcM$$h?*F!%>5YFq66Ol`+**d^3eWd)xxcn3pm1ZK3>lawY&XP?#b|0U_jb*3|MRH7 z|FFA>iI1FKJ_!xzxy(7`Se?1+*v3CDS3cM)Z<+Ayq-&4jtG{Rd6u##E+`1V#x-hwy z!er4vOOwOP8&{vl{+YeJ)pEwNt)BZ#z|&L88}oJ#dHBQPDIn+?TrkWldVIP-VdRg% zZYi&|We4+)ESt2tj#Icpd6zm#mzzkB&8YU3H_|ktFzJC?-rm0jxD<=SM(p0(*Y*dE zK`kX|dw-coYbiSI^Uz6o6xr?v|JrokYa55ddyn<&UiSRb>BlX~hOepG=jWueX3xWt zgEM)a>I;J!6k7D{d!+vL>QL)+s|)jHN7%$#k@nviJf57}<63DH;LdCuoe|@_yfSlD z)Ulj9#(SeYIgT%HEPizS=V5p6-u2D+#RM$aR_k>4*y!bZ68mkAsC0M|`P1N4 z9d@lERu*ipbqY}97%>^aW|WuL(ofmiH>=7g{yL(01ev=lxW&J*+D3ImtDctZnC>s2 zolkD2#5WgP`N7w0W7aLb?AB$4OU_Qv+;+YUDq74{%SZB>~UPd;HUbfjEqPrvfckOt}I{W!}C(?TiiUx zR6dWpRVty7QAe%n&ALICbMz%IN((hjc=&Mo5ak7rx24-VnO*T~8N?i(-a1dV|8S4T z1D}j}Iqs=DIo&{>(e&m@a%{hcD{3z*v8^Lp!a_qI9%I?IJaB=D#v0VEB`F#g)0}6Z z^uhG>yDF*qjXk`z?fC6PmHj(c!yLXp6IGNs!U{_1b@kHLbesz_`N|b7nJ+HG)W)2N zq3n%Iv1H@vq{;^{2a#8xOTD9wvUdG%t0;%9hPiD{{VbVVQ1ULv4I-h0U0y9j8srU; zvLKS*KajQ)-I6)M7v^np+#%95lmyE-)`b;M+GAWbq@w8Q+m6TG)s<@eKbnkGy#XqmZ0>>_QEE;xuX3M#Y{|siI z$l^V(oO5Mi^DPw%)0w3GO;IB816yB8Bme`}@2PRlfEN|v?QvN`gD9tEk zX@|1c`O2b%$Z{`jyJ&toZ_^^0#!rnJ*lxsk2?%?jk>r zH_48sF+3AP9eR}9=*>^*rG>IvPeJ(uYooSn2hHIp^1A3!tM>@fjV-w|A7crfS#~t* zq36(imike$+7y`34YP>JmfTbPOkSJCwCh^Ov2nknyC-KP}oa(vo=*%lveB;6jtdl00*~ z`h>AHu}SXt*3xA8a)!MKW#?jvrS1G*&7&Cm{r`-jQZSR! zeHVnXHL*#P4#7Z}j1o^-yVe~g!z@9VF6uSBMw`1C>%2EJkQ|5QkS1#8Ys0KwgsCty z04DGv%*27uw7K)K&gnBxlH)Lq6SWewxh7cWA2Uyo=LvF`S6VVlFqKA{IMD2W#&U|O z+NPun82K>G5bdC=n4pKwjG{&hGMZY8BJA2ipm_%4I zmyncAn#|!18NzA4GoCsIOEnHWtr5naiZOOp`CBEIpDVrmk|~LwK<%uSr6R~WUTaF? z=TCP}SINaPrRm;_kC9Jc_E|DxxFw!zyk`+@4MyB&;mGMEeg?6|@M>)?mUvFz?rDgp z9Y^mE1L#a%!TLk(t%`*KmMom_IiC8IpMmTaY(~0@2{*%LmnHK8hB`|>73CHnu!d^c;h*SdI%f$G6&-&+#6Np%NGqcZZz0spB|M2ngzp^Z5AjXwHUjGJzUWn|2SZv;MnZhdK8 z{)1q7w_JFQw&Z&2#M`43ZtzWPn$@v)Bo>l+P`Ie>j0G=HP zX%5O$-v2ZVWYP^AR(1#4|D#9~6Jj+qqXy8jAFjQ&;Czq~uRIIYw+ew+?vl4TkTkAeo^aqD7(@5cU1sxpTiO-I1@5%wqKaU<~{le2>TKr^LX& z!S}fS9~%SzCg0;W_?Q^@H~AjdU(y)(7~jJ;A$jmEGGT#lm+|1+ZC&;nDM<``jPGA$ zy%6e-+X23**JbsWBnCcL|E?SZ66)XPeiy|Ieh!I3(fIG`F(66&qnqG=V+=^*d;9_5 zbFP71H3lU0J;4SXXb0iFBeI`p{NrtL*TJrI9rzgE6ZHSrTn9eZ_XHb!_c8D(z9;Da z-N(SE`kr8e?=}WL$M*#NzuOr2T;CIH@ZH5gXZW6=|92Myo#lIi4ZfQg=uF=e^#5*R zptF5XutArPfiK~Eg8p4T2ELT<2{!1mG4LgQPtd>1#=w{MJ;4TDE(X4a?+N;Mxfu9b zz9-nA%f!If^gTiUE)xS^+xG+;eDfIi7QQFw|IK6ITlt<~gU^Zqe7&?I2zQhayY~1k zeNWK;vtytm-O(7_1yZd3-`e*C8+@@C=*qq)=>NrHpsV|yV1rJNf$zch1pPZb2EG^H z6Ko)H3{<^+``&lw#Ot7_?@?X>+zFQlcfI8izn3D^Q(&D9i!LtD*M^X{#4!MO-R)3+ zxRbB&nh$sW<-y&Q+S6NHKk@_fYwM5rLB5E$P$v94LQyD*{>bM~pFS1RBGQ$h&iO|A zqZky*EUGu&{*eBUQ&K-icf|j@*8gqgTcHh+J>d=>Jh<~15AKxBgS&nR3u?pNvfJPi z?Jq&SQ|$!#b&CIMs%wNg!5zHc)0=1mRF^={_HeqK{zTs+zl-`D=?iyz!3u7N&(I&Y zOQ+bOGyD&CW5;FU!5!a)v5s^_=K$QjT{w>Fa0hr{`!nqDN&1WGE6N|g-igAFu75-t zaMwYh{>bOVv5xAZaUt3kGq+3V4|n8mqa!Xif^e7rHe+IR5RT*Xa2(M#-cNvCLw}L$ zJ}x(ca3?3BegwJO^bzqps*9QbpZ=e4!vyUp(dV7$`QKg}?jYK(Kfj0gZ%;2t`_a8V zF*eb?4IannT1Xu0sE*IUaYWmAKLK`1{7b55dw6iS*)}>NpX0J4i0pyx2?%nxxh@iM zJE{}s3+i1$e`FW9du|*3(C410F8KWqes6^9BZ}8v8^}_pCp*6F%IjRR9@iqk4GYkY2%W<4`G=-^QT~ zm*2)A+Bp^-I7GY1q63FgT&xLjD3i-?;}GpCiw+#3-DS~%L$u2*I&g?~n?(l>(XO-T z5I_$_h9@@DdvKK%)kB13>Lk5qB34lWukB13>LmoWP ze1-r*I+y^W5dL@oUoad(f!S!{`@akzFaTeUP8*jJ(33(t@1n(XJ6Q02BG`jqLxKaw zJ*NxCzC`CXl-sTg%8p;Fm>)7fls%^l%ip07h_*-Hadd_EN5$k7wCe++?a{Mad(Smr zyI&+XK&%g-?848ku3~%KP9O3ClwBDXw2uLHo}gz2d~R2P9r=K0d-S{~Dl`0r&^F%> zqP8f`mu|P`14(R;-h(E7p9_B_=Bvw(>?6(xqVmIEVSP_FM+e6?@*`cog%8BZk3J8G z@q?Zf#l-^p4*6U9puPAJ$gc@?z(3=7PEJnm>F}+6(4Os){OEx42jV((H6L_jd%pCT z{9V=uAF@3`hY$Jy{u=UEJr5+YJwg5t`T*qt5zpfY1=mV6`L)76*eI9&_ z?FsUKv=6@2`|TfVdx8!h?SszVtK?H`Pmuqc``}Y;Ptf6;`QUSGPmsTj4-ie!`wG!( zQD>b8pKE)94niLwnxgWfw&=C!bI*g$usuP3UHqN`!LQ+i&ayp02M(^om-azt+MXak z6PN!>`=GOJPtf6u``}C1o*@56`+#_VAzBxgOZ}y6Ptf6`eIP0~YK!JVqidKL+iT){ zI}5_t?-U+!ihAle>1W1}LHL!SeAtP${0#`$(8l*9+( z;vV&(_25s)f9FA-@0Cy0NnjfxJ#qIG;^arUe4@D=;^dOF?^ESR^N2hol^^~}qEKhz z{Lig_iXKFslE_cYp+z~eD32D;mBDi%J|>@($p1^rFPZ}?F6RT+fhZTTk60(-pt_{; zi_XK_AF@Asw+F{1=5HZAVxGog`CBNL6Xi1FcnA_@Cf12KsQ#tpN4d#3Ph$R^Xx~qI|EImr0HSO}nTd5G&Zo*RO5;=7=(7O+GPAIt z_NUPKl=%M?KAk;BQn_)w&gTEQ^l-WOX;AQ&Wl;zEg;@d2MG*e#EDpJ-4S$K2O@t)W zfCmAx1#JwXU#~@N91`f|qJ9EDj4vJjvMuVzAp-z@T9yE^_`fs`aL9vsQwU!GNeHr0 zRu~^jA;^X71yBaTT$B~YhZr7W4CTY}!w_sQFALH^2S3m3Ga=%`g~T94d0LvVFkunq zX(_`-2M6?h;OF{Zg86~sM1b=&C7An3*8(wgHAQ8BIGFD3twoCa4FA|Z{PPC!BJziA zq3-CK{;_l=#TQu*658Nv=#I-MYJ>K4N8kOmx2}cL`V=T?gAegXG7#5CK7}W7jwpW= z2jc8c%oJO?BvZqv@PK}Wh1 zWO(ly)LC)Rk?sWkUnCAB(VZYer`tdh-3k0V)dnAD=BL8X7}%aER0FZ2sbO#(hDAAH$!h zx41g~9w?%Z^ha@k)5jsMHxBWBN%R-Tlh}9QzyXXOTKhxvasT6Mfv8WkbS8gv-sAC) z%YgI4`Jgtc;}GwcM1LIjOTcf*AMwtG%NAU?Vt@)8E)}2x1P9*c3dVCGE-G+o1HEsj z1eY}EsKB)p^nM)!zS@S~t7E}s5C&G*aLI(tUt2-1y@@F#v`&GRB{X5d*D073*bq6& z%gfum%kdGufK$tr;rEnm;`dB=e0&I^IcP5AS590b{?I&pTyQ-?@1T6vd?>>j^nDmk zS5k=Ppt;DLP=*xI^P?j=g7Y^8cSUt|wJy50h<-;Zjt0U(xM&VOUm$~zBz_RA`}z>) zqB`xA=B9rd9x9IriCS67GKTOr%w_Y$ZM=km~4d-I6>2v^*EB2IgCG`GF^ wsK32=ct1W@obM%_kMPIn8(yhU;llM!RC3`ua0OcXg{7YUu8!LO2WW8YC;$Ke literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..fb057aec3c65 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Třída testu MSTest", + "description": "Vytvoří novou testovací třídu MSTest.", + "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", + "symbols/Fixture/choices/None/displayName": "Žádné", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metoda testovacího přípravku AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metoda testovacího přípravku ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metoda testovacího přípravku ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metoda testovacího přípravku TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup", + "postActions/openInEditor/description": "Otevře Test1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..9ff62e6336df --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Testklasse \"MSTest\"", + "description": "Erstellt eine neue MSTest-Testklasse", + "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", + "symbols/Fixture/choices/None/displayName": "Keine", + "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", + "symbols/Fixture/choices/AssemblyCleanup/description": "Fixierungsmethode \"AssemblyCleanup\"", + "symbols/Fixture/choices/ClassInitialize/description": "Fixturemethode \"ClassInitialize\"", + "symbols/Fixture/choices/ClassCleanup/description": "Fixierungsmethode \"ClassCleanup\"", + "symbols/Fixture/choices/TestInitialize/description": "Fixturemethode \"TestInitialize\"", + "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"", + "postActions/openInEditor/description": "Öffnet Test1.cs im Editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..3808b2ba704d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Class", + "description": "Creates a new MSTest test class", + "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/choices/None/description": "No fixture methods", + "symbols/Fixture/choices/None/displayName": "None", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture method", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture method", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture method", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture method", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method", + "postActions/openInEditor/description": "Opens Test1.cs in the editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..0de85e7296f0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Clase de prueba de MSTest", + "description": "Cree una nueva clase de prueba de MSTest", + "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", + "symbols/Fixture/choices/None/displayName": "Ninguno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de accesorio AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de accesorio ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de accesorio ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de accesorio TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup", + "postActions/openInEditor/description": "Abrir Test1.cs en el editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..b4c74b7e35c1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe de test MSTest", + "description": "Crée une classe de test MSTest", + "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", + "symbols/Fixture/choices/None/displayName": "Aucun", + "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Méthode de fixture assemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Méthode de fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Méthode de fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Méthode de fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup", + "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..22835e619bbb --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe test MSTest", + "description": "Crea una nuova classe di test MSTest", + "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", + "symbols/Fixture/choices/None/displayName": "Nessuno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metodo fixture AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metodo fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metodo fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metodo fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup", + "postActions/openInEditor/description": "Apre Test1.cs nell'editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..d77a3fceaf01 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest テスト クラス", + "description": "新しい MSTest テスト クラスを作成します", + "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", + "symbols/Fixture/choices/None/displayName": "なし", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド", + "postActions/openInEditor/description": "エディターで Test1.cs を開きます。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..543ba69aef5b --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 테스트 클래스", + "description": "새 MSTest 테스트 클래스를 만듭니다.", + "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", + "symbols/Fixture/choices/None/displayName": "없음", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture 메서드", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture 메서드", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture 메서드", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture 메서드", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드", + "postActions/openInEditor/description": "편집기에서 Test1.cs를 엽니다." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..5861a0eed9b1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Klasa testowa MSTest", + "description": "Tworzy nową klasę testową MSTest", + "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/choices/None/description": "Brak metod początkowych", + "symbols/Fixture/choices/None/displayName": "Brak", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup — metoda początkowa", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize — metoda początkowa", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup — metoda początkowa", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize — metoda początkowa", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa", + "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..af61634a7695 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe de teste MSTest", + "description": "Cria uma nova classe de teste do MSTest", + "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/choices/None/description": "Nenhum método de acessório", + "symbols/Fixture/choices/None/displayName": "Nenhum", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de acessório AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de acessório ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de acessório ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de acessório TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup", + "postActions/openInEditor/description": "Abre Test1.cs no editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..cf6df6cf2994 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,15 @@ +{ + "author": "Майкрософт", + "name": "Тестовый класс MSTest", + "description": "Создает новый тестовый класс MSTest", + "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", + "symbols/Fixture/choices/None/displayName": "Отсутствует", + "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Метод работы со средствами AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Метод работы со средствами ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Метод работы со средствами ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Метод работы со средствами TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup", + "postActions/openInEditor/description": "Открывает Test1.cs в редакторе." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..54492121960a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Sınıfı", + "description": "Yeni bir MSTest test sınıfı oluşturur", + "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", + "symbols/Fixture/choices/None/displayName": "Hiçbiri", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup düzen yöntemi", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize düzen yöntemi", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup düzen yöntemi", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize düzen yöntemi", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi", + "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..e9cc3347cded --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 测试类", + "description": "创建新的 MSTest 测试类", + "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/choices/None/description": "无固定例程方法", + "symbols/Fixture/choices/None/displayName": "无", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固定例程方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固定例程方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固定例程方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固定例程方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法", + "postActions/openInEditor/description": "在编辑器中打开 Test1.cs。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..f8c2a63ba94a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 測試類別", + "description": "建立新的 MSTest 測試類別", + "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/choices/None/description": "沒有固件方法", + "symbols/Fixture/choices/None/displayName": "無", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固件方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固件方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固件方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固件方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法", + "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json new file mode 100644 index 000000000000..5246c07c84e0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json @@ -0,0 +1,130 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": [ "Test", "MSTest" ], + "name": "MSTest Test Class", + "generatorVersions": "[1.0.0.0-*)", + "description": "Creates a new MSTest test class", + "groupIdentity": "Microsoft.Test.MSTest.TestClass", + "precedence": "11000", + "identity": "Microsoft.Test.MSTest.TestClass.CSharp.9.0", + "shortName": "mstest-class", + "tags": { + "language": "C#", + "type": "item" + }, + "sourceName": "Test1", + "preferDefaultName": true, + "defaultName": "Test1", + "primaryOutputs": [ + { "path": "Test1.cs" } + ], + "symbols": { + "DefaultNamespace": { + "type": "bind", + "binding": "msbuild:RootNamespace", + "replaces": "Company.TestProject1" + }, + "ImplicitUsings": { + "type": "bind", + "binding": "msbuild:ImplicitUsings", + "datatype": "string", + "defaultValue": "disable" + }, + "evaluatedLangVersion": { + "type": "bind", + "binding": "msbuild:LangVersion", + "dataType": "string" + }, + "latestLangVersion": { + "type": "generated", + "generator": "constant", + "parameters": { + "value": "latest" + } + }, + "langVersion": { + "type": "generated", + "generator": "coalesce", + "parameters": { + "sourceVariableName": "evaluatedLangVersion", + "fallbackVariableName": "latestLangVersion" + } + }, + "csharp9orOlder": { + "type": "generated", + "generator": "regexMatch", + "datatype": "bool", + "parameters": { + "pattern": "^(ISO-1|ISO-2|[1-7]|[8-9]|[8-9]\\.0|7\\.[0-3])$", + "source": "langVersion" + } + }, + "csharp10orLater": { + "type": "computed", + "value": "!csharp9orOlder" + }, + "csharpFeature_FileScopedNamespaces": { + "type": "computed", + "value": "csharp10orLater == \"true\"" + }, + "Fixture": { + "type": "parameter", + "datatype": "choice", + "description": "Select the fixture kinds to include in the project.", + "allowMultipleValues": true, + "enableQuotelessLiterals": true, + "defaultValue": "None", + "choices": [ + { + "choice": "None", + "description": "No fixture methods", + "displayName": "None" + }, + { + "choice": "AssemblyInitialize", + "description": "AssemblyInitialize fixture method" + }, + { + "choice": "AssemblyCleanup", + "description": "AssemblyCleanup fixture method" + }, + { + "choice": "ClassInitialize", + "description": "ClassInitialize fixture method" + }, + { + "choice": "ClassCleanup", + "description": "ClassCleanup fixture method" + }, + { + "choice": "TestInitialize", + "description": "TestInitialize fixture method" + }, + { + "choice": "TestCleanup", + "description": "TestCleanup fixture method" + } + ] + } + }, + "constraints": { + "csharp-only": { + "type": "project-capability", + "args": "CSharp" + } + }, + "postActions": [ + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Test1.cs in the editor.", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "0" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/Test1.cs b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/Test1.cs new file mode 100644 index 000000000000..9c834214c229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/Test1.cs @@ -0,0 +1,124 @@ +#if (ImplicitUsings != "enable") +using Microsoft.VisualStudio.TestTools.UnitTesting; + +#endif +#if (csharpFeature_FileScopedNamespaces) +namespace Company.TestProject1; + +[TestClass] +public class Test1 +{ +#if (Fixture == AssemblyInitialize) + [AssemblyInitialize] + public static void AssemblyInit(TestContext context) + { + // This method is called once for the test assembly, before any tests are run. + } + +#endif +#if (Fixture == AssemblyCleanup) + [AssemblyCleanup] + public static void AssemblyCleanup() + { + // This method is called once for the test assembly, after all tests are run. + } + +#endif +#if (Fixture == ClassInitialize) + [ClassInitialize] + public static void ClassInit(TestContext context) + { + // This method is called once for the test class, before any tests of the class are run. + } + +#endif +#if (Fixture == ClassCleanup) + [ClassCleanup] + public static void ClassCleanup() + { + // This method is called once for the test class, after all tests of the class are run. + } + +#endif +#if (Fixture == TestInitialize) + [TestInitialize] + public void TestInit() + { + // This method is called before each test method. + } + +#endif +#if (Fixture == TestCleanup) + [TestCleanup] + public void TestCleanup() + { + // This method is called after each test method. + } + +#endif + [TestMethod] + public void TestMethod1() + { + } +} +#else +namespace Company.TestProject1 +{ + [TestClass] + public class Test1 + { +#if (Fixture == AssemblyInitialize) + [AssemblyInitialize] + public static void AssemblyInit(TestContext context) + { + // This method is called once for the test assembly, before any tests are run. + } + +#endif +#if (Fixture == AssemblyCleanup) + [AssemblyCleanup] + public static void AssemblyCleanup() + { + // This method is called once for the test assembly, after all tests are run. + } + +#endif +#if (Fixture == ClassInitialize) + [ClassInitialize] + public static void ClassInit(TestContext context) + { + // This method is called once for the test class, before any tests of the class are run. + } + +#endif +#if (Fixture == ClassCleanup) + [ClassCleanup] + public static void ClassCleanup() + { + // This method is called once for the test class, after all tests of the class are run. + } + +#endif +#if (Fixture == TestInitialize) + [TestInitialize] + public void TestInit() + { + // This method is called before each test method. + } + +#endif +#if (Fixture == TestCleanup) + [TestCleanup] + public void TestCleanup() + { + // This method is called after each test method. + } + +#endif + [TestMethod] + public void TestMethod1() + { + } + } +} +#endif diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..cfd70169012f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/dotnetcli.host.json @@ -0,0 +1,12 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide.host.json new file mode 100644 index 000000000000..31b8be94219f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide.host.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "fs", + "symbolInfo": [ + { + "id": "Fixture", + "isVisible": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..671271e7595d5a5b30325db0bdaad7d5469e58dd GIT binary patch literal 55748 zcmeHw2S8NE^Zy=Qu|Vt<)Wqo5N{m>7aEiv>1vM%VH8EDi#IA4}6{1GaXzYq6b`iT+ z!4@@9QITLl54(T`3q{)g=kt!eJkFzon*T2Yd++UgTV}S*&d$#6V@$zHGHYuKx*D;^ z28{j97_+d@`0FSbJ7&mO^>9eS+mWbFgElD#_H73y#KB;VS@Nxmeu%!Oc?w9qR8KxeMh(r45#!ce`|7-E#W~A2~m;sZdkV#_&Ow`0QHO+XSdCw<$O*EBYQc_Y91yOl< zYy2t-=f!#Aq(sSY=1u8R93N9nlJtrv(a)re1mNfNev)cZ98!cA?j!}_X=p|Xv@~*L^}_mdjW;k z&NFCFMEQDg?u}aW^5IF7=sIztZ_=di9Xli?`6fWm27CY)ZZ1Y+A#SY+9pH%+qExYtyC;YuBzF>(r?e>(;Fs>)Ep>>(i$X>)*dW z8#HJT`}*sz*|*<*%Z3jh&c=)x!^Vvp$A0+X2R3=~WHx>JbT+%y1m>-r#C%#$W^>z3 zWj}ZHWDB~e*rHyu+2THP*s=lh*s39ZY|YR`%>TQ^?6*-%*#`IJY|Df-Y{rZkZ0_8- zY{7yB?3Z7DVZZ+RD_gyKHQPC3Bil1)E8F9?A+!P?0mp!7IG|vT{&=`9Y21Y z{qe^i?Cc+B*`I&@$u3;Dz^)w+W7kh!Ww-yl!PMt(vdfn*v+(e6roI%(Zrr%RA|oT& zy|5_u@Y+50_{IYk9r=*mxpRj-eE5((y&KD(KX}Tbqodi=r%&07=s5QJ=}Y$F#S513 z;x&tpk7r5oNi6wIGD}TPVQDF;EImD)m2JdW%^p-=V;O7Z$5@x0jP(y?Y*-v4zGcbg zavQda_hdV`2Mgf~*%iKv-RGAjevDeIP4SgI82f50jU9e8KJ8>|3&lSX$Jk|xe~seb zrug?Lel*2@PVp0D@f+1jZHmjQvAjg-=5-krTCOq+;ECN*^=?OHjJW)K@t$)S_gKaF!rhGTI?MQFwJg3h#kZyS zT`2xwia&|sFQE9pQ~W&?{}{zTL-8rkg^?8h0mYBg#;?yBvCfpja7w|OQrJK#oT3!& zPzrIDoV~Q+>~&Ah59EcWt0@y#ecN}wFYuR`%_Q2g2yzdpscx8$s!4QC!bIh*f6 zX)WX|co%0kE^FeuX~A6rtrs_VlJP)xqY0S1U!*}!B$i_&gdgN++cZn)k~s+q?_8&t zan|sOOQr}EzNtypp^eRy64BZ?6u!ABg*P$B@7wV4Ky6Uz2KbaVHa4r%+4Akc^t?^x z;8NMxni!XMc5kUKgR+htJBYsyPMWfGcPedc>fql0qqj3C-n@h)D`|e3P+o+OyBlTj zk-iK}YIi9vOXRbR^j)1x8Jjk9@BbDB=AE6&lANr8(x#tj(s%1HfHJUnI|Gxtu5JSd z4#<|2IEHbjBR+ZmMTnSn4a?!82K_u3!#M-e&c6p=}jOjYG1!n@Trb3g`7+%i*8 zsu!jE56HqBmvN>>QLYQ(jkO-l4e+a7vIA9<9&px%AJn$Tz;-<- ziWJ_2YDv#uu~t^B(Le%smmU=x(f>dV{nVZGf=LT2R-sz8YBl@XRW+zk)v!X%zEb+1 zmC_5POSiUS3PVG~N`36Dj4D+(s{FrxQuqNRhwFu}tXM6Q+rJ#-(yc=MPURa6(BP9X zg1>zkWW^eMMc_vGl&@ltfsam!$-ET4T-7R7t^3+r8&#%%4L-5}I=6#r7y&BxaqC^# zhW@FI%WE7hEEBkOZx84?$bC@PKJ-s7vkjjqvc~f^kvTlk%!2;=eP1Pjd8#!zB{}Up zmF5Ck$e5>2Z7@=rm$q%&mUZaRL7JEL>eY)mIXS&GFa7Sj@7UF&8SH>G*0G$&oLUz(F{+_;f# z+qR7b1_rX-yLYn#2M(~Hpdfba*fDl|RS-M1?kGFI;}2;*8g}p^J9+XXJAL{zJ9q9J zJAeMXG#9=3M+Ccd?mD}4>5?=Ty?*^VyLIapdk}s{nuEsNe$4LOyC=;-W22(klRGi& z+5IQldFacSxQsbyJWEJOU`ekN$tAHjZ{A4r(A121Xe*j04xoABWSS=~qj};!nkQbB z%@hBdr~WrjeP8ob*9_>V0aw?In|}Q=?&v)pX_F4*)H0s8f8ZK8M! zK9;?2W2`VNX_P65X8~%ncWrG{yelR0512JD#_(uN z&+)#OwLt?XSpo(PTbcuk7c-;xu6WeoYGZ9s8wqGa z7&aEjbu1~xFI~&d$h2)6L1u|=|GY?Z4r3Si6@trMfdbBb! zY2#S3c=6&!ic&qqYuAoa{!UhQuDz@bY7$bt9L)?{YG2cP(C2K`%GH$;aCCKb{=~qd zm;AkyKi>B$t!U!v>S$tQ_s?s2eAgOyZ)a%QG1Gf(eAgNVpHVJ`rd>0=*XB>}ZJeCG zkiYMz#lMwnzYe7gikB*7ZeY?%Tl21({9S>+vvo%48&H*HK&JSg*VHtznvHrA$xS+KXi1H))GeNuNeI$R6hCL`DXDd4z>tx_uuY4DJ->-My-sl5PrOh*o zk+tfUYuB@9-%iz))!S3Ya4Jorq#R0o$|_W<+OC>qCCh5vDS)G0W@z(2%R2RJySJ!V zzhVogOdSik64Wcx%wE|=#LtAf8J5*^_#lbm))J%c8LsoTm?$oD~vy>jv z%o4QnzA8iD8?wZWQ{gP~Yy?wZyvZUWBG~QQw^{V9M=UBT ziamPth(T_6{P;0@^5hANd-RNS*U#B2(p~?fzmCt)UnjCRq{EhEhYY!47k@x{=702| ztPv@0d(Z;rSW*i6)hC6nEh%)Bq|oieEcpOtL-IvW?#(>-YPOK?X1n+~ivN#3)`0Zc zMm-oa8OxZNA7jOLGG{4-5{`@2MpPXXzpFX|khpA7uYuPLVnoI1ov8Ab*=C5o^ zQsvn-GA^x|-6+b{uV25Z-4|8LRFPPRNtt41rd92l)iC>*ObVERb<@U;>sr}0EmPJK z0g5%H*bS`hnpXLrX^raT3_m8XX;~TGjQ7<|tDBbn!cO>G zmNhjqvuvvMJG5-xym?CpTN?+5#-G?VEo)^>U}asc(&wMmuJc8+%9a`^Z(gycc_~}% z81ZR|O0`N>_{ZP8Uc(kmZ0$5$F#o?l_2|~VWbw*asVv#CL)%^&#!4KQ)`r-?ahty- zHvCP;wypb2y7BbZxxjKx)k9vKoZoz1^D}iTdprMR=CQ`I$LDqGG_M`AyNqL(GvAFe z{pgGT{ZXuJ(`pmv%yyhKx#EK0AiLSJpLC8YUR@Ffh2JV*W-( z{t7EYcxE1D_ZP6e*6eIG#dpWg!1IG!Bi5o8t45J7nyC~C29e1r>hwxeJ}UL{IUkeI z(qWLVdrG3MnQGl-vz_ykYq2r>wuwU3+#o99`DhE~lluojR}Cy~zFzP}+GsO&>h%6L zmdt>)-WAZpNX3+wg6b^}4Gpp1*tfDm*~?5dpr^6h*o)J`oPIbsx7CVuF1~jje3s;H z5cO*Z)@i`HJKmn|mh8Y0Q`Hiy9TqInj4fI?m>v4zLg=r2)QGe+hhNj{T}v&)d^*Ng zR4#pD*f_~sRnnk`FY`Au@~^H?Cd^UyHi~jHV%PT+Q@I}tG&x_BZ7gjvzw&ekOVy9x zlu=a~6LkFMteRcdPEWYLcP%}$WJBwDvs1Q5?{)L4V!#5;lu6OdKf1gR-wqTPNP08kqd-@be>G>tAuC)$`(C>i)~q$Jy5EV5%5PHFL^f zY^2ATEfdw#BW}*Ou6EGa`Wqv5*Gy?grEIC1BvsK1Yi7}&-EGaR7qC-5GG$eTk16WV zqO<|?FtV<$FM`r-P~w&Chu2>zXTXfUWU85#%%6&^-6eP1-qY1T)~(6T{@uLZ^j{)} zD4Aci3iUi!SC#Hu6_;XeudVBKgj(6$&?V}96$ev*y^EcbY}ZM50}cFV`!I#_%DCbo zs-b37dA|-}pKmd{X5_{XZTt4(s_Q8Si?QtwDzmON4UAaFzgn;r&&@2@#|;wMclNcE z%r5q;kPVNgHr_JjmnUA`7w=qu;6*uwK~%+hN0xic^b7k_9iKjCWnU{xzfvKOQ@<(0 zoKro!w2AtH*{oVP?6Y7a|90CI{SHqExN-3NO%ab4+&VNq_UirnL!UlxV`9C(oO-C| zpzci+V~0*^y~8!w<>|FuCu3i2h?!wpy~pz-uP)Bu&xQu9H^;n6NNQnjsan?8Gi-8gR;!Ik)TXtby+;1M z{RO?K#nK)wXY;Mu@S2*ts9MSuW=cMJf{m3?$P6pbq;-{J|471<+RU+yiCgHJRwGW% zDS5lP!!RR%ZdXQCW1Y9cv|_2xhfHa}6mefzU72X~r#&;gxqo!;J>OpFRi;dt^`TX^ zr92M~ZfQPtpi#*4X%?*YC(o)~J2t~irG8`0W}1a0>AMRmAM)Ie!tPf*o??^m?AFa# zkNB|{XBwNAO6ASe(|)rZ6Zv@PnqsP8U`7Zo*)V4L;Tr>LuymrRL=EQAb=$V#wVCIp zwako&TRg$qkG)p1yDOZRh7J6RbQY@;eG66esG5GA*tBk+DlFQv)UlIGwjFM!vNlj%BLa=st{PMdY_KCU zvSg>`09~Jw2xw8oz}kmd+Zrh?6v|OSHGFc2(PuFGeN&ZtBDGo5UYxEF6TNBe{weeO z7+SY_+PFQN71VFt?|o|~7`$xHj7Htu-}Pza!LVeHHrw0os2O){i0_sv?nin~OTN5- znRR&MbLfUqlTb(JCvCM8_y+-OU8hqSBbhRnY4^MrCUK3zMlR|D5$c4zH~p~cnr z4!!)um_~s~uhUbWZ#$s&yh#D=eIEYLV2bZ|(N{LKeq`L+Ox3={sI=+lLq`T4-PkZF zYUZUqhV9sqH*qIRhsOp6KfAwcaKATA`zj_STpt$xV5w{MDHHt7RLu^KP8$>&v9asQ ztNS8cs!W+Mw>`7#khUk-b76YYz0ysmCOo;J-ekA^C*qN%$6ZT4P;E(KtNLesRI6$l zjD51}%vNG;p|^UC+%+%<0-I0XzU+YCu|xwO)qDzZ%Ci0DbLTov>>SXp)Bvw@ zZ?5hdxO-^F$JgsRTPl_{8Ma{0o)N^Qxs*Rcc!Q$X@TAnm8u@gn1((en;rhuI&eWKj_WA3a-<7HW;wK{_CMb zec9{#gy4jP)xN`hET<~cEmhU+lONaGH$K++Q{V8!%@d#13r;xSBy{t(9fwBT2(4r} zc9RbaI##*yoEm{28Ti}Of85tnajCE2njfxo9C7hUi!iT)Jo@#ck!dOWMn-HoJ@2Nw zbET6(UUlmQ|NR3GS=RmMZXFX8m)t)}`*!%$NXOEx`V8_oT`t9Nr}OIXFSc+tKfn0G z%m#H?Wx`~rm8xN~@@CyltJXgw{&(^DjxeiQwD=yaR0pl+pr_`#&5p%TgM!V-gxPk zg{#*a`nNZI-SqK+$Z_*pzB=C|p#0)38;wWoZrr()>JJyy)YB$P_q6yz|I&TyP3MD`ez@Z6;{64hRriO=~ z>>lp$=!nX5uDQx{+R+n%E=Ru#7?t9s7x!tmXZM)TGzgwj|{>|5!#)T~l($`LVdCuAVOxb(s&unT& zec4m7teN|omOS-U_@IfmHe9q%c@m@azi`4Pyy-L7yYcA_EfiBv8z~*0*_^4`d-e0c z(A2Oqit_dQU7C7)Sxn``VXH6*u&7ZuB)GJ3VjoCk9%8r28GW=3ZcWizGxfL zjT%qAmFaWiZn_5#8Z`OAl9*Fvy6^p}&c=#~iO-1@I9C|-!{xnezgJ%BVyS3;-_LRD zfUfS>cD7#anH=5vKzi+dZ_b=_QF>iBrQ+}2{EpE+&$Q$iqeb_89d3`9v21Xp>&1r` zR)&AFbl_)CA3ZVt;V*lZtX%8)J;^QAVy^b?9?+2Q>u*h&Ej{g`bm(uYEWIas!1QQC zFX|#53sbMU8+KcDpMlm^vMVp zReHsUzMGS-jhVE_Ty^Zaw@Y-_G4bE*W?in28gHhWYM)^6rTR$SI{#y8FMhP;%d@pg zN5*ts8y|7{(cf!5_}FPrj4jwy7sH*yLaW~+D$XC-a_qpH2`x%4yO_ALnel0(DC!x# zgHvD5JM`w^%J8}6>TTVVeyBsWH^XAB=G^yDZuh8Do0Yata*Lnr>Xi_2AoYrs@u+Vj z``j`}etJN?HGoRvj^&IAQ-)lxy_}7T4BB<*%v$?udt;qlE8k21#+p6dT}*YX;Xw5x z_v^dASDbRdS;>+jlb_!@eBefM zEbGw4FuBQf^QiGF+ORLnf4TY&D$BddAj_zID;Bk5zaP8rIJmN#FI!fNIhxnJ|LSDG z{)k^9Ms|9s@T;8gs#VFc^VqT)Y_10%*!1X*Bj5I3R7&~yYlpsJ%)w0A%phcX`X1-R zs7yGvgN(Q-uZu9}5e#e;FF& zb=xQ8htsA}R512q4>r1&KDibP`^1u|C#HNI8CiK5Fl++hz+6{9XJh%-QTk>-nJUg|bwz@vFbpN&?4K^vv4#rP^b)i`}jSgj>ys7ac z3wltWJ(=QI+;XfpvuPT#mMUeZ=3oZAi&a6>hPmhubE4hb;b^?M(4q zwyOeFl68Mu*OK1BpPN`Ox#O@nprJu+*HZI>n-^1kX=Ksn=IZr_k5#W;QsMK|z}mm$ zR7F|~bG#^SYLv3PylVRB166F4MivH&$7d$9&ugkId_t0r7`dq|lpiT7t_>T)#{003 zcfL%l^)lQoxuf&;ewI^Q7TOqG^1XJzaO9JcA*Rmh>1_=g`**+6Z{G-~$CKONeSK?_ z^NxX)rhK-j{Kt&lRno*JzPRe-!V`5YS}fk0SY6rB((OU}bE~Eqb!cj`J@rj=O1b_U z#(9=-TUBvZ@}%P{4U;-AHdRdjQnkckbYx;^Kpn$Nwlk*BT4QSMeA(20^x&JPKEI{h zzKHY*2h3QH#s;kHe8!AxG39Z|>t-F^d-V(tOOk2X25Z*TjCE?wMp&@LcfE#82yI~G zvbZ!O=-94X+Z}D(Wt6Bh-wyid2Th5IiJUAqIPEm}U>xmk;Iu2DP>US&Q@yH1 zqNrn9W#Y7}gOkM$rS!$00--2Fs=|>q488U=BIy!P%9sHo&mtTI# z$wCQzwxDEd@Kax#OPUf_mEmIwX?`+w!g+F`tjHjlia$3#jWZC%6%Aly~9`x$c zk7s}X{Wqr_gj)K@Zi$D5g=yO!Sub)I7Z>gO!mexG^k~N-KYR9UfyQC*b!=J2_$CK^ z^y{_(^n0`kJV$(r^Um5pmo8m6?edoTUO~oUvgP4qF_J6#^|b-ChpShwYU97FHUOUU z{P}ZE8*dBL-pFvCljV#Sf6)f?)j!_pYXf8jB*|azstwR?UVi4x8BW$a@05PX0iaQr z51=j54qR;+7G)bipZn>jpQJtud}vp(R0e1Vd2w_sfi!04rT#%Tc)e~L0AE6TgbZHP zZ2VzPo^2aI`b9AokXa?acI_IHFEHene%f%w(GDQ*=(Yj8qn-Li z!UrH%K?X;@g#r1cA8nAVK>7Xq_w}{`xjb5!ZGcW}kmlcoK|9hY2>p;ZHf`D@@gDG^ z-o1Nk$6#HVv@pg3vM}bq{q~#Gr#=Mw!SBf$SgH^3+BtLPWSSQgb{iNrY?#Dz3XArF z)<5bPvOjb#=#QbHp`1<^DUvn--3D1lYk5jxl|ez;KXhQ1LN9T(S}nCneQkhFRgwA_ z@GS@*K;6g0#1t0U+H?v+Kjyi*K)c#9wE^&JgahpW@XH^6{4q-zjdu8PXJ=<^8$utW zlWRCx!xwtp1E0dCA8o+f+dC5u_=Wvb z5c=1zU#}OPD_5>ax?wR-*KGrOBV|0ic=2K;-2!9@I@u??CQ>JejuC*%gBALHQPGd}A=>?ui4RPo6WP$;^#R5ZU7Z=?qb(IB6czoz`NWA695RBaPt41+ zq91Z3+Pesgeh*zjQA1JEkF`O0d(Mu2jFEzNTrnr7Q^<;%{37fBK)fLIXEh%$>;m~v z>;FIcHTqb6^{uPl(HADS&;D)ouS+}pxdnY;|4sB4gm#qC`=%ed8#-Zx)9IFc?b@}O z936O*iT~^C{{^969#`I8ilY9p9)mS0Iun&cXCoiia(j=p4anCwZ{F1E`s6f-dpRxH z-HY(J%AqLehdx9;?&p?f-EfeZ>10;zykAa(xR=wC-Mt9^F6c-52JX7_QCe}i2LklmcPp?d{NYYP*4!3gQ_^}0?-cf<6uVuJ;=0a)1R!ar zeP0yxL%#vp6?4FX*vG-Xj!xTsi*E~B@_N;!9sZo?r##d&H&x5yV*LkgGpqT(JZw?i z=ap`R&kFvH^n;eH${;H`vwHq-rC*dm%9|9Pl9bGG&90uaq8~ONu>F9;y)ICiA6)wv zIKF!Ff^VI)mea}O(iQ%^0`x1e{So#*y750``sq|S{*&VrPN%+0SNIDX{(qw%eMIUr z8U01quUmfE(N8D;NNXF=-Mnje`0!yKdnY>2^)LDi`VH=N{kfqZwYJ> zsdNt~{CI~j2rEDz{aE9~9Or#H-TqHs{owSK4yiwYX5r}T9Gp%7AeW|!yFd$C&nC)&BFH{Gk?^VSOy#DDlU`}6@;dEMWCPydo^2C=3diy{6yPO~7w*S8`dUf-a)31;B$>qYg z`@g2Y|HBV*?*F>^zi+>mr&If-uN~=iy8K+k5zlq~x-?P$du#rq8z#4Y^yR_?QK$5U zBc7Gh<>w-fc&_W$#qUF=Ul-S+@D~>SgJ#$l0JX~kpA+$p+qS$fNx19d0sn?)qTB?oCSKzxe9L^P;_vuzAcc$nnQMZrII> zJWw`ta=Ntl9D9Am^TN6!eXLU!1myUm4zV{1dlrBreZfZBn~vv4j~d!nKlan04zTY7>7n0>^BoGS4q#&n z`x>nK!Oj3SNc08ZY#sU~>>0AdA9P_o4SN~nb%66Z(6Sq&(qcc ztK`sCJdKwbx#0+9#f5zeO&?FZxQ>({S! zgXP&@Q2bE`*lQ#D0c?^%lN=BxI5=36#n5grk1MQwSOvu&cw#RlWEbEDx$DlIJ96}; zu^;lDX!kgi1F}J3Kw;ny83^{FS>ca9Bji4WfvtF9!TZ2pS5_$qEguU0=p(}Ag`N)q ze}T8SzEAwIM-+S==gPs}7Y=$ajNPLD>b4(&x4349ziya^7jQPf20Guc*tdW(dp8chNZKff|kE-dIj;zY2a_8syFEm3IDW|RDN#r3CV5-_5-;A$gntz17|+T zfyzP+hi51k%-{9N&v;*002@!(Il|5bc0UCHefSR^Jeb4Q4`WkdJLuh>KY5lb{NE(J z;n$9b@#x5hTz)U7S0Dc1dl-wvxKx-|oc$bfEJTa{LEk{06i;W)WjNr8c95E!!lQ3K zF!Fm5Mj!r=Ss=p~m4hDk>>p>f_{08FZUZIko9L^teC@Zta8H}j{O3+yeAN&? zKAr9tbW!o0Gd6PiBCOPmbju&}CFlx@(j~l#*W$lr!kSDrOu{}1ef;6Id)%k>WWL8| zD_38Nli$B_4QM=^CH(LA;%-_Ki;$CYVYz~2&y#2sNby4rx z+P0Kc`;jW-9sJ1o=j>J!_@Z93wa)*$#r#Ed9GABrv>DNsvTHx@0Cgz~;Q!mGrQGYY zF>g6v!WFiCsDr0>W2N?fZ0WvC_pl2VAa6h7S#GXqWBCQ(_V~sFu0DVBEq5<0O4_G_ zv|*DB|MQ1WGu_MceINMC^DpQ<@Td97DY{1G#ZjC*h0jacc?^3>#~kQC?>jC5*lEG_ zASdj!l$GB`g6j1{w$u8c?Xalq)NrD|L(h#lEzb2TY=`-}(3yz*a=Oa#yM6n%^t}q` zit){Y!gg2($m==00za%Pj2}NZC!y1&_u1}61kj6R>$`EUtd-m*+ zXocMa=8bv9ON57A1nLHOif36}k?*;4=k%5z${lMV=qHGeI>uU6LCO&8ywEqJ-{K5! z)C=?!`W(()L0ifSKj?C>hAheubIPq-w`$8UKkX2 z^$Q&h)`;;<98rc?KhAF%LVqC73zdep52p`MK3M0H$C2ZQGo!Koh<=MQM0-IQ!nO$X zBVJz05a%!F<-Ek);D>&Ia~Q!#g}o1WAkNLtOFM*}8@`c}7sxGsI3ox4R@f7YGK9V! z=S-phpbT^B%UHwk^YhEI?QCxFLs_A}!3GAp1P>1nsV`$p246xMf`37uBzN+9$GDAk zp}azF@WVQjeEnFIA_YV!-0>352F3a%TJD5cKFHPRy7jxl4`T%6O4zpLG~dJ+h`9jf1@8(! z@ZY$&I1av+(|jHCddQygHl>TFu3z3q^3(q0@$++^9X`70y$}4bPK>p@F34XA-k{_ z&R@t8ziS~^_#eLq^H;GiXkB=(v~DVJl;el*)nPuE9S_OtJ6~G&-Zt5vPi-)Q@1GyQ zLwBE(T=4V-88Zj(0qeI;73=<#uc(D z=D>yJo{-K3?QaU<*o{0*&r;|vn4^QoGS<-Xl!O8p4yu77Pm zC84B?pTM)QuA=`=symF&Xy(DOt_Qc+$y+)TCnER?$J*Y4&MJQRm)(38)%C6)H%aSD zz@fZc`SFzprMlifH-JB)^C1wOXy!rHK526V8DK%|iDKxkmo2z}%Dp^xV)3!(KcqJ2vR+#d?=K zf9M!d2AH?PE(>Lnmoh*+>~}nQ@}#sUTAxi9Yz2WM<`e*tKWui<{{Q;xF9~mifjpm= zGC;Y3F6gPUvd4lwA@=X;=8rfF7cP{(&5SY-x?!x_=B5mw@tc&DS2GCK;zhj!;{5?HA zIrtXl(r5?J$Ac%KFNt+1(WbD*1)U4}1ayF?@7zFk^h3uW)?h$0_9K9oq5jbqfEVVP zaL^}1XAB(B-g67t<&QGQK1>0k48Q~A>*wezSl2`w73*LkPEOanQ1y*{ zXcyoE_}-_WUC^nEgLs}>`XT!rJ9bR6&(BI0!#EGU6V{>S`OEKh@yKodBAz@gefJ`q zxaJflulb8~b9;U8_g#$+g68=806JCdtHl*S_^RPh-{61XC!(F_^@=pGzhQ3MsnQ%? zoFAMv4oc{`XHT2KYOTRqLg4`cp6~t#YA1CROptD@!?8Bk+y7@;0U*Wny zvUA53e(d?srN1C~BQDDNLHHf5gWWXpfs2ibraq7)UEv30(yRbDliaArci}P5hAmrO9QN@- zN01dDeUbyz%a$#Z9vv7UhRA!kF*&`neL@ebdy{{8pgIcSzU%wb`d0NyUrhyEYu z#9+;HIju3|L<3}h%*P;$WBpU^&`vNnk*5#Y5Z_&Zof77cm^)=f18_%~fM$IFSpnxG z$@K%i%CaL;hU3a%HwU zrmWJ(920=@L%W82hkge+7Pf@Y{|Nm;OOfd( zr}PmH`WBS4u)l#k3jLYf7E`3Bdo4)%n41EqT}w_kZTNFaA7zd9gSAD-(y)Po-VZj< z*gGqqSIE;xp1DaMa}(4r%0t)T{5EmMnn+LNA^bVv4}AdIChS0T9p=axd_`MEx@DD9 z`U0PvuGqhI_p(~M)*`}#SLpIL^e?nMtVia?!S>K(p*#IJn)=%xJE{y*`k3z6FNMcL)$`scP& z+_%dN$yNbtuu&Hy`LF$clG4VSCf2kC{&`7PgjExMfvOEW&}#!f=(kHM_wXa3v=20# zpWks>T2IYLKhOKZD4w)0jO70)I9jL6yiY7myU(o1*TW!(l_iI(ki+~;^vYq7S8o@R zJ5GEi3i1>B#acQ;C^t^#XqmV*BZ2l)wdgh&tPN(KZ3a96Ua!*~jrKo>{I zb#i^Fy!;SXo*rZ^oC^wlHs;BwZ^$v=QQ%id8*&`v0DYjF9>!gaxhO}}3*KXl2Tz5~ zGsa}hhqD6R^iamoWn#=jIpX|Y$b7<%8RtY~C8r^etkT0flppqQp#H(nfg8rx>>#`J zAU{D54_Q{M8w&j})t}yEvq}%PoRcR{mUJGFxuMg=S_*W38SOPwdLsR-(nEP+T!1Z= z++iFEcHa)=)(9g1Ss%c()aep8F+vsIHXh9&qej<#%fA+Jai#W07F!W)! z3CAeN3K&~+bn3f&)nGqK&vqr~0>5?cI$u6;zVuDClm17v>B-9?yL+5%fw67<$Y1%+ znVa~1(p3RZjB^;@s0@JLY2cVEN8=UgIHKZT#78B*N{piTQKV;*TpICFN~6%nF^pF* zYp^CK#x120d2|4I(_BhTa&NYd+Nqkt>bjGp=T>8%8hCMb4s&B&K8Ey&U#X$T$GR5e zE-_xnujqT|H|X22p@)O67V(KUsloRkv*Rl4o8|GrQ!!@*|AK>@jlPBWp!>*?Bhnaw zaS3CIJg!(r#P}fWyfJ?TuR?snLyf#aALdmUGvqknEJIx#2xM&VCJ`UHXYg!{&(QCK zmtm{{-$9?%1>N}AiwPc${*3u4^rqk~SUbczfG+5ZPq;|meaBoDJRNf%$Q=4WUwq^b zyus7K+fl|S6EWYAr=u@E_#nnXv?0v5a0L$Foxn{F`r;!DbOK06IJ7rBhkYTwqbC64 zJLaPFPO3lPiTZ?mqR$=PxStjd?~>-W`k29f&B>m>Ed*ca-IybH{C{vX07a_Rs8 literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..fb057aec3c65 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Třída testu MSTest", + "description": "Vytvoří novou testovací třídu MSTest.", + "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", + "symbols/Fixture/choices/None/displayName": "Žádné", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metoda testovacího přípravku AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metoda testovacího přípravku ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metoda testovacího přípravku ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metoda testovacího přípravku TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup", + "postActions/openInEditor/description": "Otevře Test1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..9ff62e6336df --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Testklasse \"MSTest\"", + "description": "Erstellt eine neue MSTest-Testklasse", + "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", + "symbols/Fixture/choices/None/displayName": "Keine", + "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", + "symbols/Fixture/choices/AssemblyCleanup/description": "Fixierungsmethode \"AssemblyCleanup\"", + "symbols/Fixture/choices/ClassInitialize/description": "Fixturemethode \"ClassInitialize\"", + "symbols/Fixture/choices/ClassCleanup/description": "Fixierungsmethode \"ClassCleanup\"", + "symbols/Fixture/choices/TestInitialize/description": "Fixturemethode \"TestInitialize\"", + "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"", + "postActions/openInEditor/description": "Öffnet Test1.cs im Editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..3808b2ba704d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Class", + "description": "Creates a new MSTest test class", + "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/choices/None/description": "No fixture methods", + "symbols/Fixture/choices/None/displayName": "None", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture method", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture method", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture method", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture method", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method", + "postActions/openInEditor/description": "Opens Test1.cs in the editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..0de85e7296f0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Clase de prueba de MSTest", + "description": "Cree una nueva clase de prueba de MSTest", + "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", + "symbols/Fixture/choices/None/displayName": "Ninguno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de accesorio AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de accesorio ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de accesorio ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de accesorio TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup", + "postActions/openInEditor/description": "Abrir Test1.cs en el editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..b4c74b7e35c1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe de test MSTest", + "description": "Crée une classe de test MSTest", + "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", + "symbols/Fixture/choices/None/displayName": "Aucun", + "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Méthode de fixture assemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Méthode de fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Méthode de fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Méthode de fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup", + "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..22835e619bbb --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe test MSTest", + "description": "Crea una nuova classe di test MSTest", + "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", + "symbols/Fixture/choices/None/displayName": "Nessuno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metodo fixture AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metodo fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metodo fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metodo fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup", + "postActions/openInEditor/description": "Apre Test1.cs nell'editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..d77a3fceaf01 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest テスト クラス", + "description": "新しい MSTest テスト クラスを作成します", + "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", + "symbols/Fixture/choices/None/displayName": "なし", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド", + "postActions/openInEditor/description": "エディターで Test1.cs を開きます。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..543ba69aef5b --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 테스트 클래스", + "description": "새 MSTest 테스트 클래스를 만듭니다.", + "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", + "symbols/Fixture/choices/None/displayName": "없음", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture 메서드", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture 메서드", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture 메서드", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture 메서드", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드", + "postActions/openInEditor/description": "편집기에서 Test1.cs를 엽니다." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..5861a0eed9b1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Klasa testowa MSTest", + "description": "Tworzy nową klasę testową MSTest", + "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/choices/None/description": "Brak metod początkowych", + "symbols/Fixture/choices/None/displayName": "Brak", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup — metoda początkowa", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize — metoda początkowa", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup — metoda początkowa", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize — metoda początkowa", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa", + "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..af61634a7695 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Classe de teste MSTest", + "description": "Cria uma nova classe de teste do MSTest", + "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/choices/None/description": "Nenhum método de acessório", + "symbols/Fixture/choices/None/displayName": "Nenhum", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de acessório AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de acessório ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de acessório ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de acessório TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup", + "postActions/openInEditor/description": "Abre Test1.cs no editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..cf6df6cf2994 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,15 @@ +{ + "author": "Майкрософт", + "name": "Тестовый класс MSTest", + "description": "Создает новый тестовый класс MSTest", + "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", + "symbols/Fixture/choices/None/displayName": "Отсутствует", + "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Метод работы со средствами AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Метод работы со средствами ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Метод работы со средствами ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Метод работы со средствами TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup", + "postActions/openInEditor/description": "Открывает Test1.cs в редакторе." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..54492121960a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Sınıfı", + "description": "Yeni bir MSTest test sınıfı oluşturur", + "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", + "symbols/Fixture/choices/None/displayName": "Hiçbiri", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup düzen yöntemi", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize düzen yöntemi", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup düzen yöntemi", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize düzen yöntemi", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi", + "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..e9cc3347cded --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 测试类", + "description": "创建新的 MSTest 测试类", + "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/choices/None/description": "无固定例程方法", + "symbols/Fixture/choices/None/displayName": "无", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固定例程方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固定例程方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固定例程方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固定例程方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法", + "postActions/openInEditor/description": "在编辑器中打开 Test1.cs。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..f8c2a63ba94a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "MSTest 測試類別", + "description": "建立新的 MSTest 測試類別", + "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/choices/None/description": "沒有固件方法", + "symbols/Fixture/choices/None/displayName": "無", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固件方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固件方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固件方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固件方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法", + "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs。" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json new file mode 100644 index 000000000000..296e97658631 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json @@ -0,0 +1,81 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": [ "Test", "MSTest" ], + "name": "MSTest Test Class", + "generatorVersions": "[1.0.0.0-*)", + "description": "Creates a new MSTest test class", + "groupIdentity": "Microsoft.Test.MSTest.TestClass", + "precedence": "10000", + "identity": "Microsoft.Test.MSTest.TestClass.FSharp.8.0", + "shortName": "mstest-class", + "tags": { + "language": "F#", + "type": "item" + }, + "sourceName": "Test1", + "preferDefaultName": true, + "defaultName": "Test1", + "primaryOutputs": [ + { "path": "Test1.fs" } + ], + "symbols": { + "DefaultNamespace": { + "type": "bind", + "binding": "msbuild:RootNamespace", + "replaces": "Company.TestProject1" + }, + "Fixture": { + "type": "parameter", + "datatype": "choice", + "description": "Select the fixture kinds to include in the project.", + "allowMultipleValues": true, + "enableQuotelessLiterals": true, + "defaultValue": "None", + "choices": [ + { + "choice": "None", + "description": "No fixture methods", + "displayName": "None" + }, + { + "choice": "AssemblyInitialize", + "description": "AssemblyInitialize fixture method" + }, + { + "choice": "AssemblyCleanup", + "description": "AssemblyCleanup fixture method" + }, + { + "choice": "ClassInitialize", + "description": "ClassInitialize fixture method" + }, + { + "choice": "ClassCleanup", + "description": "ClassCleanup fixture method" + }, + { + "choice": "TestInitialize", + "description": "TestInitialize fixture method" + }, + { + "choice": "TestCleanup", + "description": "TestCleanup fixture method" + } + ] + } + }, + "postActions": [ + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Test1.cs in the editor.", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "0" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/Test1.fs b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/Test1.fs new file mode 100644 index 000000000000..e890c668b48c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/Test1.fs @@ -0,0 +1,53 @@ +namespace Company.TestProject1 + +open System +open Microsoft.VisualStudio.TestTools.UnitTesting + +[] +type Test1 () = + +#if (Fixture == AssemblyInitialize) + [] + static member AssemblyInit (context: TestContext) = + // This method is called once for the test assembly, before any tests are run. + () + +#endif +#if (Fixture == AssemblyCleanup) + [] + static member AssemblyCleanup () = + // This method is called once for the test assembly, after all tests are run. + () + +#endif +#if (Fixture == ClassInitialize) + [] + member this.ClassInit (context: TestContext) = + // This method is called once for the test class, before any tests of the class are run. + () + +#endif +#if (Fixture == ClassCleanup) + [] + member this.ClassCleanup () = + // This method is called once for the test class, after all tests of the class are run. + () + +#endif +#if (Fixture == TestInitialize) + [] + member this.TestInit () = + // This method is called before each test method. + () + +#endif +#if (Fixture == TestCleanup) + [] + member this.TestCleanup () = + // This method is called after each test method. + () + +#endif + [] + member this.TestMethod1 () = + Assert.IsTrue(true); diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..cfd70169012f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/dotnetcli.host.json @@ -0,0 +1,12 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide.host.json new file mode 100644 index 000000000000..2f4381fa43a6 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide.host.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "vb", + "symbolInfo": [ + { + "id": "Fixture", + "isVisible": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..14998ba8c0230ce9432f58149ae3874979717331 GIT binary patch literal 48778 zcmeHQ3tWuZ`#oTKU*UxG#f6I!H%Ua};JIyRsYel(c*;QFq z3a#5(q1v_Xm#|_LYFBQFR7yq7|9NKSOlMv*-Ag{7-jCxsm*+gs_j%59&b;sG%sYf| z#FXI05fO2!OUNe3J3Fh(p%#Sv1$7dMrYs_4sy!iAR_gL(At5#&U~eo-RQ(sXB}67u zms`3J64r~#laSEngj`!ja=C}+~l+k(Ft+?o|zuLZ;a2;1#_YX`b6Gr{H?t_ z;&p09Y=YPCQaS@~E&ntKtGWLsL+XOCWXlK6`Uh!Wa$v<`cK^9}2K_m%&G36n0wZ;ZRVsKur5Q!ew!z@ze$N5cC(JH9XS#ky4& zqi43aOYtV6KaXsQN{>nyu-JRw_mLToN4hMUnf2z%zEO9Rd$w4ye52Q*JGD%^m~wkhfY&@cjc4@O zJu2*ItYF5|!->xQ($^+tNnGekgo<*w$$TYsK-cX66u*8{ehucdx%K3?K; zw-KiZUi@jBgg(Jf1a1vBWwhvcEV289HMc?6`APdHw*UK88{#@lIe4yD)7*YevkN9( zSUo#h{POC(L1!-flrJL2&AXACosSM8IUkbf32WjVUUoTqIDdH4(Nb|Or(<j$qU*zrn-Kkkm$L!nOzn{mG z+bzaycIcMXVF>-x_&ZmVQUykxR zGSOHTKFaIRS9Qt0*}ulF{-oXW+&w}EGP3!`8*~2du`lu%^bao(`@9%4`})O8H*?b3 zipZhUbN=l#-TF}^d6B!vMf97cTW;>&o0}cxb+?SUdj0x_t{+@j)1+J2xpP;8ei(D! z+-qCdvpK)}y7x3uo^5jThvBQvEo(n@9yze#(2|sZr30p zZ<86hDfFnF8NK}Gy|&p+m2n;Z^7KEDX4`quhizX4nf)b73cYSE>z@DO@3`|DTVHD3 zEn`LCq`SBBUW$FXzZeveAAMwlli2kA|Wd|SXDrRjTDFPoq0O=_bpHUn|8g~ zl?mLVg?+XU%vkXKNq>KzaWg;9ZxJma9#50Lz7#lY*{FyU{*ew>?pwrcXj))Detnx) z$*!*Z=6#<1Ug}~~@5Mo7U z%*y%omBa2sf|v>LweR6zjHLNr0S!m-GL~+pRC2=y3`6oK( zUFYW}C@V;lr#6>$p27VNKtoy%@^6m%z;Lxpm-95tQ-Fr?w71ug! z(zYe1j~{rL;hFe;a_isSqh@<;4j3$Kkdf&%|G$90-PimkAHJGQ{$?UcRc5Yw(9&sM z!J{=(5~G&H9hfk^bHZ8QFOv)APRo$h+54WtMcUwX;G(;8KF*!sJ1b{@!o}9z{D|A% z*}lt8&&)mE>&qSS7Y4L7AGF|uUl(7zc|X~3i-(-oS*k%=^I|1tcuq zr~lcOU1OCW-A%ncMVYGbS=`Ne=~u7p?U(KN`1Hcu*ud9Q)1+Ch5vRsT1tbNzgBvHv zO*`cNA~~A;@YSow{fNvx0b+5(`IFL3%~~8E)nMcL(M@gNpVuL8>g!kOSxK{hx9%T! zTXfy)%$g=~$vc$m%p!BfG~)&^2~Q+SreY@$Bb^mpu^eZ$_;AZr5)qwsPsb#rs!SEHiRvSl#Z}#NCt_ z&q+S}+3e-N{gb*E*69100apKfbuGgZdTdA~zc;qqbYbNf2V!+Q#MSqr^`WENa=-z9 zddYv&a(<}Ac?lWigG9fm8gqZaueper?UlzPdnReQNY>IhLbQF|+ z7$lTzu_uCiA$HRbHEq?`_DBbThwV z#*hCt`~0-xlt@8bhACS|ym)o(VnC-mhtD;BJl@vIf(vfrnPs_PUGBOWBab|5kok%D zn8H~^9I|goUzq;#jgzE@amn*UMX>=^0cN6bPCR?X}q zsbj2Y5vH8s&3)Cf6WN@9(mXdY;+Am3p0mUw+w07VI*FFq_Vyw5qni73exzw=!NB!F zJN`_j(BlZ_>Ti=v_0?1<}F)3>Noa^@Sk%%0rkCR((u<8LnedHvmax5 z!+EFRuVe+m}Y9cO!`G3Q(>ZcLEzn6s9qrgOPVp6`*11?ge1MA=?B z(Z&dL`h-Xw9Ulo!k2n585GUQUTfF>)W9Thma>~+(2b=Fro$O6APA_;A;(M{RyX9@A ztTi_yBY9=Y)iKg3qc;wiF7?Sc*WyxZX}x;&9<&tSngi0!v-4*Lb^XBhm}2LI`dHqP z=bP7X$Vn%U4s(fXvRnSVr|}ck$ZVY(an2Io6lLBMdHARD8S%%L2AkVCZG}-76O$Uf zd7^E=`ZnMc`8PwA?I&H{Jp9qF`p>$qhA~+ZTCiZe?XPy6hg<%I7^kGg=V0KK0vH!> z?%_c6hOJxv)}PJ4h!Hvari^KD$w@Njl!+`QPPu(m+Z}n`u9)RtKcnyjh1x;QMl z$6T(*fLbsX{zH|I9}nMMu;w43O-}(JwQM~9-0`I!Mk zu&c*Vd6O;fvhUZKk%`KtVbM-|#|8Xn=awvzW%Y|*H;;qJh!daO5NY23eSowmv|#Lp zc%h>;^gMCCZD_&28$e4(!H!Y+_Y=H(_MEpVMH~P&e?Lwj$+|Tr^=>|lhV$NLYtP$R zErCFOc{a7JIIq_iJD&=+TYy60;-pg*moX zeE?|N;Jh=f&$!F}&jA$J-~UJGS&s~rAF@B<6r8CBwyPHa>$OV_EXZQ-xOyk;0#2dZ zw!%c&=PJo1!FfNMA59f}Y>uuyni!N4v~5(R;!_L7y+)tejOPr443=Ux|I+i^?i z-TW4Gai}%2PiT0%;4HP8hxS?SvT%(S{|)oF0c!xrUyk>kBuA0E@9w$WUYxC#anivs zkXuKZqF;w97k^cMSEnDN9=LM9`FB%{!4;FXxGOeI768(^lk0cgyDy;|85fj)Dr{KzrO&zym3OdC zaEfV7Is{tp8XVNAU*5L-{Pqu8)((?SJ^QM8gR6cd;kRk+`{g;#8RK(5;=#tKhuab- ztWoUTJNiWA$Y`Gv3*vf25O`j7?pN@Bix%M>zrL|~cwY9iJMTFz7`(0fXO}Ks+&nyH z@`X(whX3Z3IDPaf`z;o-vu*qN46r}DB-g$#H&Nc<@Pf<-xvhtc>|plmJOa*~m9eXX zS^q4{Irjw%*4~icJH7hBu>HLB}j|c8Lu{;L0zK6f9fn zO}hFEhRXfwZO^j&EdLZdiMKlw))~E%SUyccYa2mZ~XIy-0k{suGY85KOi}ujD;2m8M9#H-Ba^T4qxM(%_NgrP0KfF z-cfMfPH45>=1b+sueq3(ipD#C%MxFoVglJ8mru@5*pw`C8*d{E95Oxs>%AuAXEG}w z1w^-K0@)!Awr8bn&s(*lpQ6#vBz}YIlQB=)5IbSO_UmB5$4@c4&T6mx<^elyil0E# zYS)eE8w&u2M0gZn^tp;KCfbiw+J!}*onjo?&P?|Cn!WN5w-65-ncu90Jj?IHj3E0z zmqP{n&&@Ipy|spY_Jrk$-CwSW9Z_fbVA$g!1Nwa0d!LKP(w2~i4J+aS z33stnmwHo6omX!jsq!u^E@aT4LF9`sz962So@Dy;>15%;h2+Q23EA#$Np?*VlfAQ? z$ic-u$?q!$k*I)CBoX@}$iagLNmNu6iH-Q4TtB*n z#Gl+vk}e%3r~W!c&Ye3)u3x`S5^lwl`!~;$C;#0f50dYbCr_S`=cx}#dfIc6ot;f` za&pudYyPkCK#d0~%>zoMlFD{0`l4)Pw`t8p#bq~N1y}>81aM@uRupU!Eh+r0v++iE8vMQRsm0Z zaSGlLUyOn`#22kVkN6@L=n-F(0=?pkP@q>lPXR^}To`-?#PbxW*qdO~8W68ffn`zR z-&9bv_%{_4Bfe093cN#c;?)Y!L^Xe-qS51QgL$CKFD#t3+S$ltc>Il_taCA}sw^}z z@&!7)s)Ek4uBu`9E#Ktluev(&Z5$oVO-w}C3n*OXVrEfMS*ycu@7N5v8fy7X%ygD@ zs7EyPGIn&dLw*Z2f5T>=q$vxC$8YWESO@t*DB@}8Xo3GR7W4Sub96KX%qAv)8vd^X z?4o9d`N5k_fgQMPsl8@R-?SH$Xs-qU-qysVwu-;Dsfnl4idADjg}b@6LO zV+Ot1)Diw`sNx4_nd|WDMu*y)D$y3mk5?TX{Cs}!CI|$B&D8v+7R?OvPI|?i{e9S0%iE8rIuJ$5JIUK%P{~;L#0TQ0EULjk%D4MiKV(sjMV+` zKmqpGQpl>xhGGOFS_&4Z%0N+{5-8}$=Tr$K86@p(Xr5E++Zed&t1U3l3e~Fi z`ZnhD-awa{+o%NC*cf<*6sQCk?9Op20jln1)_9l5zf=M=?bfFJR=6id1uFRhYkdOL z01XOI<1;KkV;?afK-1kI0@@u;wV{X1taVM$b~hlPu)AIXOn1Ek*zS4+=yca3K(~9L z0Bg9+G@fVUpN;~ygR%VXtN?x83lUgbv*F07u(5#v0O@SACPGzQh3ytbMiw?UMsQg% z42A6?BO?*E+ZY>Z+fk}YK2V{Nkx2)fV%=V(fTCd z!34KCmYCqaN{k8ar=*zRu0xIqZ-pQk!Tl45_fVLiUSHy%-U#ngtRP7sY41}s_a#uJ zzDLoN@%|)4vu}=j=0}zfRPC9c+qsBb4EI&-i{qX+?tiD=|5s=4J2y91C9dYb8V}TX z;N9|o>ORF%=OR`*pZBI#mO4AIMwa|Cfsd8K3l4i*GF#QP;DL$M(cY#A>Y#rLHJIW8 z1wD*K7I2A-ksB{_L2V0*+5&TR33`|aEi8m4YHqBwN5vvm|Bds~*UUSO5=9GKQDfh88r`&5!x!0U>uQ}yj zbIQHulzYu7_nK4gHK*KbPPx~da<4h%UUSO5=9Ih6DR&v}GC{(3EvPPdzd~6rIDKvf zDG`#gnx`3MwXvvvV6%TUx0{Yj8sL-^WlL$>K%VR!v7P!Ly0kVL;s?9mmAI$2Q(7VO z0PKGw?%^9SN;q*;Z4!J#N12qAMD3=u-19(R+`~6`s*T<37sr_?b^lKPV;4&2k%1M^L<}Y^Wa^Id%h3KI}b_|_vml<_MSFXm$^}%c~F|T zk31Twgp;G%wB?5%s>Rw+)_G8xxL+`TzSeH)1Ng>fwOJp_G7rH18Ib6@siG){KgY0) zwoXVYUtMCr!1#LnE)YvojzcVpV z(PPi};GKwpiXMB${%Risl{NN^52|$xRMyxt_E*~&sO+(4d{8Z8pt8rFvA^2IKvj)B z>2wjJqD`l*fTz;)EIy_R_I+L-uBot_E%aAz*{-=+WxlZ zJ++-u*ek7+7^v=J&)8q#G4QU8J>!E4je#9M@6a3j)n(pOyD2Tr-wW8!HbZ%Re>mgRzqBFY~#c%J4;v{S`a@@YZOZ zSmMW48Ow>#F9?#PqGF&Z9Oa3BJY!ds>+sf^OqOg?J{%cpS zR`%Fa`4w?Kl*)R8meu|jnJ;u?!Q1&UwAk5sfO*zN%p0;Few9MoR-Ns~Gn=eU@CGm~ZnTXZM=Zmy zWa#j-_M@Gc*x1K*J@Y25BynzthsBF|HkQkhXXU}Kgy`6hYaVMO`h(?X+xU6(gMsxw z$dGL%sb}?9be@e{#EwL!ZlpBU`E!DeX_lYG!`9>HA=?J|YH2@z zoGEVp{Q!*%w25yg^0IRX+o>GJ2j#NABr#GF9>5dJV0vTSX7Be{JK4`cwq9Qzd09Cc zeQ(`()CPS-VkHq$y>5BZ;$8hOqo8K27J0UR@^ZBhp7%#1U zU0i@qfz1r=7%WqJfF@ztvXH6(h?V$j5BPf!N)-TUAyom8E7gVqRRK^IQUm~MRgO_n zg-X2&2*A*x2t;jwk%n?wL->YOR9TIHAQH4tLv;{CH6lfgmiYE&XGk89=zAg*27g=x zn0Ob&6n=hTeDUwCs-j%(bqsLhdQcTu4e5yBxwOPZ!2Py9JNdS_l^C>!5wPpTO;vxd zp7%F~QpXV+H*e#6@wi`tdYRZQaUAjE=54*t0rfKYF<)#P0nb~F8~(mdY2yg+M^l^i z#SMO6h<>-WD!w~Ynm7X7I_r(TxWRL4?BDaN;`>h}jU&LXpuR_nwzK1jf16;jW4@}! zfW-xQ4}I$?)LTK)e%9i-2o^u)@%#|qhRPlT-ua9~eb{Lo;Mb0UzWB$pUwr(PIR<*- zU$5^O{MBjY*hQ6J#B0eXgj zJ!_$_o$?{Ye!R0r#qR4;8>wuTmd5{dPn>^V4sr3%zp(bP_%Y8rUsjsEb*=ySxQi>Z z=YRQUpb!(Dhh_c3;z!%iX10zw^HJg$V&xZym*38w-{qfS(&JMdtaNPHGrzPBFjWbD z_B)2`*-_S~Y+SSTXfKPMciyPd@w4kDdxi)xvbfkYb1Z%~{xSBM*uj{aLFZ?2l#QRV z=Gk+8h#fIgeC(Mw7C+Y0F+<<;@XLzBP20D*Qjn#_C<9Nzg-FPgDQxZa{>ev*NpCgmJkS1YS3cqNKR9r|EShiIE z9*veV?J?L6{gPNJFO;j&ql8~Y#&!*5@gOcEsK-N1l$t;p{=p$EHMK;lz|&xADn=TE zr@+)yiZlseXs8@1Du!QXR-KQ7Uu)K((4;;$R{>OWFidqU3-w?beid4Y2hl)3p3{;* zl0nj*)3Sm>5f_YMP$k3$KfZ$WK>)pyD$q@_Ncb42?S|gp&A)doOPP6A((wUnyS{g4 zmqnMpJ}8^h**v7NzCqz|ZGO4+~RmdAERe~Eoyz;=92l2CbNp~ZbJP}_k|S&9@3yly4I z1AJN^&@~w;)r&MEJ)<BRjQ1vmS|3zk|s-4}-z&!N_f3Je>(Lj4*34Ktc{;aGl zRXe*E!S07p{fGzmv#?CD6{Vl@P^!=VjOXcES#&=S@P^AAUM%HeAo}MSCd!RV(G!C#1Wl+8RJd~qLVn1IeTc#N4-V)kI zeL?r5szN`jgKsBoqm=P~k$s z1Prn48eLp}%^Ds{hXVRL<32H6!;9*VJeoaaXWCzb!M`Nqpz-?~d%1uC$1)MumW$!O zI-kS%S&Vg>bte&dS=}@b^=|lgxe&mZdjDUo49sJl=5KaxlwThO84>uNi6hGgYWrhe z^X`cv*A + Public Class Test1 +#If (Fixture == AssemblyInitialize) + + Public Shared Sub AssemblyInit(ByVal testContext As TestContext) + ' This method is called once for the test assembly, before any tests are run. + End Sub + +#End If +#If (Fixture == AssemblyCleanup) + + Public Shared Sub AssemblyCleanup() + ' This method is called once for the test assembly, after all tests are run. + End Sub + +#End If +#If (Fixture == ClassInitialize) + + Public Shared Sub ClassInit(ByVal testContext As TestContext) + ' This method is called once for the test class, before any tests of the class are run. + End Sub + +#End If +#If (Fixture == ClassCleanup) + + Public Shared Sub ClassCleanup() + ' This method is called once for the test class, after all tests of the class are run. + End Sub + +#End If +#If (Fixture == TestInitialize) + + Public Sub TestInit() + ' This method is called before each test method. + End Sub + +#End If +#If (Fixture == TestCleanup) + + Public Sub TestCleanup() + ' This method is called after each test method. + End Sub + +#End If + + Sub TestSub() + + End Sub + End Class +End Namespace + diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide.host.json new file mode 100644 index 000000000000..89fbbf631a65 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide.host.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "cs" +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6fc7823ecf27fadbc4f503e0dd12bcba09030bc9 GIT binary patch literal 47523 zcmeGl30zFu`^+@cGNnS>vrV3@@Ra3AqM4T^@1=!EmJ}YcR7etP#*)w@vV>?s3sRPN zQkwZAAu8gfqSAXUN}Kj|{^#78J8omjAmsht{dM}z@||zLckVs&-7^4?fE+*v3CIF( zB>;}Vx~?w29j*vKe`NqPH3e;10Pgn#KpFNSe0wSYYlooOsI3W#;rxu@05F;Sww4h9 zw5(**Vu01U1Iu-n4SxErk(4U+Bl>$J%;5jBjXGz1IQ zg)c)b=b6SvATqhnYuKPH|Hbqd0518+H!p%R0l78P<~jqQcpDW`qEq1jxuC>%PH&hjLw+J{m#5{7O*Ch7`&8p0; zvLMKg0xWdNKud!JRQ>>fHWdKs--aN_;)Xe!`mSpLU~lUVnE%6Plu21H&53t^Hs9&y z(teBf-@kvqI5l|Ev&^fj9yv8{ENpQ-XSqDPsHNtG%<}VkI(>XbyHw8l+2wJ_Gxc<* z;=WGvSW{eTmZl$NJy1y&=4XAnEo(}NJ<|ka*|TNYmFwR+y}15(!a9>7 zP0nEf7h2bE3T`ZFHZJ&c!(XNmvC8ChtND747p^VzxH)@Gz8Y9S4muDMqpvfBm*m8m z^|GouIXfkZ<#s>gzD{G^%%DC;bDTW3PoaR7X}hDqn%7T{>78%#d6{LP|Ex8>A%69* z-AL@rveyosjcZ^Z*l9Q;|wDTn3{QMiI@J$^1`SIZ>o>8(i%;l{p@Fx z)fDsUTyGvLBIooEBS==Sdf4p_s7beBja@I5yj{o8uHV(u1`Uqa-`-tWa@XOiW686d z)bco9U3RxA=eK*Aum>$5+nqUf><8zk`$BnJ|1K?$PutBZthRY(>6~Jf^Rl)jv#z?N zJT|{L>s(^l##7@r6_#%vM%vyTXcXTli5zWQ+FX!g9vxqnej;5i0$g-cTwHwW?8@?o zhTH69$v|pFtL?h`g9>IiFK0~1YMe?x89u(jdK?WI%Ti!_w%2B-!t7?$jf`<^MjMj)b6XzTCbJo^X{k9#~K&W zNNmHgLpX7@KIsoI(=njgORK4Li#;q97 z~OGa=5v#Uo}X?bkv2Xu|n(ra?^duVEr!La70X4bUonZ;TQGoR2n+mBzTB1Xg*R(uf8!b(Dc0FcnJsEK2 z-IFv|NOVO1o^oO7DsHeg7r#ss->lV6*YM_hIrWzj7nqx3E1={b${QU5b8 zWV|`q{P+5XW&Y1A2WrMWp*=UKlB&Ab?WVhRl3k7Y$%FJ3S@6g2EOYM9Gu+?kS^Wrd zPX@?ee>HSrR{8P4t>N^Ri4<`6vJL67>oR(O<^E)FvOgtn5(rXLAI4N6-*}l`(2sN- zw#UxtA2i>S9{aakyv7(Z1@zK)Z;aNzeA-8um;Z=!PBD8+_(9Foyo)zSY8#``b^q*2 z>wU6%RPZ*YH#0@)diwLo5up>UE=VhmI|c z;-$sjm_2ssrrm1_lTR)z_mXv3y!ck1kiEbIB{y z8yqUnq*UIqoeVUhIjr#ws^rGqZrvjcUpr5zRPPR^(n`xqUb>oIuTKfmO#ShCQ(5fh zl_*Rc9{^rw1+y>**dd)2#LvS+;y=SlIj&-f3f>T8}Mha%<}=UKKkBw!}4(D(qoIu*awhD?MQk3r<%N zR=R^|ma8>sh4zoYo>z8}{KVHC@_M<1dS*ZqlqNQjHqH1i60^zcHf`D@VdWa?Nu=$v z6;_VGp2Y2{%6|@*V%Pe}4AXSXa38s=N2~)Vx?|ol-y^=|q*IOAj+w9Jr}SerudTYb z_XKD9z*wrqx+a~t+Le!oa4wRM-yaHoEFo2st$WsIolMY6QXC`6Rg&5Fqxh)v3}qgI=Y zK%F_#!|X!-AtOo-7s*z?4aGXCR$SjRSf`C0b@;D?vCctO+#$Z0%&xmtD|QdW#@+3x z1A8Em%B6;BZbf3U0)Mk5J(fYTH_d9K?HZ5qmLC+w4##-MTD+z0LO##rn1n>K?fIRv zifOwrDH%I@%wZnFMDKs-I{B15(nslRw5qZVrsTAc3+!-=^%9FGv|X6I4Cz4^*!KL+ znGa~YFnJk+Ln7E({LWdoXuB}OGNulSVCQ1gM<%&bDN2aC&)l+Mn)VoV+Pa0LUoeR* z_gB$m)sSX^z6<6sFJc}z^v@0QHq0$yT8XO41CbVtDf*G@Wd58ZS+t@FSm)B13v4s2 z(|Layt!NC^DWiXZos3E3?3+X@8jf`iiHTsF@jDOQrWNsN8tX@Za!gEp6L;!HOw5$I z#lyI(z?mnl;~Q46q7T2NRrCVd(VT}5A08dxYR_ADCXO6OW&T#m^Gq6{=kp@CCCRs# zR-p#YM)UUdHF$WyAe!Yi(}uJVV`g$Fk5++s&i0hb9Cj6^pKr)D@(Ij!e#5V-=3-LQ zS6l#Lm?+a$QO9BKNc5d$#lC_$d-$(QspGJqFy^ROu@7RM)h3Im))<*3*PqW}yCBmt zc6z&0t*Iz1mc$*M!=80vvA!!MJl6jG;E*6XQR?h{b0sKzed#bv8d%TppO5Q1r z6gh1WY{lhbGOgFSL(|Z}WGeHtCJhLr{PFUJO9?VMTyJPGLVE|`A zU_>;-==g~f5zCe>dwAMWL4ob*>G^ZP#gQkQX2UJ1M5_o zO#{yCFV$IPc4FKjMKAw=07v)bL79hlQl+!5EcZzR_D@It)zvwW!u_9%=sr zXA<)_qlHa6=TyNh8hEigxFuu*xJU-Bi|tuw`=Y)#2~S#|XaQ>y`=)iKZ7(YOBJ{`N zm8=zgKm-W7c@*}^puU2|t5_>kQD4mSOxt-FUgP4`tQCDxU%W<^?K}*xapXqIh+6k8Q2s5>`#y8zi?ph$glllMVjM+Gg5omgvoAW@E-No~y= z4n^Vms$|-pz*ww@6=?u93TsJNfhGoG(yEDMaHM`UYi&HZvy2Lg_W6N| zW7bUVEq`)0$^rN^TUn)s=`bSGHVz|p-K`rGEOo)0Qk{iTOluM|E=~s04v$KzRWC=9 zYMPy-zz&V5l3G7AGQ!w0ULNVPU{|eQGS;zRJVrxjR+C8>HbrfA4P#B{{G2?E^I`A- z8vHuNY;vTL-8L;)hpPd=4i@ytj~)CK1Ad+VWRBI1jEsP(sVT6wwg!%lj$qTKO<>HP zae#SXGMIkU0$2wu082yc!P*FC;C_V#c5L4ccJAB>jvqS)PMkOacE@;wsK_V)0~Ex^ z$AiOMKM@PjQ-T3@Xbjz}t#SP+e68OEsvitp)Y<^?aHC`~RN>{4}>Ky}EQ~m%p9PX(lU;vf)GFd1Z*-qa%EQ1`wZ$&?peUV+MSUp*+1XvOj!)0j@A)K#_z2Zcqss;N$_2 zi~&v_03n0k9cb{5{5uAU9hm4Hc>;sJ?J^*eZ_7YaY^V~+i!cxut8K}Dm_b|eA7mg( z9%Fz7Co<9d8iQL7){0g!6@_UB8C|5sO4RaM6u z7;Ga?n-Ou1ci33;i$iJC2LSeDL4OA;5DEBoC=PQ`TLu6w5lR8TMr|CzXDO_WL)gz1 zjAIba&qZw<66j-m2>da57yvXQd>pa>Xhm%t@&JH;*gphGsLg%{rBIs-#S=go1al#K z0aQW|GR7g&gNGR75LU4^5prPz9*8bFJ_{l~Tu1~$6mXibFkulsr^2t3g-1KjslWgJ zJNArMbDz>*%Li;qGwIwb7s}sDo|5X0~#6{gzWyS{AYpx zEYP(qAb3tyhhLP5J=FQ)iXFo`v2k^^Zp6>0clB;+7y&i4b{^NH)YKq>cBhj_7y)d$ zf{N(9F=B%e5R9wHy zPH%_6yXj&H5T=VIK%6dyK%41e2(+F4j(`e06a=0j20QKrG!DZ-bUKlMxasdCfYZtH z-C^_*siV4@8gx4%PwBxASP=x_c=sMMR4P>v)bEh+aWyp=s*IwHU>s+Intb|dYE)@# zkgA4=2ne(p$0kD_h>LI>4@xCCACpjIK0Z!UlZE_c)!Lg+?%qQdqbxEXlj;3`LjLa$ zp&oSqB!dbU-Zh}YhPMmEg7@bN@X+lID)6?3jtab=VxR)=qgbe*TOe3i@VPUqHP_b2FHB;a-swl0p=!O{A6 z{_A|(Kevr7gz*gCase6 zyAEmi;0U@27aYmmkbT~9kV6+JID;aq2oG79pTIxl$qI^!3S@af6DZ426&0y6d~DRI zL{d~F;n?rDmH6XA1SP&i@7e;D5h*tDnkZ1#ctxWm1S) zcnYz}9}AcEO{`3Ntr{9MxSQp+5%aunog$45-H~_e*besn>9Q;D4c9!vj8l6MdY1C@ zo-rJ5$-v(pq?;aANtMA7=!5G`{w9E=)c)T9e^t>(OwpX5z9|n&u=5*gujC z?!nyQ-(l|XsHp(_0277(xTFN`9jcYnCGnduZ}_e(&|E^qb_YpsGOmPeta_yP=!eE* zM~`a3Z~6CBR<5n`Ul!Mrot3cLGRn1eQ$b5wLT~xR)2rjwExA;==e)O$)AJ|#*_U5s z=IvbNIEHujrc-lSNkKS=(_A#$`DtJ&qujTaqzsaj!RZy1PT6r8Ct^YpTAOz>R9O?< zBI+w%c%k&+C>xG4Sx+@f&q>EIWBsbaxX7nuwh5Ru%D^D&ULGs|f}gicz{|%CZu#Xp z2J@Rw@kUS|#5de5&@1{8SR7Z2Cv!u3hGlE@Gkj~eeC@dw|7B^dFx$!^bCS};-}k-P z`1bkM#pwr5hD4S=Rv?3r>87Uoy<2|vUG+5ms$uhwK-agdHiyM)DR{W=ZgU31Bkb^6 z`e~SNyJFe0yY~k$erohmpX%YKS8wN)$WE%zxS0Oxw$}wI%|i)JO-GaU{Cwox6m}h0 zU+NTFf3=7;kvHxUU6TwZnVOsXpKh$}>(aE#DQV|V347CDJZ*?6ZOpVgS@V-vrS{yuh zupqqO-sY9O8_^ZzEt#&~ljM9d9$irEYXW@aDjh>2gId37V;w zv*n8Zxk4pYlY422$KI-WTpI9yxw&`LbL%$&FD5A~FhP*cUfvuVm&5w!%c^C0foa2vKY6IF+5@x{m9y2$>i-!G z_2Ip|#Q1$nAC0*e=Qg`Al6c-uhK~DE)yQDtYBf$DUfo*fSpklwXP`V_F~xks^i zPp0aPq^QIV_H+`v-&j}P)ymM~dREf1*!1*{0BtCgkhzdHGf8? zl?RSB&R;=h!(8x9C}G&LauTCaS*dvuoxQ}gd_a9wl`+h2`76T4Vc)s5ERS>3NjDn8 z+*^ZlZ!_;5f0XBU&JVn3uJQ)#Ia_w-=#as}3$~j*^|vYUPl)8A0o+|EUAXv7e){>? zTqP2SDvlp1>v&O#d+B){>A9hFL}MSDSio{ijCwe?ej^>|PJUL{SiVLs7bboVN)Bv# z-sjnsrMIsZg!ggilUESTfce44uU~H5%RN`l&lWy+<%&;~T%8wSTh7)YP4*)-j-^NY zz*eJGz<7E^hU+2qZH>?^UXGMV>lr+`%5Fa!{vD;w%o(_2!=P9tu2p!>u++OvFj0iT z9p-d%!5jamx|8hKu-f(UvMP_3&_SVi7wR+=JpTF>V$&%L1!uQicYFRZ!%vxR?W z2EXOL>RX^-0~2P0VGem#%E3fM6(zb`YVm7!FI#!rC~eE|S?=>^D9VB{M&3EKNru_u zYBpUextE-`b-C;M!P`a|NY~t?%&Yc^ubx)eBsaJI_S&9n*e{&O8!}!f%#vF5W3fOt)_`2J?WZE zr{S=1MqYiy(bJpO>*QW5al4i?c5nS{kLo&QpmD$UKoE*pS;{WJTqV1;LK$c!B&cZ8 zNDg&ZGX?-xS#YReC?$G!{n^;SSKhx!K@0lA7c7nsFxcc-?^M?8aEX^3W3`Q&aQBQ# zcM$$h?*F!%>5YFq66Ol`+**d^3eWd)xxcn3pm1ZK3>lawY&XP?#b|0U_jb*3|MRH7 z|FFA>iI1FKJ_!xzxy(7`Se?1+*v3CDS3cM)Z<+Ayq-&4jtG{Rd6u##E+`1V#x-hwy z!er4vOOwOP8&{vl{+YeJ)pEwNt)BZ#z|&L88}oJ#dHBQPDIn+?TrkWldVIP-VdRg% zZYi&|We4+)ESt2tj#Icpd6zm#mzzkB&8YU3H_|ktFzJC?-rm0jxD<=SM(p0(*Y*dE zK`kX|dw-coYbiSI^Uz6o6xr?v|JrokYa55ddyn<&UiSRb>BlX~hOepG=jWueX3xWt zgEM)a>I;J!6k7D{d!+vL>QL)+s|)jHN7%$#k@nviJf57}<63DH;LdCuoe|@_yfSlD z)Ulj9#(SeYIgT%HEPizS=V5p6-u2D+#RM$aR_k>4*y!bZ68mkAsC0M|`P1N4 z9d@lERu*ipbqY}97%>^aW|WuL(ofmiH>=7g{yL(01ev=lxW&J*+D3ImtDctZnC>s2 zolkD2#5WgP`N7w0W7aLb?AB$4OU_Qv+;+YUDq74{%SZB>~UPd;HUbfjEqPrvfckOt}I{W!}C(?TiiUx zR6dWpRVty7QAe%n&ALICbMz%IN((hjc=&Mo5ak7rx24-VnO*T~8N?i(-a1dV|8S4T z1D}j}Iqs=DIo&{>(e&m@a%{hcD{3z*v8^Lp!a_qI9%I?IJaB=D#v0VEB`F#g)0}6Z z^uhG>yDF*qjXk`z?fC6PmHj(c!yLXp6IGNs!U{_1b@kHLbesz_`N|b7nJ+HG)W)2N zq3n%Iv1H@vq{;^{2a#8xOTD9wvUdG%t0;%9hPiD{{VbVVQ1ULv4I-h0U0y9j8srU; zvLKS*KajQ)-I6)M7v^np+#%95lmyE-)`b;M+GAWbq@w8Q+m6TG)s<@eKbnkGy#XqmZ0>>_QEE;xuX3M#Y{|siI z$l^V(oO5Mi^DPw%)0w3GO;IB816yB8Bme`}@2PRlfEN|v?QvN`gD9tEk zX@|1c`O2b%$Z{`jyJ&toZ_^^0#!rnJ*lxsk2?%?jk>r zH_48sF+3AP9eR}9=*>^*rG>IvPeJ(uYooSn2hHIp^1A3!tM>@fjV-w|A7crfS#~t* zq36(imike$+7y`34YP>JmfTbPOkSJCwCh^Ov2nknyC-KP}oa(vo=*%lveB;6jtdl00*~ z`h>AHu}SXt*3xA8a)!MKW#?jvrS1G*&7&Cm{r`-jQZSR! zeHVnXHL*#P4#7Z}j1o^-yVe~g!z@9VF6uSBMw`1C>%2EJkQ|5QkS1#8Ys0KwgsCty z04DGv%*27uw7K)K&gnBxlH)Lq6SWewxh7cWA2Uyo=LvF`S6VVlFqKA{IMD2W#&U|O z+NPun82K>G5bdC=n4pKwjG{&hGMZY8BJA2ipm_%4I zmyncAn#|!18NzA4GoCsIOEnHWtr5naiZOOp`CBEIpDVrmk|~LwK<%uSr6R~WUTaF? z=TCP}SINaPrRm;_kC9Jc_E|DxxFw!zyk`+@4MyB&;mGMEeg?6|@M>)?mUvFz?rDgp z9Y^mE1L#a%!TLk(t%`*KmMom_IiC8IpMmTaY(~0@2{*%LmnHK8hB`|>73CHnu!d^c;h*SdI%f$G6&-&+#6Np%NGqcZZz0spB|M2ngzp^Z5AjXwHUjGJzUWn|2SZv;MnZhdK8 z{)1q7w_JFQw&Z&2#M`43ZtzWPn$@v)Bo>l+P`Ie>j0G=HP zX%5O$-v2ZVWYP^AR(1#4|D#9~6Jj+qqXy8jAFjQ&;Czq~uRIIYw+ew+?vl4TkTkAeo^aqD7(@5cU1sxpTiO-I1@5%wqKaU<~{le2>TKr^LX& z!S}fS9~%SzCg0;W_?Q^@H~AjdU(y)(7~jJ;A$jmEGGT#lm+|1+ZC&;nDM<``jPGA$ zy%6e-+X23**JbsWBnCcL|E?SZ66)XPeiy|Ieh!I3(fIG`F(66&qnqG=V+=^*d;9_5 zbFP71H3lU0J;4SXXb0iFBeI`p{NrtL*TJrI9rzgE6ZHSrTn9eZ_XHb!_c8D(z9;Da z-N(SE`kr8e?=}WL$M*#NzuOr2T;CIH@ZH5gXZW6=|92Myo#lIi4ZfQg=uF=e^#5*R zptF5XutArPfiK~Eg8p4T2ELT<2{!1mG4LgQPtd>1#=w{MJ;4TDE(X4a?+N;Mxfu9b zz9-nA%f!If^gTiUE)xS^+xG+;eDfIi7QQFw|IK6ITlt<~gU^Zqe7&?I2zQhayY~1k zeNWK;vtytm-O(7_1yZd3-`e*C8+@@C=*qq)=>NrHpsV|yV1rJNf$zch1pPZb2EG^H z6Ko)H3{<^+``&lw#Ot7_?@?X>+zFQlcfI8izn3D^Q(&D9i!LtD*M^X{#4!MO-R)3+ zxRbB&nh$sW<-y&Q+S6NHKk@_fYwM5rLB5E$P$v94LQyD*{>bM~pFS1RBGQ$h&iO|A zqZky*EUGu&{*eBUQ&K-icf|j@*8gqgTcHh+J>d=>Jh<~15AKxBgS&nR3u?pNvfJPi z?Jq&SQ|$!#b&CIMs%wNg!5zHc)0=1mRF^={_HeqK{zTs+zl-`D=?iyz!3u7N&(I&Y zOQ+bOGyD&CW5;FU!5!a)v5s^_=K$QjT{w>Fa0hr{`!nqDN&1WGE6N|g-igAFu75-t zaMwYh{>bOVv5xAZaUt3kGq+3V4|n8mqa!Xif^e7rHe+IR5RT*Xa2(M#-cNvCLw}L$ zJ}x(ca3?3BegwJO^bzqps*9QbpZ=e4!vyUp(dV7$`QKg}?jYK(Kfj0gZ%;2t`_a8V zF*eb?4IannT1Xu0sE*IUaYWmAKLK`1{7b55dw6iS*)}>NpX0J4i0pyx2?%nxxh@iM zJE{}s3+i1$e`FW9du|*3(C410F8KWqes6^9BZ}8v8^}_pCp*6F%IjRR9@iqk4GYkY2%W<4`G=-^QT~ zm*2)A+Bp^-I7GY1q63FgT&xLjD3i-?;}GpCiw+#3-DS~%L$u2*I&g?~n?(l>(XO-T z5I_$_h9@@DdvKK%)kB13>Lk5qB34lWukB13>LmoWP ze1-r*I+y^W5dL@oUoad(f!S!{`@akzFaTeUP8*jJ(33(t@1n(XJ6Q02BG`jqLxKaw zJ*NxCzC`CXl-sTg%8p;Fm>)7fls%^l%ip07h_*-Hadd_EN5$k7wCe++?a{Mad(Smr zyI&+XK&%g-?848ku3~%KP9O3ClwBDXw2uLHo}gz2d~R2P9r=K0d-S{~Dl`0r&^F%> zqP8f`mu|P`14(R;-h(E7p9_B_=Bvw(>?6(xqVmIEVSP_FM+e6?@*`cog%8BZk3J8G z@q?Zf#l-^p4*6U9puPAJ$gc@?z(3=7PEJnm>F}+6(4Os){OEx42jV((H6L_jd%pCT z{9V=uAF@3`hY$Jy{u=UEJr5+YJwg5t`T*qt5zpfY1=mV6`L)76*eI9&_ z?FsUKv=6@2`|TfVdx8!h?SszVtK?H`Pmuqc``}Y;Ptf6;`QUSGPmsTj4-ie!`wG!( zQD>b8pKE)94niLwnxgWfw&=C!bI*g$usuP3UHqN`!LQ+i&ayp02M(^om-azt+MXak z6PN!>`=GOJPtf6u``}C1o*@56`+#_VAzBxgOZ}y6Ptf6`eIP0~YK!JVqidKL+iT){ zI}5_t?-U+!ihAle>1W1}LHL!SeAtP${0#`$(8l*9+( z;vV&(_25s)f9FA-@0Cy0NnjfxJ#qIG;^arUe4@D=;^dOF?^ESR^N2hol^^~}qEKhz z{Lig_iXKFslE_cYp+z~eD32D;mBDi%J|>@($p1^rFPZ}?F6RT+fhZTTk60(-pt_{; zi_XK_AF@Asw+F{1=5HZAVxGog`CBNL6Xi1FcnA_@Cf12KsQ#tpN4d#3Ph$R^Xx~qI|EImr0HSO}nTd5G&Zo*RO5;=7=(7O+GPAIt z_NUPKl=%M?KAk;BQn_)w&gTEQ^l-WOX;AQ&Wl;zEg;@d2MG*e#EDpJ-4S$K2O@t)W zfCmAx1#JwXU#~@N91`f|qJ9EDj4vJjvMuVzAp-z@T9yE^_`fs`aL9vsQwU!GNeHr0 zRu~^jA;^X71yBaTT$B~YhZr7W4CTY}!w_sQFALH^2S3m3Ga=%`g~T94d0LvVFkunq zX(_`-2M6?h;OF{Zg86~sM1b=&C7An3*8(wgHAQ8BIGFD3twoCa4FA|Z{PPC!BJziA zq3-CK{;_l=#TQu*658Nv=#I-MYJ>K4N8kOmx2}cL`V=T?gAegXG7#5CK7}W7jwpW= z2jc8c%oJO?BvZqv@PK}Wh1 zWO(ly)LC)Rk?sWkUnCAB(VZYer`tdh-3k0V)dnAD=BL8X7}%aER0FZ2sbO#(hDAAH$!h zx41g~9w?%Z^ha@k)5jsMHxBWBN%R-Tlh}9QzyXXOTKhxvasT6Mfv8WkbS8gv-sAC) z%YgI4`Jgtc;}GwcM1LIjOTcf*AMwtG%NAU?Vt@)8E)}2x1P9*c3dVCGE-G+o1HEsj z1eY}EsKB)p^nM)!zS@S~t7E}s5C&G*aLI(tUt2-1y@@F#v`&GRB{X5d*D073*bq6& z%gfum%kdGufK$tr;rEnm;`dB=e0&I^IcP5AS590b{?I&pTyQ-?@1T6vd?>>j^nDmk zS5k=Ppt;DLP=*xI^P?j=g7Y^8cSUt|wJy50h<-;Zjt0U(xM&VOUm$~zBz_RA`}z>) zqB`xA=B9rd9x9IriCS67GKTOr%w_Y$ZM=km~4d-I6>2v^*EB2IgCG`GF^ wsK32=ct1W@obM%_kMPIn8(yhU;llM!RC3`ua0OcXg{7YUu8!LO2WW8YC;$Ke literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..c5ee95d983c9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Testovací položka NUnit 3", + "description": "Vytvoří novou testovací třídu NUnit.", + "postActions/openInEditor/description": "Otevře vytvořenou třídu testovacího přípravku v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..744753e2f568 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.de.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3-Testelement", + "description": "Erstellt eine neue NUnit-Testklasse", + "postActions/openInEditor/description": "Öffnet die erstellte Testfixture-Klasse im Editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..94aac9c09194 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.en.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Item", + "description": "Creates a new NUnit test class", + "postActions/openInEditor/description": "Opens created test fixture class in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..5fad26e60da0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.es.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Elemento de prueba de NUnit 3", + "description": "Crea una nueva clase de prueba NUnit", + "postActions/openInEditor/description": "Abrir la clase de accesorio de prueba creada en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..b6c999c4cc5b --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov alias halex2005 (codeofclimber.ru)", + "name": "Élément de test NUnit 3", + "description": "Crée une classe de test NUnit.", + "postActions/openInEditor/description": "Ouvre la classe de fixture de test créée dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..938c218e8331 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.it.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Elemento di test NUnit 3", + "description": "Crea una nuova classe di test NUnit", + "postActions/openInEditor/description": "Apre la classe di fixture di test creata nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..3c9a7c6b243c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 テスト項目", + "description": "新しい NUnit テスト クラスを作成します", + "postActions/openInEditor/description": "作成されたテスト フィクスチャ クラスをエディターで開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..4fa392e66d26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 테스트 항목", + "description": "새 NUnit 테스트 클래스를 만듭니다.", + "postActions/openInEditor/description": "편집기에서 만든 테스트 픽스쳐 클래스 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..3afcfe4c5d4d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 — element testowy", + "description": "Tworzy nową klasę testu NUnit", + "postActions/openInEditor/description": "Otwiera utworzoną klasę warunków początkowych w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..0ae34a3a82a8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov, também conhecido como halex2005 (codeofclimber.ru)", + "name": "Item de Teste NUnit 3", + "description": "Cria uma nova classe de teste NUnit", + "postActions/openInEditor/description": "Abre a classe de acessório de teste criada no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..77a8c283caf6 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,6 @@ +{ + "author": "Алексей Харлов aka halex2005 (codeofclimber.ru)", + "name": "Тестовый элемент NUnit 3", + "description": "Создает тестовый класс NUnit", + "postActions/openInEditor/description": "Открывает созданный класс тестового приспособления в редакторе." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..92f13df6879e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov, halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Öğesi", + "description": "Yeni bir NUnit test sınıfı oluşturur", + "postActions/openInEditor/description": "Oluşturulan test düzeni sınıfını düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..1d2b7791893f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 测试项", + "description": "创建新的 NUnit 测试类", + "postActions/openInEditor/description": "在编辑器中打开创建的测试固定例程类" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..588770b41936 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 測試項目", + "description": "建立新的 NUnit 測試類別", + "postActions/openInEditor/description": "在編輯器中開啟建立的測試固件類別" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json new file mode 100644 index 000000000000..773bca9627c8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json @@ -0,0 +1,91 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "classifications": [ "Test", "NUnit" ], + "name": "NUnit 3 Test Item", + "defaultName": "NUnitTestItem", + "generatorVersions": "[1.0.0.0-*)", + "description": "Creates a new NUnit test class", + "groupIdentity": "NUnit3.DotNetNew.ItemTemplate", + "precedence": "11000", + "identity": "NUnit3.DotNetNew.ItemTemplate.CSharp.9.0", + "shortName": "nunit-test", + "tags": { + "language": "C#", + "type": "item" + }, + "sourceName": "UnitTest1", + "preferNameDirectory": true, + "primaryOutputs": [ + { "path": "UnitTest1.cs" } + ], + "symbols": { + "DefaultNamespace": { + "type": "bind", + "binding": "msbuild:RootNamespace", + "replaces": "Tests" + }, + "ImplicitUsings": { + "type": "bind", + "binding": "msbuild:ImplicitUsings", + "datatype": "string", + "defaultValue": "disable" + }, + "evaluatedLangVersion": { + "type": "bind", + "binding": "msbuild:LangVersion", + "dataType": "string" + }, + "latestLangVersion": { + "type": "generated", + "generator": "constant", + "parameters": { + "value": "latest" + } + }, + "langVersion": { + "type": "generated", + "generator": "coalesce", + "parameters": { + "sourceVariableName": "evaluatedLangVersion", + "fallbackVariableName": "latestLangVersion" + } + }, + "csharp9orOlder": { + "type": "generated", + "generator": "regexMatch", + "datatype": "bool", + "parameters": { + "pattern": "^(ISO-1|ISO-2|[1-7]|[8-9]|[8-9]\\.0|7\\.[0-3])$", + "source": "langVersion" + } + }, + "csharp10orLater": { + "type": "computed", + "value": "!csharp9orOlder" + }, + "csharpFeature_FileScopedNamespaces": { + "type": "computed", + "value": "csharp10orLater == \"true\"" + } + }, + "constraints": { + "csharp-only": { + "type": "project-capability", + "args": "CSharp" + } + }, + "postActions": [ + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens created test fixture class in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "0" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/UnitTest1.cs new file mode 100644 index 000000000000..a793ddf49a6a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/UnitTest1.cs @@ -0,0 +1,38 @@ +#if (ImplicitUsings != "enable") +using NUnit.Framework; + +#endif +#if (csharpFeature_FileScopedNamespaces) +namespace Tests; + +public class UnitTest1 +{ + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } +} +#else +namespace Tests +{ + public class UnitTest1 + { + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } + } +} +#endif diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide.host.json new file mode 100644 index 000000000000..8c0f3cd51715 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide.host.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "fs" +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..671271e7595d5a5b30325db0bdaad7d5469e58dd GIT binary patch literal 55748 zcmeHw2S8NE^Zy=Qu|Vt<)Wqo5N{m>7aEiv>1vM%VH8EDi#IA4}6{1GaXzYq6b`iT+ z!4@@9QITLl54(T`3q{)g=kt!eJkFzon*T2Yd++UgTV}S*&d$#6V@$zHGHYuKx*D;^ z28{j97_+d@`0FSbJ7&mO^>9eS+mWbFgElD#_H73y#KB;VS@Nxmeu%!Oc?w9qR8KxeMh(r45#!ce`|7-E#W~A2~m;sZdkV#_&Ow`0QHO+XSdCw<$O*EBYQc_Y91yOl< zYy2t-=f!#Aq(sSY=1u8R93N9nlJtrv(a)re1mNfNev)cZ98!cA?j!}_X=p|Xv@~*L^}_mdjW;k z&NFCFMEQDg?u}aW^5IF7=sIztZ_=di9Xli?`6fWm27CY)ZZ1Y+A#SY+9pH%+qExYtyC;YuBzF>(r?e>(;Fs>)Ep>>(i$X>)*dW z8#HJT`}*sz*|*<*%Z3jh&c=)x!^Vvp$A0+X2R3=~WHx>JbT+%y1m>-r#C%#$W^>z3 zWj}ZHWDB~e*rHyu+2THP*s=lh*s39ZY|YR`%>TQ^?6*-%*#`IJY|Df-Y{rZkZ0_8- zY{7yB?3Z7DVZZ+RD_gyKHQPC3Bil1)E8F9?A+!P?0mp!7IG|vT{&=`9Y21Y z{qe^i?Cc+B*`I&@$u3;Dz^)w+W7kh!Ww-yl!PMt(vdfn*v+(e6roI%(Zrr%RA|oT& zy|5_u@Y+50_{IYk9r=*mxpRj-eE5((y&KD(KX}Tbqodi=r%&07=s5QJ=}Y$F#S513 z;x&tpk7r5oNi6wIGD}TPVQDF;EImD)m2JdW%^p-=V;O7Z$5@x0jP(y?Y*-v4zGcbg zavQda_hdV`2Mgf~*%iKv-RGAjevDeIP4SgI82f50jU9e8KJ8>|3&lSX$Jk|xe~seb zrug?Lel*2@PVp0D@f+1jZHmjQvAjg-=5-krTCOq+;ECN*^=?OHjJW)K@t$)S_gKaF!rhGTI?MQFwJg3h#kZyS zT`2xwia&|sFQE9pQ~W&?{}{zTL-8rkg^?8h0mYBg#;?yBvCfpja7w|OQrJK#oT3!& zPzrIDoV~Q+>~&Ah59EcWt0@y#ecN}wFYuR`%_Q2g2yzdpscx8$s!4QC!bIh*f6 zX)WX|co%0kE^FeuX~A6rtrs_VlJP)xqY0S1U!*}!B$i_&gdgN++cZn)k~s+q?_8&t zan|sOOQr}EzNtypp^eRy64BZ?6u!ABg*P$B@7wV4Ky6Uz2KbaVHa4r%+4Akc^t?^x z;8NMxni!XMc5kUKgR+htJBYsyPMWfGcPedc>fql0qqj3C-n@h)D`|e3P+o+OyBlTj zk-iK}YIi9vOXRbR^j)1x8Jjk9@BbDB=AE6&lANr8(x#tj(s%1HfHJUnI|Gxtu5JSd z4#<|2IEHbjBR+ZmMTnSn4a?!82K_u3!#M-e&c6p=}jOjYG1!n@Trb3g`7+%i*8 zsu!jE56HqBmvN>>QLYQ(jkO-l4e+a7vIA9<9&px%AJn$Tz;-<- ziWJ_2YDv#uu~t^B(Le%smmU=x(f>dV{nVZGf=LT2R-sz8YBl@XRW+zk)v!X%zEb+1 zmC_5POSiUS3PVG~N`36Dj4D+(s{FrxQuqNRhwFu}tXM6Q+rJ#-(yc=MPURa6(BP9X zg1>zkWW^eMMc_vGl&@ltfsam!$-ET4T-7R7t^3+r8&#%%4L-5}I=6#r7y&BxaqC^# zhW@FI%WE7hEEBkOZx84?$bC@PKJ-s7vkjjqvc~f^kvTlk%!2;=eP1Pjd8#!zB{}Up zmF5Ck$e5>2Z7@=rm$q%&mUZaRL7JEL>eY)mIXS&GFa7Sj@7UF&8SH>G*0G$&oLUz(F{+_;f# z+qR7b1_rX-yLYn#2M(~Hpdfba*fDl|RS-M1?kGFI;}2;*8g}p^J9+XXJAL{zJ9q9J zJAeMXG#9=3M+Ccd?mD}4>5?=Ty?*^VyLIapdk}s{nuEsNe$4LOyC=;-W22(klRGi& z+5IQldFacSxQsbyJWEJOU`ekN$tAHjZ{A4r(A121Xe*j04xoABWSS=~qj};!nkQbB z%@hBdr~WrjeP8ob*9_>V0aw?In|}Q=?&v)pX_F4*)H0s8f8ZK8M! zK9;?2W2`VNX_P65X8~%ncWrG{yelR0512JD#_(uN z&+)#OwLt?XSpo(PTbcuk7c-;xu6WeoYGZ9s8wqGa z7&aEjbu1~xFI~&d$h2)6L1u|=|GY?Z4r3Si6@trMfdbBb! zY2#S3c=6&!ic&qqYuAoa{!UhQuDz@bY7$bt9L)?{YG2cP(C2K`%GH$;aCCKb{=~qd zm;AkyKi>B$t!U!v>S$tQ_s?s2eAgOyZ)a%QG1Gf(eAgNVpHVJ`rd>0=*XB>}ZJeCG zkiYMz#lMwnzYe7gikB*7ZeY?%Tl21({9S>+vvo%48&H*HK&JSg*VHtznvHrA$xS+KXi1H))GeNuNeI$R6hCL`DXDd4z>tx_uuY4DJ->-My-sl5PrOh*o zk+tfUYuB@9-%iz))!S3Ya4Jorq#R0o$|_W<+OC>qCCh5vDS)G0W@z(2%R2RJySJ!V zzhVogOdSik64Wcx%wE|=#LtAf8J5*^_#lbm))J%c8LsoTm?$oD~vy>jv z%o4QnzA8iD8?wZWQ{gP~Yy?wZyvZUWBG~QQw^{V9M=UBT ziamPth(T_6{P;0@^5hANd-RNS*U#B2(p~?fzmCt)UnjCRq{EhEhYY!47k@x{=702| ztPv@0d(Z;rSW*i6)hC6nEh%)Bq|oieEcpOtL-IvW?#(>-YPOK?X1n+~ivN#3)`0Zc zMm-oa8OxZNA7jOLGG{4-5{`@2MpPXXzpFX|khpA7uYuPLVnoI1ov8Ab*=C5o^ zQsvn-GA^x|-6+b{uV25Z-4|8LRFPPRNtt41rd92l)iC>*ObVERb<@U;>sr}0EmPJK z0g5%H*bS`hnpXLrX^raT3_m8XX;~TGjQ7<|tDBbn!cO>G zmNhjqvuvvMJG5-xym?CpTN?+5#-G?VEo)^>U}asc(&wMmuJc8+%9a`^Z(gycc_~}% z81ZR|O0`N>_{ZP8Uc(kmZ0$5$F#o?l_2|~VWbw*asVv#CL)%^&#!4KQ)`r-?ahty- zHvCP;wypb2y7BbZxxjKx)k9vKoZoz1^D}iTdprMR=CQ`I$LDqGG_M`AyNqL(GvAFe z{pgGT{ZXuJ(`pmv%yyhKx#EK0AiLSJpLC8YUR@Ffh2JV*W-( z{t7EYcxE1D_ZP6e*6eIG#dpWg!1IG!Bi5o8t45J7nyC~C29e1r>hwxeJ}UL{IUkeI z(qWLVdrG3MnQGl-vz_ykYq2r>wuwU3+#o99`DhE~lluojR}Cy~zFzP}+GsO&>h%6L zmdt>)-WAZpNX3+wg6b^}4Gpp1*tfDm*~?5dpr^6h*o)J`oPIbsx7CVuF1~jje3s;H z5cO*Z)@i`HJKmn|mh8Y0Q`Hiy9TqInj4fI?m>v4zLg=r2)QGe+hhNj{T}v&)d^*Ng zR4#pD*f_~sRnnk`FY`Au@~^H?Cd^UyHi~jHV%PT+Q@I}tG&x_BZ7gjvzw&ekOVy9x zlu=a~6LkFMteRcdPEWYLcP%}$WJBwDvs1Q5?{)L4V!#5;lu6OdKf1gR-wqTPNP08kqd-@be>G>tAuC)$`(C>i)~q$Jy5EV5%5PHFL^f zY^2ATEfdw#BW}*Ou6EGa`Wqv5*Gy?grEIC1BvsK1Yi7}&-EGaR7qC-5GG$eTk16WV zqO<|?FtV<$FM`r-P~w&Chu2>zXTXfUWU85#%%6&^-6eP1-qY1T)~(6T{@uLZ^j{)} zD4Aci3iUi!SC#Hu6_;XeudVBKgj(6$&?V}96$ev*y^EcbY}ZM50}cFV`!I#_%DCbo zs-b37dA|-}pKmd{X5_{XZTt4(s_Q8Si?QtwDzmON4UAaFzgn;r&&@2@#|;wMclNcE z%r5q;kPVNgHr_JjmnUA`7w=qu;6*uwK~%+hN0xic^b7k_9iKjCWnU{xzfvKOQ@<(0 zoKro!w2AtH*{oVP?6Y7a|90CI{SHqExN-3NO%ab4+&VNq_UirnL!UlxV`9C(oO-C| zpzci+V~0*^y~8!w<>|FuCu3i2h?!wpy~pz-uP)Bu&xQu9H^;n6NNQnjsan?8Gi-8gR;!Ik)TXtby+;1M z{RO?K#nK)wXY;Mu@S2*ts9MSuW=cMJf{m3?$P6pbq;-{J|471<+RU+yiCgHJRwGW% zDS5lP!!RR%ZdXQCW1Y9cv|_2xhfHa}6mefzU72X~r#&;gxqo!;J>OpFRi;dt^`TX^ zr92M~ZfQPtpi#*4X%?*YC(o)~J2t~irG8`0W}1a0>AMRmAM)Ie!tPf*o??^m?AFa# zkNB|{XBwNAO6ASe(|)rZ6Zv@PnqsP8U`7Zo*)V4L;Tr>LuymrRL=EQAb=$V#wVCIp zwako&TRg$qkG)p1yDOZRh7J6RbQY@;eG66esG5GA*tBk+DlFQv)UlIGwjFM!vNlj%BLa=st{PMdY_KCU zvSg>`09~Jw2xw8oz}kmd+Zrh?6v|OSHGFc2(PuFGeN&ZtBDGo5UYxEF6TNBe{weeO z7+SY_+PFQN71VFt?|o|~7`$xHj7Htu-}Pza!LVeHHrw0os2O){i0_sv?nin~OTN5- znRR&MbLfUqlTb(JCvCM8_y+-OU8hqSBbhRnY4^MrCUK3zMlR|D5$c4zH~p~cnr z4!!)um_~s~uhUbWZ#$s&yh#D=eIEYLV2bZ|(N{LKeq`L+Ox3={sI=+lLq`T4-PkZF zYUZUqhV9sqH*qIRhsOp6KfAwcaKATA`zj_STpt$xV5w{MDHHt7RLu^KP8$>&v9asQ ztNS8cs!W+Mw>`7#khUk-b76YYz0ysmCOo;J-ekA^C*qN%$6ZT4P;E(KtNLesRI6$l zjD51}%vNG;p|^UC+%+%<0-I0XzU+YCu|xwO)qDzZ%Ci0DbLTov>>SXp)Bvw@ zZ?5hdxO-^F$JgsRTPl_{8Ma{0o)N^Qxs*Rcc!Q$X@TAnm8u@gn1((en;rhuI&eWKj_WA3a-<7HW;wK{_CMb zec9{#gy4jP)xN`hET<~cEmhU+lONaGH$K++Q{V8!%@d#13r;xSBy{t(9fwBT2(4r} zc9RbaI##*yoEm{28Ti}Of85tnajCE2njfxo9C7hUi!iT)Jo@#ck!dOWMn-HoJ@2Nw zbET6(UUlmQ|NR3GS=RmMZXFX8m)t)}`*!%$NXOEx`V8_oT`t9Nr}OIXFSc+tKfn0G z%m#H?Wx`~rm8xN~@@CyltJXgw{&(^DjxeiQwD=yaR0pl+pr_`#&5p%TgM!V-gxPk zg{#*a`nNZI-SqK+$Z_*pzB=C|p#0)38;wWoZrr()>JJyy)YB$P_q6yz|I&TyP3MD`ez@Z6;{64hRriO=~ z>>lp$=!nX5uDQx{+R+n%E=Ru#7?t9s7x!tmXZM)TGzgwj|{>|5!#)T~l($`LVdCuAVOxb(s&unT& zec4m7teN|omOS-U_@IfmHe9q%c@m@azi`4Pyy-L7yYcA_EfiBv8z~*0*_^4`d-e0c z(A2Oqit_dQU7C7)Sxn``VXH6*u&7ZuB)GJ3VjoCk9%8r28GW=3ZcWizGxfL zjT%qAmFaWiZn_5#8Z`OAl9*Fvy6^p}&c=#~iO-1@I9C|-!{xnezgJ%BVyS3;-_LRD zfUfS>cD7#anH=5vKzi+dZ_b=_QF>iBrQ+}2{EpE+&$Q$iqeb_89d3`9v21Xp>&1r` zR)&AFbl_)CA3ZVt;V*lZtX%8)J;^QAVy^b?9?+2Q>u*h&Ej{g`bm(uYEWIas!1QQC zFX|#53sbMU8+KcDpMlm^vMVp zReHsUzMGS-jhVE_Ty^Zaw@Y-_G4bE*W?in28gHhWYM)^6rTR$SI{#y8FMhP;%d@pg zN5*ts8y|7{(cf!5_}FPrj4jwy7sH*yLaW~+D$XC-a_qpH2`x%4yO_ALnel0(DC!x# zgHvD5JM`w^%J8}6>TTVVeyBsWH^XAB=G^yDZuh8Do0Yata*Lnr>Xi_2AoYrs@u+Vj z``j`}etJN?HGoRvj^&IAQ-)lxy_}7T4BB<*%v$?udt;qlE8k21#+p6dT}*YX;Xw5x z_v^dASDbRdS;>+jlb_!@eBefM zEbGw4FuBQf^QiGF+ORLnf4TY&D$BddAj_zID;Bk5zaP8rIJmN#FI!fNIhxnJ|LSDG z{)k^9Ms|9s@T;8gs#VFc^VqT)Y_10%*!1X*Bj5I3R7&~yYlpsJ%)w0A%phcX`X1-R zs7yGvgN(Q-uZu9}5e#e;FF& zb=xQ8htsA}R512q4>r1&KDibP`^1u|C#HNI8CiK5Fl++hz+6{9XJh%-QTk>-nJUg|bwz@vFbpN&?4K^vv4#rP^b)i`}jSgj>ys7ac z3wltWJ(=QI+;XfpvuPT#mMUeZ=3oZAi&a6>hPmhubE4hb;b^?M(4q zwyOeFl68Mu*OK1BpPN`Ox#O@nprJu+*HZI>n-^1kX=Ksn=IZr_k5#W;QsMK|z}mm$ zR7F|~bG#^SYLv3PylVRB166F4MivH&$7d$9&ugkId_t0r7`dq|lpiT7t_>T)#{003 zcfL%l^)lQoxuf&;ewI^Q7TOqG^1XJzaO9JcA*Rmh>1_=g`**+6Z{G-~$CKONeSK?_ z^NxX)rhK-j{Kt&lRno*JzPRe-!V`5YS}fk0SY6rB((OU}bE~Eqb!cj`J@rj=O1b_U z#(9=-TUBvZ@}%P{4U;-AHdRdjQnkckbYx;^Kpn$Nwlk*BT4QSMeA(20^x&JPKEI{h zzKHY*2h3QH#s;kHe8!AxG39Z|>t-F^d-V(tOOk2X25Z*TjCE?wMp&@LcfE#82yI~G zvbZ!O=-94X+Z}D(Wt6Bh-wyid2Th5IiJUAqIPEm}U>xmk;Iu2DP>US&Q@yH1 zqNrn9W#Y7}gOkM$rS!$00--2Fs=|>q488U=BIy!P%9sHo&mtTI# z$wCQzwxDEd@Kax#OPUf_mEmIwX?`+w!g+F`tjHjlia$3#jWZC%6%Aly~9`x$c zk7s}X{Wqr_gj)K@Zi$D5g=yO!Sub)I7Z>gO!mexG^k~N-KYR9UfyQC*b!=J2_$CK^ z^y{_(^n0`kJV$(r^Um5pmo8m6?edoTUO~oUvgP4qF_J6#^|b-ChpShwYU97FHUOUU z{P}ZE8*dBL-pFvCljV#Sf6)f?)j!_pYXf8jB*|azstwR?UVi4x8BW$a@05PX0iaQr z51=j54qR;+7G)bipZn>jpQJtud}vp(R0e1Vd2w_sfi!04rT#%Tc)e~L0AE6TgbZHP zZ2VzPo^2aI`b9AokXa?acI_IHFEHene%f%w(GDQ*=(Yj8qn-Li z!UrH%K?X;@g#r1cA8nAVK>7Xq_w}{`xjb5!ZGcW}kmlcoK|9hY2>p;ZHf`D@@gDG^ z-o1Nk$6#HVv@pg3vM}bq{q~#Gr#=Mw!SBf$SgH^3+BtLPWSSQgb{iNrY?#Dz3XArF z)<5bPvOjb#=#QbHp`1<^DUvn--3D1lYk5jxl|ez;KXhQ1LN9T(S}nCneQkhFRgwA_ z@GS@*K;6g0#1t0U+H?v+Kjyi*K)c#9wE^&JgahpW@XH^6{4q-zjdu8PXJ=<^8$utW zlWRCx!xwtp1E0dCA8o+f+dC5u_=Wvb z5c=1zU#}OPD_5>ax?wR-*KGrOBV|0ic=2K;-2!9@I@u??CQ>JejuC*%gBALHQPGd}A=>?ui4RPo6WP$;^#R5ZU7Z=?qb(IB6czoz`NWA695RBaPt41+ zq91Z3+Pesgeh*zjQA1JEkF`O0d(Mu2jFEzNTrnr7Q^<;%{37fBK)fLIXEh%$>;m~v z>;FIcHTqb6^{uPl(HADS&;D)ouS+}pxdnY;|4sB4gm#qC`=%ed8#-Zx)9IFc?b@}O z936O*iT~^C{{^969#`I8ilY9p9)mS0Iun&cXCoiia(j=p4anCwZ{F1E`s6f-dpRxH z-HY(J%AqLehdx9;?&p?f-EfeZ>10;zykAa(xR=wC-Mt9^F6c-52JX7_QCe}i2LklmcPp?d{NYYP*4!3gQ_^}0?-cf<6uVuJ;=0a)1R!ar zeP0yxL%#vp6?4FX*vG-Xj!xTsi*E~B@_N;!9sZo?r##d&H&x5yV*LkgGpqT(JZw?i z=ap`R&kFvH^n;eH${;H`vwHq-rC*dm%9|9Pl9bGG&90uaq8~ONu>F9;y)ICiA6)wv zIKF!Ff^VI)mea}O(iQ%^0`x1e{So#*y750``sq|S{*&VrPN%+0SNIDX{(qw%eMIUr z8U01quUmfE(N8D;NNXF=-Mnje`0!yKdnY>2^)LDi`VH=N{kfqZwYJ> zsdNt~{CI~j2rEDz{aE9~9Or#H-TqHs{owSK4yiwYX5r}T9Gp%7AeW|!yFd$C&nC)&BFH{Gk?^VSOy#DDlU`}6@;dEMWCPydo^2C=3diy{6yPO~7w*S8`dUf-a)31;B$>qYg z`@g2Y|HBV*?*F>^zi+>mr&If-uN~=iy8K+k5zlq~x-?P$du#rq8z#4Y^yR_?QK$5U zBc7Gh<>w-fc&_W$#qUF=Ul-S+@D~>SgJ#$l0JX~kpA+$p+qS$fNx19d0sn?)qTB?oCSKzxe9L^P;_vuzAcc$nnQMZrII> zJWw`ta=Ntl9D9Am^TN6!eXLU!1myUm4zV{1dlrBreZfZBn~vv4j~d!nKlan04zTY7>7n0>^BoGS4q#&n z`x>nK!Oj3SNc08ZY#sU~>>0AdA9P_o4SN~nb%66Z(6Sq&(qcc ztK`sCJdKwbx#0+9#f5zeO&?FZxQ>({S! zgXP&@Q2bE`*lQ#D0c?^%lN=BxI5=36#n5grk1MQwSOvu&cw#RlWEbEDx$DlIJ96}; zu^;lDX!kgi1F}J3Kw;ny83^{FS>ca9Bji4WfvtF9!TZ2pS5_$qEguU0=p(}Ag`N)q ze}T8SzEAwIM-+S==gPs}7Y=$ajNPLD>b4(&x4349ziya^7jQPf20Guc*tdW(dp8chNZKff|kE-dIj;zY2a_8syFEm3IDW|RDN#r3CV5-_5-;A$gntz17|+T zfyzP+hi51k%-{9N&v;*002@!(Il|5bc0UCHefSR^Jeb4Q4`WkdJLuh>KY5lb{NE(J z;n$9b@#x5hTz)U7S0Dc1dl-wvxKx-|oc$bfEJTa{LEk{06i;W)WjNr8c95E!!lQ3K zF!Fm5Mj!r=Ss=p~m4hDk>>p>f_{08FZUZIko9L^teC@Zta8H}j{O3+yeAN&? zKAr9tbW!o0Gd6PiBCOPmbju&}CFlx@(j~l#*W$lr!kSDrOu{}1ef;6Id)%k>WWL8| zD_38Nli$B_4QM=^CH(LA;%-_Ki;$CYVYz~2&y#2sNby4rx z+P0Kc`;jW-9sJ1o=j>J!_@Z93wa)*$#r#Ed9GABrv>DNsvTHx@0Cgz~;Q!mGrQGYY zF>g6v!WFiCsDr0>W2N?fZ0WvC_pl2VAa6h7S#GXqWBCQ(_V~sFu0DVBEq5<0O4_G_ zv|*DB|MQ1WGu_MceINMC^DpQ<@Td97DY{1G#ZjC*h0jacc?^3>#~kQC?>jC5*lEG_ zASdj!l$GB`g6j1{w$u8c?Xalq)NrD|L(h#lEzb2TY=`-}(3yz*a=Oa#yM6n%^t}q` zit){Y!gg2($m==00za%Pj2}NZC!y1&_u1}61kj6R>$`EUtd-m*+ zXocMa=8bv9ON57A1nLHOif36}k?*;4=k%5z${lMV=qHGeI>uU6LCO&8ywEqJ-{K5! z)C=?!`W(()L0ifSKj?C>hAheubIPq-w`$8UKkX2 z^$Q&h)`;;<98rc?KhAF%LVqC73zdep52p`MK3M0H$C2ZQGo!Koh<=MQM0-IQ!nO$X zBVJz05a%!F<-Ek);D>&Ia~Q!#g}o1WAkNLtOFM*}8@`c}7sxGsI3ox4R@f7YGK9V! z=S-phpbT^B%UHwk^YhEI?QCxFLs_A}!3GAp1P>1nsV`$p246xMf`37uBzN+9$GDAk zp}azF@WVQjeEnFIA_YV!-0>352F3a%TJD5cKFHPRy7jxl4`T%6O4zpLG~dJ+h`9jf1@8(! z@ZY$&I1av+(|jHCddQygHl>TFu3z3q^3(q0@$++^9X`70y$}4bPK>p@F34XA-k{_ z&R@t8ziS~^_#eLq^H;GiXkB=(v~DVJl;el*)nPuE9S_OtJ6~G&-Zt5vPi-)Q@1GyQ zLwBE(T=4V-88Zj(0qeI;73=<#uc(D z=D>yJo{-K3?QaU<*o{0*&r;|vn4^QoGS<-Xl!O8p4yu77Pm zC84B?pTM)QuA=`=symF&Xy(DOt_Qc+$y+)TCnER?$J*Y4&MJQRm)(38)%C6)H%aSD zz@fZc`SFzprMlifH-JB)^C1wOXy!rHK526V8DK%|iDKxkmo2z}%Dp^xV)3!(KcqJ2vR+#d?=K zf9M!d2AH?PE(>Lnmoh*+>~}nQ@}#sUTAxi9Yz2WM<`e*tKWui<{{Q;xF9~mifjpm= zGC;Y3F6gPUvd4lwA@=X;=8rfF7cP{(&5SY-x?!x_=B5mw@tc&DS2GCK;zhj!;{5?HA zIrtXl(r5?J$Ac%KFNt+1(WbD*1)U4}1ayF?@7zFk^h3uW)?h$0_9K9oq5jbqfEVVP zaL^}1XAB(B-g67t<&QGQK1>0k48Q~A>*wezSl2`w73*LkPEOanQ1y*{ zXcyoE_}-_WUC^nEgLs}>`XT!rJ9bR6&(BI0!#EGU6V{>S`OEKh@yKodBAz@gefJ`q zxaJflulb8~b9;U8_g#$+g68=806JCdtHl*S_^RPh-{61XC!(F_^@=pGzhQ3MsnQ%? zoFAMv4oc{`XHT2KYOTRqLg4`cp6~t#YA1CROptD@!?8Bk+y7@;0U*Wny zvUA53e(d?srN1C~BQDDNLHHf5gWWXpfs2ibraq7)UEv30(yRbDliaArci}P5hAmrO9QN@- zN01dDeUbyz%a$#Z9vv7UhRA!kF*&`neL@ebdy{{8pgIcSzU%wb`d0NyUrhyEYu z#9+;HIju3|L<3}h%*P;$WBpU^&`vNnk*5#Y5Z_&Zof77cm^)=f18_%~fM$IFSpnxG z$@K%i%CaL;hU3a%HwU zrmWJ(920=@L%W82hkge+7Pf@Y{|Nm;OOfd( zr}PmH`WBS4u)l#k3jLYf7E`3Bdo4)%n41EqT}w_kZTNFaA7zd9gSAD-(y)Po-VZj< z*gGqqSIE;xp1DaMa}(4r%0t)T{5EmMnn+LNA^bVv4}AdIChS0T9p=axd_`MEx@DD9 z`U0PvuGqhI_p(~M)*`}#SLpIL^e?nMtVia?!S>K(p*#IJn)=%xJE{y*`k3z6FNMcL)$`scP& z+_%dN$yNbtuu&Hy`LF$clG4VSCf2kC{&`7PgjExMfvOEW&}#!f=(kHM_wXa3v=20# zpWks>T2IYLKhOKZD4w)0jO70)I9jL6yiY7myU(o1*TW!(l_iI(ki+~;^vYq7S8o@R zJ5GEi3i1>B#acQ;C^t^#XqmV*BZ2l)wdgh&tPN(KZ3a96Ua!*~jrKo>{I zb#i^Fy!;SXo*rZ^oC^wlHs;BwZ^$v=QQ%id8*&`v0DYjF9>!gaxhO}}3*KXl2Tz5~ zGsa}hhqD6R^iamoWn#=jIpX|Y$b7<%8RtY~C8r^etkT0flppqQp#H(nfg8rx>>#`J zAU{D54_Q{M8w&j})t}yEvq}%PoRcR{mUJGFxuMg=S_*W38SOPwdLsR-(nEP+T!1Z= z++iFEcHa)=)(9g1Ss%c()aep8F+vsIHXh9&qej<#%fA+Jai#W07F!W)! z3CAeN3K&~+bn3f&)nGqK&vqr~0>5?cI$u6;zVuDClm17v>B-9?yL+5%fw67<$Y1%+ znVa~1(p3RZjB^;@s0@JLY2cVEN8=UgIHKZT#78B*N{piTQKV;*TpICFN~6%nF^pF* zYp^CK#x120d2|4I(_BhTa&NYd+Nqkt>bjGp=T>8%8hCMb4s&B&K8Ey&U#X$T$GR5e zE-_xnujqT|H|X22p@)O67V(KUsloRkv*Rl4o8|GrQ!!@*|AK>@jlPBWp!>*?Bhnaw zaS3CIJg!(r#P}fWyfJ?TuR?snLyf#aALdmUGvqknEJIx#2xM&VCJ`UHXYg!{&(QCK zmtm{{-$9?%1>N}AiwPc${*3u4^rqk~SUbczfG+5ZPq;|meaBoDJRNf%$Q=4WUwq^b zyus7K+fl|S6EWYAr=u@E_#nnXv?0v5a0L$Foxn{F`r;!DbOK06IJ7rBhkYTwqbC64 zJLaPFPO3lPiTZ?mqR$=PxStjd?~>-W`k29f&B>m>Ed*ca-IybH{C{vX07a_Rs8 literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..c5ee95d983c9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Testovací položka NUnit 3", + "description": "Vytvoří novou testovací třídu NUnit.", + "postActions/openInEditor/description": "Otevře vytvořenou třídu testovacího přípravku v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..744753e2f568 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.de.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3-Testelement", + "description": "Erstellt eine neue NUnit-Testklasse", + "postActions/openInEditor/description": "Öffnet die erstellte Testfixture-Klasse im Editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..94aac9c09194 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.en.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Item", + "description": "Creates a new NUnit test class", + "postActions/openInEditor/description": "Opens created test fixture class in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..5fad26e60da0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.es.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Elemento de prueba de NUnit 3", + "description": "Crea una nueva clase de prueba NUnit", + "postActions/openInEditor/description": "Abrir la clase de accesorio de prueba creada en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..b6c999c4cc5b --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov alias halex2005 (codeofclimber.ru)", + "name": "Élément de test NUnit 3", + "description": "Crée une classe de test NUnit.", + "postActions/openInEditor/description": "Ouvre la classe de fixture de test créée dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..938c218e8331 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.it.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Elemento di test NUnit 3", + "description": "Crea una nuova classe di test NUnit", + "postActions/openInEditor/description": "Apre la classe di fixture di test creata nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..3c9a7c6b243c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 テスト項目", + "description": "新しい NUnit テスト クラスを作成します", + "postActions/openInEditor/description": "作成されたテスト フィクスチャ クラスをエディターで開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..4fa392e66d26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 테스트 항목", + "description": "새 NUnit 테스트 클래스를 만듭니다.", + "postActions/openInEditor/description": "편집기에서 만든 테스트 픽스쳐 클래스 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..3afcfe4c5d4d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 — element testowy", + "description": "Tworzy nową klasę testu NUnit", + "postActions/openInEditor/description": "Otwiera utworzoną klasę warunków początkowych w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..0ae34a3a82a8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov, também conhecido como halex2005 (codeofclimber.ru)", + "name": "Item de Teste NUnit 3", + "description": "Cria uma nova classe de teste NUnit", + "postActions/openInEditor/description": "Abre a classe de acessório de teste criada no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..77a8c283caf6 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,6 @@ +{ + "author": "Алексей Харлов aka halex2005 (codeofclimber.ru)", + "name": "Тестовый элемент NUnit 3", + "description": "Создает тестовый класс NUnit", + "postActions/openInEditor/description": "Открывает созданный класс тестового приспособления в редакторе." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..92f13df6879e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov, halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Öğesi", + "description": "Yeni bir NUnit test sınıfı oluşturur", + "postActions/openInEditor/description": "Oluşturulan test düzeni sınıfını düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..1d2b7791893f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 测试项", + "description": "创建新的 NUnit 测试类", + "postActions/openInEditor/description": "在编辑器中打开创建的测试固定例程类" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..588770b41936 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,6 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 測試項目", + "description": "建立新的 NUnit 測試類別", + "postActions/openInEditor/description": "在編輯器中開啟建立的測試固件類別" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json new file mode 100644 index 000000000000..030b402264b8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json @@ -0,0 +1,35 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "classifications": [ "Test", "NUnit" ], + "name": "NUnit 3 Test Item", + "defaultName": "NUnitTestItem", + "generatorVersions": "[1.0.0.0-*)", + "description": "Creates a new NUnit test class", + "groupIdentity": "NUnit3.DotNetNew.ItemTemplate", + "precedence": "11000", + "identity": "NUnit3.DotNetNew.ItemTemplate.FSharp.9.0", + "shortName": "nunit-test", + "tags": { + "language": "F#", + "type": "item" + }, + "sourceName": "UnitTest1", + "preferNameDirectory": true, + "primaryOutputs": [ + { "path": "UnitTest1.fs" } + ], + "postActions": [ + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens created test fixture class in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "0" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/UnitTest1.fs b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/UnitTest1.fs new file mode 100644 index 000000000000..46c9a164a3a3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/UnitTest1.fs @@ -0,0 +1,11 @@ +module Tests + +open NUnit.Framework + +[] +let Setup () = + () + +[] +let Test1 () = + Assert.Pass() diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide.host.json new file mode 100644 index 000000000000..03f5bc90c87d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide.host.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "itemHierarchyPaths": ["Test"], + "appliesTo": "TestContainer|TestingPlatformServer", + "defaultItemExtension": "vb" +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..14998ba8c0230ce9432f58149ae3874979717331 GIT binary patch literal 48778 zcmeHQ3tWuZ`#oTKU*UxG#f6I!H%Ua};JIyRsYel(c*;QFq z3a#5(q1v_Xm#|_LYFBQFR7yq7|9NKSOlMv*-Ag{7-jCxsm*+gs_j%59&b;sG%sYf| z#FXI05fO2!OUNe3J3Fh(p%#Sv1$7dMrYs_4sy!iAR_gL(At5#&U~eo-RQ(sXB}67u zms`3J64r~#laSEngj`!ja=C}+~l+k(Ft+?o|zuLZ;a2;1#_YX`b6Gr{H?t_ z;&p09Y=YPCQaS@~E&ntKtGWLsL+XOCWXlK6`Uh!Wa$v<`cK^9}2K_m%&G36n0wZ;ZRVsKur5Q!ew!z@ze$N5cC(JH9XS#ky4& zqi43aOYtV6KaXsQN{>nyu-JRw_mLToN4hMUnf2z%zEO9Rd$w4ye52Q*JGD%^m~wkhfY&@cjc4@O zJu2*ItYF5|!->xQ($^+tNnGekgo<*w$$TYsK-cX66u*8{ehucdx%K3?K; zw-KiZUi@jBgg(Jf1a1vBWwhvcEV289HMc?6`APdHw*UK88{#@lIe4yD)7*YevkN9( zSUo#h{POC(L1!-flrJL2&AXACosSM8IUkbf32WjVUUoTqIDdH4(Nb|Or(<j$qU*zrn-Kkkm$L!nOzn{mG z+bzaycIcMXVF>-x_&ZmVQUykxR zGSOHTKFaIRS9Qt0*}ulF{-oXW+&w}EGP3!`8*~2du`lu%^bao(`@9%4`})O8H*?b3 zipZhUbN=l#-TF}^d6B!vMf97cTW;>&o0}cxb+?SUdj0x_t{+@j)1+J2xpP;8ei(D! z+-qCdvpK)}y7x3uo^5jThvBQvEo(n@9yze#(2|sZr30p zZ<86hDfFnF8NK}Gy|&p+m2n;Z^7KEDX4`quhizX4nf)b73cYSE>z@DO@3`|DTVHD3 zEn`LCq`SBBUW$FXzZeveAAMwlli2kA|Wd|SXDrRjTDFPoq0O=_bpHUn|8g~ zl?mLVg?+XU%vkXKNq>KzaWg;9ZxJma9#50Lz7#lY*{FyU{*ew>?pwrcXj))Detnx) z$*!*Z=6#<1Ug}~~@5Mo7U z%*y%omBa2sf|v>LweR6zjHLNr0S!m-GL~+pRC2=y3`6oK( zUFYW}C@V;lr#6>$p27VNKtoy%@^6m%z;Lxpm-95tQ-Fr?w71ug! z(zYe1j~{rL;hFe;a_isSqh@<;4j3$Kkdf&%|G$90-PimkAHJGQ{$?UcRc5Yw(9&sM z!J{=(5~G&H9hfk^bHZ8QFOv)APRo$h+54WtMcUwX;G(;8KF*!sJ1b{@!o}9z{D|A% z*}lt8&&)mE>&qSS7Y4L7AGF|uUl(7zc|X~3i-(-oS*k%=^I|1tcuq zr~lcOU1OCW-A%ncMVYGbS=`Ne=~u7p?U(KN`1Hcu*ud9Q)1+Ch5vRsT1tbNzgBvHv zO*`cNA~~A;@YSow{fNvx0b+5(`IFL3%~~8E)nMcL(M@gNpVuL8>g!kOSxK{hx9%T! zTXfy)%$g=~$vc$m%p!BfG~)&^2~Q+SreY@$Bb^mpu^eZ$_;AZr5)qwsPsb#rs!SEHiRvSl#Z}#NCt_ z&q+S}+3e-N{gb*E*69100apKfbuGgZdTdA~zc;qqbYbNf2V!+Q#MSqr^`WENa=-z9 zddYv&a(<}Ac?lWigG9fm8gqZaueper?UlzPdnReQNY>IhLbQF|+ z7$lTzu_uCiA$HRbHEq?`_DBbThwV z#*hCt`~0-xlt@8bhACS|ym)o(VnC-mhtD;BJl@vIf(vfrnPs_PUGBOWBab|5kok%D zn8H~^9I|goUzq;#jgzE@amn*UMX>=^0cN6bPCR?X}q zsbj2Y5vH8s&3)Cf6WN@9(mXdY;+Am3p0mUw+w07VI*FFq_Vyw5qni73exzw=!NB!F zJN`_j(BlZ_>Ti=v_0?1<}F)3>Noa^@Sk%%0rkCR((u<8LnedHvmax5 z!+EFRuVe+m}Y9cO!`G3Q(>ZcLEzn6s9qrgOPVp6`*11?ge1MA=?B z(Z&dL`h-Xw9Ulo!k2n585GUQUTfF>)W9Thma>~+(2b=Fro$O6APA_;A;(M{RyX9@A ztTi_yBY9=Y)iKg3qc;wiF7?Sc*WyxZX}x;&9<&tSngi0!v-4*Lb^XBhm}2LI`dHqP z=bP7X$Vn%U4s(fXvRnSVr|}ck$ZVY(an2Io6lLBMdHARD8S%%L2AkVCZG}-76O$Uf zd7^E=`ZnMc`8PwA?I&H{Jp9qF`p>$qhA~+ZTCiZe?XPy6hg<%I7^kGg=V0KK0vH!> z?%_c6hOJxv)}PJ4h!Hvari^KD$w@Njl!+`QPPu(m+Z}n`u9)RtKcnyjh1x;QMl z$6T(*fLbsX{zH|I9}nMMu;w43O-}(JwQM~9-0`I!Mk zu&c*Vd6O;fvhUZKk%`KtVbM-|#|8Xn=awvzW%Y|*H;;qJh!daO5NY23eSowmv|#Lp zc%h>;^gMCCZD_&28$e4(!H!Y+_Y=H(_MEpVMH~P&e?Lwj$+|Tr^=>|lhV$NLYtP$R zErCFOc{a7JIIq_iJD&=+TYy60;-pg*moX zeE?|N;Jh=f&$!F}&jA$J-~UJGS&s~rAF@B<6r8CBwyPHa>$OV_EXZQ-xOyk;0#2dZ zw!%c&=PJo1!FfNMA59f}Y>uuyni!N4v~5(R;!_L7y+)tejOPr443=Ux|I+i^?i z-TW4Gai}%2PiT0%;4HP8hxS?SvT%(S{|)oF0c!xrUyk>kBuA0E@9w$WUYxC#anivs zkXuKZqF;w97k^cMSEnDN9=LM9`FB%{!4;FXxGOeI768(^lk0cgyDy;|85fj)Dr{KzrO&zym3OdC zaEfV7Is{tp8XVNAU*5L-{Pqu8)((?SJ^QM8gR6cd;kRk+`{g;#8RK(5;=#tKhuab- ztWoUTJNiWA$Y`Gv3*vf25O`j7?pN@Bix%M>zrL|~cwY9iJMTFz7`(0fXO}Ks+&nyH z@`X(whX3Z3IDPaf`z;o-vu*qN46r}DB-g$#H&Nc<@Pf<-xvhtc>|plmJOa*~m9eXX zS^q4{Irjw%*4~icJH7hBu>HLB}j|c8Lu{;L0zK6f9fn zO}hFEhRXfwZO^j&EdLZdiMKlw))~E%SUyccYa2mZ~XIy-0k{suGY85KOi}ujD;2m8M9#H-Ba^T4qxM(%_NgrP0KfF z-cfMfPH45>=1b+sueq3(ipD#C%MxFoVglJ8mru@5*pw`C8*d{E95Oxs>%AuAXEG}w z1w^-K0@)!Awr8bn&s(*lpQ6#vBz}YIlQB=)5IbSO_UmB5$4@c4&T6mx<^elyil0E# zYS)eE8w&u2M0gZn^tp;KCfbiw+J!}*onjo?&P?|Cn!WN5w-65-ncu90Jj?IHj3E0z zmqP{n&&@Ipy|spY_Jrk$-CwSW9Z_fbVA$g!1Nwa0d!LKP(w2~i4J+aS z33stnmwHo6omX!jsq!u^E@aT4LF9`sz962So@Dy;>15%;h2+Q23EA#$Np?*VlfAQ? z$ic-u$?q!$k*I)CBoX@}$iagLNmNu6iH-Q4TtB*n z#Gl+vk}e%3r~W!c&Ye3)u3x`S5^lwl`!~;$C;#0f50dYbCr_S`=cx}#dfIc6ot;f` za&pudYyPkCK#d0~%>zoMlFD{0`l4)Pw`t8p#bq~N1y}>81aM@uRupU!Eh+r0v++iE8vMQRsm0Z zaSGlLUyOn`#22kVkN6@L=n-F(0=?pkP@q>lPXR^}To`-?#PbxW*qdO~8W68ffn`zR z-&9bv_%{_4Bfe093cN#c;?)Y!L^Xe-qS51QgL$CKFD#t3+S$ltc>Il_taCA}sw^}z z@&!7)s)Ek4uBu`9E#Ktluev(&Z5$oVO-w}C3n*OXVrEfMS*ycu@7N5v8fy7X%ygD@ zs7EyPGIn&dLw*Z2f5T>=q$vxC$8YWESO@t*DB@}8Xo3GR7W4Sub96KX%qAv)8vd^X z?4o9d`N5k_fgQMPsl8@R-?SH$Xs-qU-qysVwu-;Dsfnl4idADjg}b@6LO zV+Ot1)Diw`sNx4_nd|WDMu*y)D$y3mk5?TX{Cs}!CI|$B&D8v+7R?OvPI|?i{e9S0%iE8rIuJ$5JIUK%P{~;L#0TQ0EULjk%D4MiKV(sjMV+` zKmqpGQpl>xhGGOFS_&4Z%0N+{5-8}$=Tr$K86@p(Xr5E++Zed&t1U3l3e~Fi z`ZnhD-awa{+o%NC*cf<*6sQCk?9Op20jln1)_9l5zf=M=?bfFJR=6id1uFRhYkdOL z01XOI<1;KkV;?afK-1kI0@@u;wV{X1taVM$b~hlPu)AIXOn1Ek*zS4+=yca3K(~9L z0Bg9+G@fVUpN;~ygR%VXtN?x83lUgbv*F07u(5#v0O@SACPGzQh3ytbMiw?UMsQg% z42A6?BO?*E+ZY>Z+fk}YK2V{Nkx2)fV%=V(fTCd z!34KCmYCqaN{k8ar=*zRu0xIqZ-pQk!Tl45_fVLiUSHy%-U#ngtRP7sY41}s_a#uJ zzDLoN@%|)4vu}=j=0}zfRPC9c+qsBb4EI&-i{qX+?tiD=|5s=4J2y91C9dYb8V}TX z;N9|o>ORF%=OR`*pZBI#mO4AIMwa|Cfsd8K3l4i*GF#QP;DL$M(cY#A>Y#rLHJIW8 z1wD*K7I2A-ksB{_L2V0*+5&TR33`|aEi8m4YHqBwN5vvm|Bds~*UUSO5=9GKQDfh88r`&5!x!0U>uQ}yj zbIQHulzYu7_nK4gHK*KbPPx~da<4h%UUSO5=9Ih6DR&v}GC{(3EvPPdzd~6rIDKvf zDG`#gnx`3MwXvvvV6%TUx0{Yj8sL-^WlL$>K%VR!v7P!Ly0kVL;s?9mmAI$2Q(7VO z0PKGw?%^9SN;q*;Z4!J#N12qAMD3=u-19(R+`~6`s*T<37sr_?b^lKPV;4&2k%1M^L<}Y^Wa^Id%h3KI}b_|_vml<_MSFXm$^}%c~F|T zk31Twgp;G%wB?5%s>Rw+)_G8xxL+`TzSeH)1Ng>fwOJp_G7rH18Ib6@siG){KgY0) zwoXVYUtMCr!1#LnE)YvojzcVpV z(PPi};GKwpiXMB${%Risl{NN^52|$xRMyxt_E*~&sO+(4d{8Z8pt8rFvA^2IKvj)B z>2wjJqD`l*fTz;)EIy_R_I+L-uBot_E%aAz*{-=+WxlZ zJ++-u*ek7+7^v=J&)8q#G4QU8J>!E4je#9M@6a3j)n(pOyD2Tr-wW8!HbZ%Re>mgRzqBFY~#c%J4;v{S`a@@YZOZ zSmMW48Ow>#F9?#PqGF&Z9Oa3BJY!ds>+sf^OqOg?J{%cpS zR`%Fa`4w?Kl*)R8meu|jnJ;u?!Q1&UwAk5sfO*zN%p0;Few9MoR-Ns~Gn=eU@CGm~ZnTXZM=Zmy zWa#j-_M@Gc*x1K*J@Y25BynzthsBF|HkQkhXXU}Kgy`6hYaVMO`h(?X+xU6(gMsxw z$dGL%sb}?9be@e{#EwL!ZlpBU`E!DeX_lYG!`9>HA=?J|YH2@z zoGEVp{Q!*%w25yg^0IRX+o>GJ2j#NABr#GF9>5dJV0vTSX7Be{JK4`cwq9Qzd09Cc zeQ(`()CPS-VkHq$y>5BZ;$8hOqo8K27J0UR@^ZBhp7%#1U zU0i@qfz1r=7%WqJfF@ztvXH6(h?V$j5BPf!N)-TUAyom8E7gVqRRK^IQUm~MRgO_n zg-X2&2*A*x2t;jwk%n?wL->YOR9TIHAQH4tLv;{CH6lfgmiYE&XGk89=zAg*27g=x zn0Ob&6n=hTeDUwCs-j%(bqsLhdQcTu4e5yBxwOPZ!2Py9JNdS_l^C>!5wPpTO;vxd zp7%F~QpXV+H*e#6@wi`tdYRZQaUAjE=54*t0rfKYF<)#P0nb~F8~(mdY2yg+M^l^i z#SMO6h<>-WD!w~Ynm7X7I_r(TxWRL4?BDaN;`>h}jU&LXpuR_nwzK1jf16;jW4@}! zfW-xQ4}I$?)LTK)e%9i-2o^u)@%#|qhRPlT-ua9~eb{Lo;Mb0UzWB$pUwr(PIR<*- zU$5^O{MBjY*hQ6J#B0eXgj zJ!_$_o$?{Ye!R0r#qR4;8>wuTmd5{dPn>^V4sr3%zp(bP_%Y8rUsjsEb*=ySxQi>Z z=YRQUpb!(Dhh_c3;z!%iX10zw^HJg$V&xZym*38w-{qfS(&JMdtaNPHGrzPBFjWbD z_B)2`*-_S~Y+SSTXfKPMciyPd@w4kDdxi)xvbfkYb1Z%~{xSBM*uj{aLFZ?2l#QRV z=Gk+8h#fIgeC(Mw7C+Y0F+<<;@XLzBP20D*Qjn#_C<9Nzg-FPgDQxZa{>ev*NpCgmJkS1YS3cqNKR9r|EShiIE z9*veV?J?L6{gPNJFO;j&ql8~Y#&!*5@gOcEsK-N1l$t;p{=p$EHMK;lz|&xADn=TE zr@+)yiZlseXs8@1Du!QXR-KQ7Uu)K((4;;$R{>OWFidqU3-w?beid4Y2hl)3p3{;* zl0nj*)3Sm>5f_YMP$k3$KfZ$WK>)pyD$q@_Ncb42?S|gp&A)doOPP6A((wUnyS{g4 zmqnMpJ}8^h**v7NzCqz|ZGO4+~RmdAERe~Eoyz;=92l2CbNp~ZbJP}_k|S&9@3yly4I z1AJN^&@~w;)r&MEJ)<BRjQ1vmS|3zk|s-4}-z&!N_f3Je>(Lj4*34Ktc{;aGl zRXe*E!S07p{fGzmv#?CD6{Vl@P^!=VjOXcES#&=S@P^AAUM%HeAo}MSCd!RV(G!C#1Wl+8RJd~qLVn1IeTc#N4-V)kI zeL?r5szN`jgKsBoqm=P~k$s z1Prn48eLp}%^Ds{hXVRL<32H6!;9*VJeoaaXWCzb!M`Nqpz-?~d%1uC$1)MumW$!O zI-kS%S&Vg>bte&dS=}@b^=|lgxe&mZdjDUo49sJl=5KaxlwThO84>uNi6hGgYWrhe z^X`cv*A + Public Sub Setup() + End Sub + + + Public Sub Test1() + Assert.Pass() + End Sub + + End Class + +End Namespace diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..8cb77b63f5c4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "UseMSTestSdk": { + "shortName": "", + "longName": "sdk" + }, + "TestRunner": { + "shortName": "", + "longName": "test-runner" + }, + "CoverageTool": { + "shortName": "", + "longName": "coverage-tool" + }, + "ExtensionsProfile": { + "shortName": "", + "longName": "extensions-profile" + }, + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..bdd89182698f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "symbolInfo": [ + { + "id": "UseMSTestSdk", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "TestRunner", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "ExtensionsProfile", + "isVisible": true + }, + { + "id": "CoverageTool", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "Fixture", + "isVisible": true + } + ], + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..40382f8898eb327d5c68b1d76423d5b1034fdfdd GIT binary patch literal 47213 zcmeHw30zF;|Nk@7w693fV(Qwi+~QtBsK%O05lV|TM7D%Ni<+@7UE&KUqmKop>b1Vn&{Gyo@I zeeBrQcAyjhzOYY4rL8Rj!0aIa$jG#|R|^90c?6P1Z51#P@-F!e02-~e{p)l94o$)I zser)Y0NixP^uadNW9g6SQvs_f00>3`aKLcBo}`$97*s3y=bV{~kT$kOAy`;!4qSy= zj*IlBgV1M6#jruKn`ST#fa_l3&C4JrAi8mmnIiyF_s~juI)e<94j&pc(6U9|`?&V$)fJ*nLex2{ zmStUA`a5$?LBjoqx+^FdtCJ2cSvJ5!`U>rd{_LQ;r@`;c%hKC_DRkQwy2jL=UgxV@ z=j-@3>{7l@e-YBNq9*M+UpKn?iWMuw0zD5OKK#N}L|oy}Y|kOjR{Jvh1twL#f4bo5 zKXzZ5^nl+V4gatjOT%im|x2&Ld6+RQwXw=z8$13dmD3PKb||6tTNh z5>ZilND9mkufInFiIe5%lSF{&g92%B5?E*2oUaOO1U+^2Dd3vTmwgAa8Dl>bGE$Cu zc?AkkH!;j`Yn9Hcz=jvy8FXG{Gu1?~g6-_m~u)*Q|SCpIMTY^ftQ4 zUi<8s;;>sg0Hfb2PiwiRT7j@Yx>An+eD^JL>6uBli+tQhP)-Iti<+PAl6G?~v$>(s z?x3eCct!RbpH)|S!8j~|b=JIT`GVS-#suq#sQNw4R{eins@GJr?fGorH$JdW5jmmWsZr<9bO#y0}nwlqWHr~kGN2dU>2;-K^ z$*lB>WUJTiNq+&FYLrIvlZy!~{ihC9Wa`1f2`XaO7q*n%s5fwUVVwNXe)?qKJlu_$ z>!qXrK1`Gh3?de`+={IUPuFG@2zsU)%WFK14_$hr();>$s^bcA#+5Td45h@Z>JkCh zC5L_9-T7R3A~>S#?3Kec|7PtRN@b0lV(7HBB3w`fqz-!#&~mBf)M)0)rF66UiB>KV zF~tWpFH2V_u_~ioL%-h?rtrwiKYJUDqcT4GulF-9<4$UvW>6;lm z;o8T=_qN6P*vtD(0oegDjN(g`TXk>EPC0mVkD6zcm=jCf z{03H4RKhcTYLRA3&4g4^V$hA0O5N(JeKjH){lLbx(g?uMQbWA_>g81vU!d~Y9wADgC4sp%ftGl%2lg?rb0WkM(J;p*fmOj5ap0u{g z5lj#PFK1^>6uK}qlw`9+CyexXRAO=_Yko>eO0|o}3u^}fW#BW))tbIjow1DqRt(vBCQ_op9Pq#^{6Hb&MG0fbVSw*f!7H5vRZ`Y5u zhLT%8-CF@W($pD8>>1n7O2deZy?Siqf|7-sHV20#3Fs`{RyEzwS_CAmEqJ_p$O*@l z2ke?Jiy!f-*y-jYkm#fTj2z2ku3KBWI>C2f#D%M4np6yT8o+QWE}@S9#m?(ekFp zqqwzYp4w)5sYwT>HCT|%s=ck;X)Oh3PW;w9cw;{qgW|F>P(3oDH0etjMCWH`0{hk zotkY0N5(Wy`5dcVx^=o9NF1CcBq1STyG>+zZvXpH6^?LQ$xfgrloS_Vuhk%(9~QlL z@7{|`>$S+h>YezXJ8jB+;~MYO45z=%&(F8nb=8alV*g&C`1Zz@c~Rjd&h9D>HSbeK zl4Ke)R%%QYXUu&PL9w*7T>IeQz~GP&1A68dvucNOm(gxDw=H5N_8hV!!42}^KYPT} z(@m^HPFlpzRB!t7hh562dB&%f9&f5GTP!TCB(XMafgVs^^(?wBfO1$FimhQNWS0LxhEFb_39VHat>atyZ9AX-mlL3eJ$u z1i)4Vs4PP~WH4tC2@LzIjcq7k?Cu9>|Fn_A^Ue$AouiB^)beaBGy~woFCFRM5JzOw zmsH7&7cW*+n^kyIUtiO!Rc@*{t)QUrJfgt)&BX0noRub(fLGC*{1vFw%!mSJjQhSJ zS=;I>qF-0%jnE!_7>H2I1%Tlw-az>P^3_esT4!fdFGeMDGEFG)<;&w|eSBU<)GJMO zHiX?5B^l?YY+I!&GrA#m*NlBq#e)s!A1A4ZTa#6`j)|?k-A z7`(d147~*k4vv0ZOg0P(B&%F1Iqxq{J8@Bzks3@ttO1M**I5M+e9 zE!GWIR9vjAtQ=4id&KzalH!G%T3TAx7C*o2nxWJ%R^o;9{Udu=aC0^nWhAVp&+>Y6 z22RMPx^ftaf1BO!sUNEuI(zo)>cG>p{nIY)OQ$f5ZmKVh`e^2Osj;rQdeALaPEJnA z6-9@Ph|0Iyt0Xm}?F~~(!jf{e-UQD8MmGeb%c8QY16{UcHzib8&U2L&3Kg^&@m7GQ zwlHl;v}>sv*FLRgx;0x86#CQDUtf1N4hDK_D~TUp&$2Eg5!E zok)*e#6d9KJylSpXgH+R%#a89?UkvhXO=uDBGGEX#>9Y0l90D0P4H6k8erH`>ZPG# z{|xG(O2sgow2+=jAIZ<(4}((q7sTfrI|lq3_wCbAG01@SsTwhiYEx;*6b+eHARzhv z;&VLH5fjv;o`Ez;Lrtbg(^SZ`3<3E9HSIb9nI1t+k`EygFL_H^^Iu5im>5R=U_p?s z>)}M&G)@ePHGd=*tdfO(k53i6|Fm9#*3XDFHVsynLcsTC%gc;(fEuI~EonZn6euX= zMEdfjKjfbT`5(DJro!p+GV;h_FL6tng^v(qnh%*aDj+7P>7E&4f|`Ww5EIm-}D1}T5pr%*XkR}7jbOUJ`pC-8bsX1bTnntWcOio{;7G?SV&*t<0@` zP!J{;La+CsFp@(+$$<=Asrh8utJu+u#{6Kql8+!G{PsYadurpOduu@W!2Qx8bU4-w zo6$1z=B(&R(%|kA6{$$(mra|cY(`X`_X`VKkRqcXT5>19ihliIzJmj>naFjdhkpN`8xEZh{*kWEix%rO@P0Xe?0IoHgF4 zKkAE1YYe!Xtpz}h;S=`X#S0&uPyh)qvQ(fdb!?OZ@nyL*QZaP4h#$o zfSH*Y*sx&(aB*<~;}1>(w4*bD{%J#C>T3a3US170U2_EP5p=M7*De509l+6}N5R=M zXMm574>)k!69fbVfUwXo5D^gpP9&ZJ7asY8kY{1w_RBlq!Tkr|$&)AGVfG{N^5sjA zo%I?#FL(~#7QY2~d3oT&yZ4~9v=o$-mw+$j6`-=>3#hKDf@?LXt*HeK4GpchfByd& zfu9lRl?bp{EViCe92c%8IC75~rN&W!3p4L-3aQhg$U|a4CvJFGVJKGtRWgYrD?^l# zhWtdkttw!z>~JL1ae;_bJNA%T`61_!;ln!_kmAMD9*2h{*y@1-FZFnSG%;X^WDq}` zt(?$zz=QZledXtb{=4(TsJAZ=5Ia^K{y{1Nih!d^J9BHZ11r1HLw>fYum8TO|0^rI z*1Pn|s- zLX_ahk9KboLTHiWiyx|&6A}^@mk>exLPF@TZQ-P!3~9nb!cljZS{G*0S2tx^ZsP!v;uKdsdr-eH|CjlPZh}6jd02Kh}qSK%}0H|%J zL*G#Hlgv*9;JGCO@!`tEwssy6VE5Of5?!aNz?BBq_Ulv%Y+wtA>r_)yQ($Xr%f421 zb#-N5tD@^vbd8FxPx05K_-oSm_;~hpDRwQInv%l44#i)8vadbARI;xDcN8e!~An8D3H##yX5AJXYN0wK{)1iP+#{;(@L18}+m zx}b6g1z*M6=%fw`aN-!fg94m5Mu#X60=Nty;l*)uHUb3&K@wiPovzTPU|>gaJY9k$ zfz-p;BRg$NtN$btlp>;D!VH{uvLShnNC^`UAj_g8xRaI-6v!L4-EK(&rk z5}co+!otF>JRIoakSy9?lq+3USy+Tk6jp9kLeLNCY+-1l)k*Na#ETrkt_QRoc%} z(76e=a5zuF&P`}XX0p#s9D+Bq?~$W>3~r7>%#7rpkRvxn<9!eDWU>!4=gJ!*w!H^)vsSalB}$F zTU%VVwJjnf1}kDhsEO!gNkN%@GJ=w*iP|JtQQ>~VqHHp|-A|U%kJ8#~rL)^#>9TAC zxOOYz*24kR*J0`0{^}pQ#y(Y}b_hY28hw+$n}p@>F4#|f5A%2b9P`f@wIS2DdY-aX zyzqchvxqYBvc25QoCzlu4RyO7dVgNF=9m6a52Bbs^X6VH4t<`n$DnLkkeuT3QwNU( zzLX6)HE4ODVNT62w!2a>y;Go>=6&Xbx5Q-aPNm)>sN z@Te*!6Sh5T$a&%)6j$$7^I&TEP<@khC737sfz|pt6?N~e73w3Kl<&%dw`W}9gLMWb zEYl~Y25+xexAOef1pkj9&p@Z1?n_^@hpIdaB#K9*KC(zCgc+HS@}z}HAYf4QGF6Z# zu}gQVg&<=*0q_R0J>`i*)kX2ts2 zRUWavcSj3H+#MZ%+I`K7r~>EgE9-8QhHl;FpFi<@{aG#ZoO!yIW_88kb=9<|0*!nPeA4!k2+{-jA=k@uA%#yFn%8-Uc;Zf+R+ak4B?*Ly3MA>+wu$N4Mx1!0$$EH4o~*(+gf`w#KcYfZ9`t} zgS{8$?bS^86%&#m#M~CvWc4NJ&W@r_dUg>3xsxn*?~nm- z^mVo0L`;y3joD>g*1UMzvz6Q2Yc^cXaoc4gu}XNW!K$il+DrB2Z6-6O=IE+F1JXt= zk9_0r`561}2%eTLG#MoBxbZ$TIQi~*F_`aMSC+MO^exuP?A(=6x2j$p zpvIIfbflaY0nS^N7w^_8IWN}~X(P;n?aNYr2P-#I&%(@eMf=#G*Ua4Uwsog9jAp>L z_Wg+9{E&MeL=0d8adMV)%2|JAkO0jQidAiR;O*fwK>F+h9pLOA$1;uq>dY3KBCjN~ zrdOgOrh$_MZN7xLP{8C}ZuQ>RWdf&BGpn~ z_F{f+j-96_@Eegs{_FElkT>gGT(hf_{MlJhuteu~k(%p53{B13LVlJE>D)$f#|-zV zx~l9}{|wSg8_WL?T&+Z6Xr9xhzg056W&c9+L!j>KN%squMTmfFYc_34Q!<{oab?Y( z#NZTZhB6tznGb@?KNV``C;tM%M|ey5mB`Y@OQvRTPnCew$=g2rXa&!|(^&E*&#_{X zG{s&FYR_^4n=KEyHKz-HG?-rD}X?q!@1wD%@+g`W9FaN zu|FLA0))DqPuMwwR3LCiYK#g9*YE~1-jBAArdU`HHVk~zloYKsPm#pf631*T{SY|B z+r;(hv9M>hb=2D_B_#~Cc%k?qi?0|4HAY@Eg&~MfN={zsJ<(x;UHY1ZDG&bft(E(D z`9h3?P23cz8Y{B>7@h0R%hM%i8+^K1KA8;Mv+itjh;pmj;JD6Ls&QS8LTT-}D-3v_o;J}&su?3<)YE? zi@jQeNDMJwI@86`=)4?7bD!QsNY1{#;?cDYQfkVtH2)Nd49qOG|5Xh3i-eTgz|9uF<y$ z2=A!R`mV1pJkWKV1N`EzU%y^Zca`tl(G{r z9L)!u_VJ1I@SvS4_Siot22MMxSDT)RU5@eNug67zJg zl3R`I-@kufuzk&%ph<^GFjqHe7T7pgraf&pqeOw0qXjd2qaI4H13>KCS-tGE+=@DK zh5pX;P3LFTZ5jg@OK@4gd?wTWR${U%$1z2FN%>BC{e^wWN8MZ(w7kjJa$KT(t7&hT z_$>iFWq`7gi(dpJn{A=HeBQ6MxjgC2tsBA~jSQ`;D78050Hmt*YHF{C$6F;*4e|!& z@m3Y3*m-(-e)vsig4Yz`xiHxmzO>*ev;PE{A;SpyRe&a7O_G_CL9!YBFW9)SW#Wc6 zs}DDS)T(cS3B99Zz((U1J-vjLhnru;tXvn>^1AH9HJupnYQF}sFlMD?e|npp;ic_X zd)mJd=J^f{1{=*<+!v7Ey^a;|6Q_A!6k{9-rXSD%_9&0{Dsy-Yh#Ykmh+Jqy}%9!WXAOfX_=i?>gu z!&5FD^=E1d$|2UX0hFq895E4BV!VRVM|&}EJ~?Wav~L1qI}kh zRKZJ6=D}3edo$#Zj6j*O(l7zn)khdISwN;uD4(?gCIvr0Nx}D^COLLyEYvjF2Wc7t znKmL#^-$B@KOs{g)Ff1ja(X>AR6H_J9xcl0y@oP?bz>OOW>`*d#Agr;(}NFas90sJ z1IAGOOnI5Ghlp=N3}cd}9Ml>PlX8QOB4s-?RCErtXZ0eFqhVI>12<$5W%Y(3Ljx>n zQ<3xRtlkQwAQ~#Ti}HinS-oRWF0Ozjt)879%+BgXnj&FVZ!*dcW@q&VASS3O+6T+( z-HbFv!mQpWC_k8;)jJY0?So>Ekjttt^Y^+G2-ekr3BPisXk%MhdQ$zvW2y86ODEE@ zEI-z@YuC1$`=pQk{r98l8X9LK8Yeis^=WA|@iN;&3TBR5kaT)nuh*rkuHE8hzqq`7ff=>^t)G-nKNkcikh>b#VkLJqT-WL25v>_7AT3gBpkL!H zuMA!I-V*KgX_&p6tyfCb2q2|CG=dXW!<-dvRxV(g{OQxR2-{qbvaOEQE{(&@T^*kI zT##J6c=65Pgr~Vjjc&gZ&KnNKkG(l<|82`RFB>zngfC{$H*bFKb0Kv8dW!j>r$HbF zW%XK-X%YZ;( zL@Q{t>^30jXlq+uZS-FnYb|6Uxp+r-x_wKU{UJfd*nuL8b26wonXBPGP-W^Cla_va zXA96yi|yW%p}XObFk%o0p*Ne0f-B@4z0&i0myjXVNil@3ppY#L{1nZz;D0yth6V0; z^eG~pb_(ukszb|7U~_?l*Mt zCcjhlE7FbIoG;POHI<@G{;*QaaJia{x;bl(vn9n=O=h?`Yrk_DnCmif<0RIiiHr*E zbHYv3q~C#xzFDnqiOXJrH3}nR(RDRG-IoU247j4#Y1s>Wg_fTM-eMdJSJn?&QI_%# zU7+77Kgf3!^OPUyJhadFfxcsNj`1U60R8ST?_t^i3#P(QJuqf@Ll7eA=)g0LNYSO1Cg9;Q~Y;Hx<8{=?UF`rLnn;d{<^ye*>t__6<9bKpn% z4`0>lFuw3LunyyoV$j!f0Aaw!gwys&+-LCH#&mwGB+dc&N?ZH<@9Q~09D4@`hYsVx zudkf=zU4PY|B-W`uf`t51M`oc@<+^pz8w3m`u`*50DkOis%tuJbJ(`WZ%Nz+_!)OR z&-a`I#IdjZQu)LE|DJQ8x5pmMk)Dn}nhW1!4)n#?_r!nv`RDhT1AQ^}J@FqMbHCSq zps&WhC;p@D=6lV7z8d?U`u{!VKwpl1PyPQMbD%HBzBl~u&Ky8?Ij!g#0)IT}>#^?* z|GP5>IQfq5AE4_T1E{+`!(YWEqk<NFQ+yaN@!2;!7eQ z-fnMP%45^aS-c7IZQ8}j~frhiTeq8x?~&&Q1i(^n-g+jtzrIzMtm9&SDm`G~eqo11J;`}wiW2@gMVL>_KfiF};wag*(7KR>oP z;o(P)$iodQk&lx-Zn8b?=f^fDJiO$HwC=X?c6;h4H+dp9yiHzpUUEcQciVXT-0=6b zpNI`_lUJRW9Ff-DHr{?u{p2Q3#D=%YtIkV~Nb7DJZ=W0fp7s;5;cfD&cUO*=PF}R0 z`pHecyMA<6j+c+TXx#Akw7(M$G3D~bfVn%Y@_=H@N>Xj z@*TsCN?us;e7x$sbo4cioA2iFu!BeiMB~ z;|)LO#$Hh!(R;&Rq7H5t`?4SZycOX=e&YRypHA=OE7~@Q*n6Yhmws~7O~eg9HQ(+( z{EQ#pequ4h^by-wKd+J-#=h();=ypE5`HfK|Fr-7%yWFac-4t<=G5-XaptC*hy(A# z|3&}t+drp$A2D878;cvaHrD@NFX2yXwD12=Ea1;z@U;*4|HXea=P_SUiOvD>+W|U1 zfS*lkj|rZaSN*>}?s$B}a{x|$Vf>tEocb{S|CRDvF(CSZ`Hb}w+gShqQi9XY`=^)ZDIzyV_5@f7aLWfGyzIOAj5l{&xpdwUG<`v}V_|wikihWn` z^E(E3?5K|a{!gcO__*XD5q0ot^BaF&W8mWK%rTBUV-NF(c;Vug))oBl=TO@B*~IMt z{v=x`JUnCH3*SpXK6V8^;>Eugh2IyUb2(znHrQ`y*N>m~z45IJ%vM+N6Z6b4`ETLJ zA8UJZyuxr}C1xL$cpLaSFCL8675qpyX1}K;X8->pe!TDe)bV55)3{^uc)NK0_&PTp zd_O;RyiUx1PfNUAyncM08xOvppE_P=PjO@Nc)NK0_&Ps4cz%BBnEjrX{9xmUhab#% zo}S{y3yf!(-zIKc2rg>gc`<{@jQY26XL#zX!<8E+<*k$BnSn^-yNg4j`BLN4A1G!EFl6pJY_7aHqFa`-x?2P-+*?Cm~iYb;#*B)6isv2xSb z=0p29VDam2$<0n*_d~pBdr0Acn^Pax{Vawv55V8sh6zK7Z6((Kv+P*}U^*6C0j^}A z4%kiv0_?H^l_*b31+Fx>V!!9Z;E^d+S68P3$G#`qVmZeJ2q8egt+;qO18W=y?j#+udt@^n4D*wL3XNC~j!}pl8FxvEkGv`j6T@ zi2>$2x`%_sk5h?ZA=<~DX?G_EnD21z^R$idaI=ri-|obKU*CDzN4UBZgRc1gE&JVx zL05eLmVFch?D-^d9w1q4MbBChZ&!Wi$3FJmL{9SnvyVL&?W*tm*hf6PVvw4W(rw@Q zwO`ft{ZQl|iZlM%Bo=#Yu5|TTD$<8m;`WdABa9f0ANz|?%T zxHy&A81U;m;=}Y{eq$xpkNN+j?PIw3DSO-huIMB3qU`}~zt~z;+3^_$7H6VgSbuj* zTU%S6`Pf9gy=foqhq3cdbPox;u16)&4!1TDUsu{#9yewimFT_+ulrd<99^+TwuJl$zy_W`l-M{T5s=sUMD=#EXI z42A)-iP15eSc&y_kLm16$xCNfY4G~nrmCtcmtXrxereF}72LItkaeF_={HhOvCHztS=#*s!``T4dInp@nSLExX!VRMsH ziTH^30T3p1Kb?4Qmne_uIYl`g&c)Dv4D%h`3nt3o+lWs5#yDOcUEiZ^+xMPd2OFr3 z`Z=A8;^onCDlPvxi*{rt>wR(SZ$zRJwNXFuSdQ9wc~nQ|#wbP(!JFCqs6=hl&yPIf zLGeI-qdF>4o0BZ+BihGeNtEZNgOfZy=2*Qe@)!nUiEMFNF+NT-e)@V#9@EpEvhB8K IxAzMF52~oniU0rr literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..e7338927386c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Testovací projekt MSTest", + "description": "Projekt obsahující testy MSTest, který se dá spustit na .NET v systémech Windows, Linux a MacOS.", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (jenom Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (jenom Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".Net Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Použít MSTest.Sdk", + "symbols/TestRunner/description": "Vyberte spouštěč nebo platformu. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Použít MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Použití platformy VSTest", + "symbols/CoverageTool/description": "Nástroj pokrytí, který se má použít pro projekt.", + "symbols/CoverageTool/displayName": "Nástroj pokrytí", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrytí kódu Microsoftu", + "symbols/CoverageTool/choices/coverlet/description": "pokrývka", + "symbols/ExtensionsProfile/description": "Při použití MSTest Runneru vyberte profil rozšíření sady SDK. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testování profilu rozšíření", + "symbols/ExtensionsProfile/choices/Default/description": "Výchozí profil rozšíření (doporučeno)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Výchozí", + "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", + "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", + "symbols/Fixture/choices/None/displayName": "Žádné", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metoda testovacího přípravku AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metoda testovacího přípravku ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metoda testovacího přípravku ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metoda testovacího přípravku TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Test1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..f57a40b37a84 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest-Testprojekt", + "description": "Ein Projekt, das MSTest-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (nur Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (nur Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk verwenden", + "symbols/TestRunner/description": "Wählen Sie den Runner/die Plattform aus. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner verwenden (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest-Plattform verwenden", + "symbols/CoverageTool/description": "Das Abdeckungstool, das für das Projekt verwendet werden soll.", + "symbols/CoverageTool/displayName": "Coverage-Tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wählen Sie das SDK-Erweiterungsprofil aus, wenn Sie MSTest Runner verwenden. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Erweiterungsprofil wird getestet", + "symbols/ExtensionsProfile/choices/Default/description": "Standarderweiterungsprofil (empfohlen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Standard", + "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", + "symbols/ExtensionsProfile/choices/None/displayName": "Keine", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", + "symbols/Fixture/choices/None/displayName": "Keine", + "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", + "symbols/Fixture/choices/AssemblyCleanup/description": "Fixierungsmethode \"AssemblyCleanup\"", + "symbols/Fixture/choices/ClassInitialize/description": "Fixturemethode \"ClassInitialize\"", + "symbols/Fixture/choices/ClassCleanup/description": "Fixierungsmethode \"ClassCleanup\"", + "symbols/Fixture/choices/TestInitialize/description": "Fixturemethode \"TestInitialize\"", + "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Test1.cs im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..8b86b77f311a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Project", + "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows only)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows only)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Use MSTest.Sdk", + "symbols/TestRunner/description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/MSTest/description": "Use MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest platform", + "symbols/CoverageTool/description": "The coverage tool to use for the project.", + "symbols/CoverageTool/displayName": "Coverage tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testing extensions profile", + "symbols/ExtensionsProfile/choices/Default/description": "Default extensions profile (recommended)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Default", + "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", + "symbols/ExtensionsProfile/choices/None/displayName": "None", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/choices/None/description": "No fixture methods", + "symbols/Fixture/choices/None/displayName": "None", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture method", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture method", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture method", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture method", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Test1.cs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..0e708f3e03ac --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de MSTest", + "description": "Proyecto que contiene pruebas de MSTest que se pueden ejecutar en .NET en Windows, Linux y MacOS.", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.Sdk", + "symbols/TestRunner/description": "Seleccione el ejecutor o la plataforma. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Ejecutor de pruebas", + "symbols/TestRunner/choices/MSTest/description": "Usar MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Uso de la plataforma VSTest", + "symbols/CoverageTool/description": "Herramienta de cobertura que se va a usar para el proyecto.", + "symbols/CoverageTool/displayName": "Herramienta de cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de código de Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "cubrecama", + "symbols/ExtensionsProfile/description": "Seleccione el perfil de extensiones del SDK al usar MSTest Runner. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Probar perfil de extensiones", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensiones predeterminadas (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Valor predeterminado", + "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", + "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", + "symbols/Fixture/choices/None/displayName": "Ninguno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de accesorio AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de accesorio ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de accesorio ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de accesorio TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Test1.cs en el editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..77e321ce9480 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projet de test MSTest", + "description": "Un projet qui contient des tests MSTest pouvant être exécutés sur .NET sous Windows, Linux et MacOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows uniquement)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows uniquement)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Utiliser MSTest.Sdk", + "symbols/TestRunner/description": "Sélectionnez l’exécuteur/la plateforme. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Utilisez MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Utiliser la plateforme VSTest", + "symbols/CoverageTool/description": "Outil de couverture à utiliser pour le projet.", + "symbols/CoverageTool/displayName": "Outil de couverture", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Couverture du code Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Sélectionnez le profil d’extensions du Kit de développement logiciel (SDK) lors de l’utilisation de l’exécuteur MSTest. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test du profil des extensions", + "symbols/ExtensionsProfile/choices/Default/description": "Profil d’extensions par défaut (recommandé)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Par défaut", + "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", + "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", + "symbols/Fixture/choices/None/displayName": "Aucun", + "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Méthode de fixture assemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Méthode de fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Méthode de fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Méthode de fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..c616b8446eb3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Progetto di test MSTest", + "description": "Progetto che contiene i test MSTest eseguibili in .NET in Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usa MSTest.Sdk", + "symbols/TestRunner/description": "Selezionare lo strumento di esecuzione/la piattaforma. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Usa MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usa la piattaforma VSTest", + "symbols/CoverageTool/description": "Strumento di copertura da usare per il progetto.", + "symbols/CoverageTool/displayName": "Strumento di copertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selezionare il profilo delle estensioni SDK quando si usa MSTest Runner. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test del profilo delle estensioni", + "symbols/ExtensionsProfile/choices/Default/description": "Profilo estensioni predefinito (scelta consigliata)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Impostazione predefinita", + "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", + "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", + "symbols/Fixture/choices/None/displayName": "Nessuno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metodo fixture AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metodo fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metodo fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metodo fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Test1.cs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..09321cdb1653 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest テスト プロジェクト", + "description": "Windows、Linux、MacOS 上の .NET Core で実行できる MSTest テストを含むプロジェクト。", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows のみ)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows のみ)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk を使用します", + "symbols/TestRunner/description": "ランナー/プラットフォームを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner を使用する (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest プラットフォームを使用する", + "symbols/CoverageTool/description": "プロジェクトに使用するカバレッジ ツール。", + "symbols/CoverageTool/displayName": "カバレッジ ツール", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft コード カバレッジ", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "MSTest Runner を使用する場合は、SDK 拡張機能プロファイルを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/ExtensionsProfile/displayName": "拡張機能プロファイルをテストしています", + "symbols/ExtensionsProfile/choices/Default/description": "既定の拡張機能プロファイル (推奨)", + "symbols/ExtensionsProfile/choices/Default/displayName": "既定値", + "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", + "symbols/ExtensionsProfile/choices/None/displayName": "なし", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", + "symbols/Fixture/choices/None/displayName": "なし", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Test1.cs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..e68a99877040 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 MSTest 테스트가 포함된 프로젝트", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7(Windows만 해당)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6(Windows만 해당)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk 사용", + "symbols/TestRunner/description": "실행기/플랫폼을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest 실행기 사용(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest 플랫폼 사용", + "symbols/CoverageTool/description": "프로젝트에 사용할 검사 도구입니다.", + "symbols/CoverageTool/displayName": "적용 범위 도구", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 코드 검사", + "symbols/CoverageTool/choices/coverlet/description": "침대보", + "symbols/ExtensionsProfile/description": "MSTest 실행기를 사용할 때 SDK 확장 프로필을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/ExtensionsProfile/displayName": "확장 프로필 테스트 중", + "symbols/ExtensionsProfile/choices/Default/description": "기본 확장 프로필(권장)", + "symbols/ExtensionsProfile/choices/Default/displayName": "기본값", + "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", + "symbols/ExtensionsProfile/choices/None/displayName": "없음", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", + "symbols/Fixture/choices/None/displayName": "없음", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture 메서드", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture 메서드", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture 메서드", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture 메서드", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Test1.cs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..c53d7265a1e9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest — projekt testowy", + "description": "Projekt zawierający testy MSTest, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i MacOS.", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (tylko system Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (tylko system Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": "Platforma .NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Korzystaj z narzędzia MSTest.Sdk", + "symbols/TestRunner/description": "Wybierz moduł uruchamiający/platformę. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Moduł uruchamiający", + "symbols/TestRunner/choices/MSTest/description": "Korzystanie z modułu uruchamiającego MSTest (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Korzystanie z platformy VSTest", + "symbols/CoverageTool/description": "Narzędzie pokrycia do użycia w projekcie.", + "symbols/CoverageTool/displayName": "Narzędzie pokrycia", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrycie kodu firmy Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wybierz profil rozszerzeń zestawu SDK podczas korzystania z modułu uruchamiającego MSTest. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testowanie profilu rozszerzeń", + "symbols/ExtensionsProfile/choices/Default/description": "Domyślny profil rozszerzeń (rekomendowane)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Wartość domyślna", + "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", + "symbols/ExtensionsProfile/choices/None/displayName": "Brak", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/choices/None/description": "Brak metod początkowych", + "symbols/Fixture/choices/None/displayName": "Brak", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup — metoda początkowa", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize — metoda początkowa", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup — metoda początkowa", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize — metoda początkowa", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..411b123e9f10 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste MSTest", + "description": "Um projeto que contém testes do MSTest que podem ser executados no .NET no Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (somente Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (somente Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.Sdk", + "symbols/TestRunner/description": "Selecione o executor/plataforma. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Executor de teste", + "symbols/TestRunner/choices/MSTest/description": "Usar o MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usar a plataforma VSTest", + "symbols/CoverageTool/description": "A ferramenta de cobertura a ser usada para o projeto.", + "symbols/CoverageTool/displayName": "Ferramenta Cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de Código da Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selecione o perfil de extensões do SDK ao usar o Executor do MSTest. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testando o perfil de extensões", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensões padrão (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Padrão", + "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", + "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/choices/None/description": "Nenhum método de acessório", + "symbols/Fixture/choices/None/displayName": "Nenhum", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de acessório AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de acessório ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de acessório ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de acessório TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o Test1.cs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..749193e1ce93 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,54 @@ +{ + "author": "Майкрософт", + "name": "Тестовый проект MSTest", + "description": "Проект, содержащий тесты MSTest, которые могут работать на .NET в Windows, Linux и MacOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (только для Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (только для Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Использовать MSTest.Sdk", + "symbols/TestRunner/description": "Выберите средство выполнения тестов или платформу. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Средство выполнения тестов", + "symbols/TestRunner/choices/MSTest/description": "Используйте MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Используйте платформу VSTest", + "symbols/CoverageTool/description": "Инструмент покрытия, который следует использовать для проекта.", + "symbols/CoverageTool/displayName": "Средство оценки объема протестированного кода", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Покрытие кода (Майкрософт)", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Выберите профиль расширений SDK при использовании MSTest Runner. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Проверка профиля расширений", + "symbols/ExtensionsProfile/choices/Default/description": "Профиль расширений по умолчанию (рекомендуется)", + "symbols/ExtensionsProfile/choices/Default/displayName": "По умолчанию", + "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", + "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", + "symbols/Fixture/choices/None/displayName": "Отсутствует", + "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Метод работы со средствами AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Метод работы со средствами ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Метод работы со средствами ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Метод работы со средствами TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает Test1.cs редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..42d34ca1cded --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen MSTest testlerini içeren bir proje.", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (yalnızca Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (yalnızca Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk kullan", + "symbols/TestRunner/description": "Çalıştırıcıyı/platformu seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test çalıştırıcı", + "symbols/TestRunner/choices/MSTest/description": "MSTest Çalıştırıcısı'nı kullan (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest platformunu kullan", + "symbols/CoverageTool/description": "Projede kullanılacak kapsam aracı.", + "symbols/CoverageTool/displayName": "Kapsam aracı", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Kod Kapsamı", + "symbols/CoverageTool/choices/coverlet/description": "kapakçık", + "symbols/ExtensionsProfile/description": "MSTest Çalıştırıcısı kullanılırken SDK uzantıları profilini seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Uzantılar profili test ediliyor", + "symbols/ExtensionsProfile/choices/Default/description": "Varsayılan uzantılar profili (önerilen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Varsayılan", + "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", + "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", + "symbols/Fixture/choices/None/displayName": "Hiçbiri", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup düzen yöntemi", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize düzen yöntemi", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup düzen yöntemi", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize düzen yöntemi", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..7d517926052d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 测试项目", + "description": "一个包含 MSTest 测试的项目，这些测试可在 Windows、Linux 和 MacOS 的 .NET 上运行。", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (仅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (仅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "选择运行器/平台。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 运行器(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用于项目的覆盖率工具。", + "symbols/CoverageTool/displayName": "覆盖工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 代码覆盖率", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "使用 MSTest 运行器时选择 SDK 扩展配置文件。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "测试扩展配置文件", + "symbols/ExtensionsProfile/choices/Default/description": "默认扩展配置文件(推荐)", + "symbols/ExtensionsProfile/choices/Default/displayName": "默认", + "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", + "symbols/ExtensionsProfile/choices/None/displayName": "无", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/choices/None/description": "无固定例程方法", + "symbols/Fixture/choices/None/displayName": "无", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固定例程方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固定例程方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固定例程方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固定例程方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Test1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..d32c47c8640f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 測試專案", + "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行的 MSTest 測試的專案。", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (僅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (僅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "選取執行器/平台。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "測試執行器", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 執行器 (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用於專案的涵蓋範圍工具。", + "symbols/CoverageTool/displayName": "涵蓋範圍工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 程式碼涵蓋範圍", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "選取使用 MSTest 執行器時的 SDK 延伸模組設定檔。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "正在測試擴充功能設定檔", + "symbols/ExtensionsProfile/choices/Default/description": "預設延伸模組設定檔 (建議)", + "symbols/ExtensionsProfile/choices/Default/displayName": "預設", + "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", + "symbols/ExtensionsProfile/choices/None/displayName": "無", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/choices/None/description": "沒有固件方法", + "symbols/Fixture/choices/None/displayName": "無", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固件方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固件方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固件方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固件方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json new file mode 100644 index 000000000000..0c8a0f8fd9e2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json @@ -0,0 +1,253 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Test", "MSTest"], + "name": "MSTest Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", + "groupIdentity": "Microsoft.Test.MSTest", + "precedence": "11000", + "identity": "Microsoft.Test.MSTest.CSharp.9.0", + "shortName": "mstest", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", + "description": ".NET 9 (Windows only)" + }, + { + "choice": "net8.0", + "description": ".NET 8" + }, + { + "choice": "net8.0-windows", + "description": ".NET 8 (Windows only)" + }, + { + "choice": "net7.0", + "description": ".NET 7" + }, + { + "choice": "net7.0-windows", + "description": ".NET 7 (Windows only)" + }, + { + "choice": "net6.0", + "description": ".NET 6" + }, + { + "choice": "net6.0-windows", + "description": ".NET 6 (Windows only)" + }, + { + "choice": "netcoreapp3.1", + "description": ".NET Core 3.1" + }, + { + "choice": "net481", + "description": ".NET Framework 4.8.1" + }, + { + "choice": "net48", + "description": ".NET Framework 4.8" + }, + { + "choice": "net472", + "description": ".NET Framework 4.7.2" + }, + { + "choice": "net471", + "description": ".NET Framework 4.7.1" + }, + { + "choice": "net47", + "description": ".NET Framework 4.7" + }, + { + "choice": "net462", + "description": ".NET Framework 4.6.2" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + }, + "UseMSTestSdk": { + "type": "parameter", + "datatype": "bool", + "description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "displayName": "Use MSTest.Sdk", + "defaultValue": "False" + }, + "TestRunner": { + "type": "parameter", + "datatype": "choice", + "enableQuotelessLiterals": true, + "description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Test runner", + "defaultValue": "VSTest", + "choices": [ + { + "choice": "MSTest", + "description": "Use MSTest Runner (Microsoft.Testing.Platform)" + }, + { + "choice": "VSTest", + "description": "Use VSTest platform" + } + ] + }, + "CoverageTool": { + "type": "parameter", + "datatype": "choice", + "description": "The coverage tool to use for the project.", + "displayName": "Coverage tool", + "defaultValue": "Microsoft.CodeCoverage", + "choices": [ + { + "choice": "Microsoft.CodeCoverage", + "description": "Microsoft Code Coverage" + }, + { + "choice": "coverlet", + "description": "coverlet" + } + ] + }, + "ExtensionsProfile": { + "type": "parameter", + "datatype": "choice", + "description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Testing extensions profile", + "isEnabled": "UseMSTestSdk && (TestRunner == MSTest)", + "defaultValue": "Default", + "replaces": "$(ExtensionsProfile)", + "choices": [ + { + "choice": "Default", + "description": "Default extensions profile (recommended)", + "displayName": "Default" + }, + { + "choice": "None", + "description": "No extensions are enabled", + "displayName": "None" + }, + { + "choice": "AllMicrosoft", + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + } + ] + }, + "Fixture": { + "type": "parameter", + "datatype": "choice", + "description": "Select the fixture kinds to include in the project.", + "allowMultipleValues": true, + "enableQuotelessLiterals": true, + "defaultValue": "None", + "choices": [ + { + "choice": "None", + "description": "No fixture methods", + "displayName": "None" + }, + { + "choice": "AssemblyInitialize", + "description": "AssemblyInitialize fixture method" + }, + { + "choice": "AssemblyCleanup", + "description": "AssemblyCleanup fixture method" + }, + { + "choice": "ClassInitialize", + "description": "ClassInitialize fixture method" + }, + { + "choice": "ClassCleanup", + "description": "ClassCleanup fixture method" + }, + { + "choice": "TestInitialize", + "description": "TestInitialize fixture method" + }, + { + "choice": "TestCleanup", + "description": "TestCleanup fixture method" + } + ] + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "MSTestSettings.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Test1.cs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Test1.cs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj new file mode 100644 index 000000000000..59a43fb59608 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj @@ -0,0 +1,72 @@ + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + + + + + + + + + + true + $(ExtensionsProfile) + + + + + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + Exe + true + + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs new file mode 100644 index 000000000000..aaf278c844f0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs @@ -0,0 +1 @@ +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs new file mode 100644 index 000000000000..9224c7fa9a7a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs @@ -0,0 +1,58 @@ +namespace Company.TestProject1; + +[TestClass] +public sealed class Test1 +{ +#if (Fixture == AssemblyInitialize) + [AssemblyInitialize] + public static void AssemblyInit(TestContext context) + { + // This method is called once for the test assembly, before any tests are run. + } + +#endif +#if (Fixture == AssemblyCleanup) + [AssemblyCleanup] + public static void AssemblyCleanup() + { + // This method is called once for the test assembly, after all tests are run. + } + +#endif +#if (Fixture == ClassInitialize) + [ClassInitialize] + public static void ClassInit(TestContext context) + { + // This method is called once for the test class, before any tests of the class are run. + } + +#endif +#if (Fixture == ClassCleanup) + [ClassCleanup] + public static void ClassCleanup() + { + // This method is called once for the test class, after all tests of the class are run. + } + +#endif +#if (Fixture == TestInitialize) + [TestInitialize] + public void TestInit() + { + // This method is called before each test method. + } + +#endif +#if (Fixture == TestCleanup) + [TestCleanup] + public void TestCleanup() + { + // This method is called after each test method. + } + +#endif + [TestMethod] + public void TestMethod1() + { + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..8cb77b63f5c4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "UseMSTestSdk": { + "shortName": "", + "longName": "sdk" + }, + "TestRunner": { + "shortName": "", + "longName": "test-runner" + }, + "CoverageTool": { + "shortName": "", + "longName": "coverage-tool" + }, + "ExtensionsProfile": { + "shortName": "", + "longName": "extensions-profile" + }, + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..bdd89182698f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "symbolInfo": [ + { + "id": "UseMSTestSdk", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "TestRunner", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "ExtensionsProfile", + "isVisible": true + }, + { + "id": "CoverageTool", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "Fixture", + "isVisible": true + } + ], + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..671271e7595d5a5b30325db0bdaad7d5469e58dd GIT binary patch literal 55748 zcmeHw2S8NE^Zy=Qu|Vt<)Wqo5N{m>7aEiv>1vM%VH8EDi#IA4}6{1GaXzYq6b`iT+ z!4@@9QITLl54(T`3q{)g=kt!eJkFzon*T2Yd++UgTV}S*&d$#6V@$zHGHYuKx*D;^ z28{j97_+d@`0FSbJ7&mO^>9eS+mWbFgElD#_H73y#KB;VS@Nxmeu%!Oc?w9qR8KxeMh(r45#!ce`|7-E#W~A2~m;sZdkV#_&Ow`0QHO+XSdCw<$O*EBYQc_Y91yOl< zYy2t-=f!#Aq(sSY=1u8R93N9nlJtrv(a)re1mNfNev)cZ98!cA?j!}_X=p|Xv@~*L^}_mdjW;k z&NFCFMEQDg?u}aW^5IF7=sIztZ_=di9Xli?`6fWm27CY)ZZ1Y+A#SY+9pH%+qExYtyC;YuBzF>(r?e>(;Fs>)Ep>>(i$X>)*dW z8#HJT`}*sz*|*<*%Z3jh&c=)x!^Vvp$A0+X2R3=~WHx>JbT+%y1m>-r#C%#$W^>z3 zWj}ZHWDB~e*rHyu+2THP*s=lh*s39ZY|YR`%>TQ^?6*-%*#`IJY|Df-Y{rZkZ0_8- zY{7yB?3Z7DVZZ+RD_gyKHQPC3Bil1)E8F9?A+!P?0mp!7IG|vT{&=`9Y21Y z{qe^i?Cc+B*`I&@$u3;Dz^)w+W7kh!Ww-yl!PMt(vdfn*v+(e6roI%(Zrr%RA|oT& zy|5_u@Y+50_{IYk9r=*mxpRj-eE5((y&KD(KX}Tbqodi=r%&07=s5QJ=}Y$F#S513 z;x&tpk7r5oNi6wIGD}TPVQDF;EImD)m2JdW%^p-=V;O7Z$5@x0jP(y?Y*-v4zGcbg zavQda_hdV`2Mgf~*%iKv-RGAjevDeIP4SgI82f50jU9e8KJ8>|3&lSX$Jk|xe~seb zrug?Lel*2@PVp0D@f+1jZHmjQvAjg-=5-krTCOq+;ECN*^=?OHjJW)K@t$)S_gKaF!rhGTI?MQFwJg3h#kZyS zT`2xwia&|sFQE9pQ~W&?{}{zTL-8rkg^?8h0mYBg#;?yBvCfpja7w|OQrJK#oT3!& zPzrIDoV~Q+>~&Ah59EcWt0@y#ecN}wFYuR`%_Q2g2yzdpscx8$s!4QC!bIh*f6 zX)WX|co%0kE^FeuX~A6rtrs_VlJP)xqY0S1U!*}!B$i_&gdgN++cZn)k~s+q?_8&t zan|sOOQr}EzNtypp^eRy64BZ?6u!ABg*P$B@7wV4Ky6Uz2KbaVHa4r%+4Akc^t?^x z;8NMxni!XMc5kUKgR+htJBYsyPMWfGcPedc>fql0qqj3C-n@h)D`|e3P+o+OyBlTj zk-iK}YIi9vOXRbR^j)1x8Jjk9@BbDB=AE6&lANr8(x#tj(s%1HfHJUnI|Gxtu5JSd z4#<|2IEHbjBR+ZmMTnSn4a?!82K_u3!#M-e&c6p=}jOjYG1!n@Trb3g`7+%i*8 zsu!jE56HqBmvN>>QLYQ(jkO-l4e+a7vIA9<9&px%AJn$Tz;-<- ziWJ_2YDv#uu~t^B(Le%smmU=x(f>dV{nVZGf=LT2R-sz8YBl@XRW+zk)v!X%zEb+1 zmC_5POSiUS3PVG~N`36Dj4D+(s{FrxQuqNRhwFu}tXM6Q+rJ#-(yc=MPURa6(BP9X zg1>zkWW^eMMc_vGl&@ltfsam!$-ET4T-7R7t^3+r8&#%%4L-5}I=6#r7y&BxaqC^# zhW@FI%WE7hEEBkOZx84?$bC@PKJ-s7vkjjqvc~f^kvTlk%!2;=eP1Pjd8#!zB{}Up zmF5Ck$e5>2Z7@=rm$q%&mUZaRL7JEL>eY)mIXS&GFa7Sj@7UF&8SH>G*0G$&oLUz(F{+_;f# z+qR7b1_rX-yLYn#2M(~Hpdfba*fDl|RS-M1?kGFI;}2;*8g}p^J9+XXJAL{zJ9q9J zJAeMXG#9=3M+Ccd?mD}4>5?=Ty?*^VyLIapdk}s{nuEsNe$4LOyC=;-W22(klRGi& z+5IQldFacSxQsbyJWEJOU`ekN$tAHjZ{A4r(A121Xe*j04xoABWSS=~qj};!nkQbB z%@hBdr~WrjeP8ob*9_>V0aw?In|}Q=?&v)pX_F4*)H0s8f8ZK8M! zK9;?2W2`VNX_P65X8~%ncWrG{yelR0512JD#_(uN z&+)#OwLt?XSpo(PTbcuk7c-;xu6WeoYGZ9s8wqGa z7&aEjbu1~xFI~&d$h2)6L1u|=|GY?Z4r3Si6@trMfdbBb! zY2#S3c=6&!ic&qqYuAoa{!UhQuDz@bY7$bt9L)?{YG2cP(C2K`%GH$;aCCKb{=~qd zm;AkyKi>B$t!U!v>S$tQ_s?s2eAgOyZ)a%QG1Gf(eAgNVpHVJ`rd>0=*XB>}ZJeCG zkiYMz#lMwnzYe7gikB*7ZeY?%Tl21({9S>+vvo%48&H*HK&JSg*VHtznvHrA$xS+KXi1H))GeNuNeI$R6hCL`DXDd4z>tx_uuY4DJ->-My-sl5PrOh*o zk+tfUYuB@9-%iz))!S3Ya4Jorq#R0o$|_W<+OC>qCCh5vDS)G0W@z(2%R2RJySJ!V zzhVogOdSik64Wcx%wE|=#LtAf8J5*^_#lbm))J%c8LsoTm?$oD~vy>jv z%o4QnzA8iD8?wZWQ{gP~Yy?wZyvZUWBG~QQw^{V9M=UBT ziamPth(T_6{P;0@^5hANd-RNS*U#B2(p~?fzmCt)UnjCRq{EhEhYY!47k@x{=702| ztPv@0d(Z;rSW*i6)hC6nEh%)Bq|oieEcpOtL-IvW?#(>-YPOK?X1n+~ivN#3)`0Zc zMm-oa8OxZNA7jOLGG{4-5{`@2MpPXXzpFX|khpA7uYuPLVnoI1ov8Ab*=C5o^ zQsvn-GA^x|-6+b{uV25Z-4|8LRFPPRNtt41rd92l)iC>*ObVERb<@U;>sr}0EmPJK z0g5%H*bS`hnpXLrX^raT3_m8XX;~TGjQ7<|tDBbn!cO>G zmNhjqvuvvMJG5-xym?CpTN?+5#-G?VEo)^>U}asc(&wMmuJc8+%9a`^Z(gycc_~}% z81ZR|O0`N>_{ZP8Uc(kmZ0$5$F#o?l_2|~VWbw*asVv#CL)%^&#!4KQ)`r-?ahty- zHvCP;wypb2y7BbZxxjKx)k9vKoZoz1^D}iTdprMR=CQ`I$LDqGG_M`AyNqL(GvAFe z{pgGT{ZXuJ(`pmv%yyhKx#EK0AiLSJpLC8YUR@Ffh2JV*W-( z{t7EYcxE1D_ZP6e*6eIG#dpWg!1IG!Bi5o8t45J7nyC~C29e1r>hwxeJ}UL{IUkeI z(qWLVdrG3MnQGl-vz_ykYq2r>wuwU3+#o99`DhE~lluojR}Cy~zFzP}+GsO&>h%6L zmdt>)-WAZpNX3+wg6b^}4Gpp1*tfDm*~?5dpr^6h*o)J`oPIbsx7CVuF1~jje3s;H z5cO*Z)@i`HJKmn|mh8Y0Q`Hiy9TqInj4fI?m>v4zLg=r2)QGe+hhNj{T}v&)d^*Ng zR4#pD*f_~sRnnk`FY`Au@~^H?Cd^UyHi~jHV%PT+Q@I}tG&x_BZ7gjvzw&ekOVy9x zlu=a~6LkFMteRcdPEWYLcP%}$WJBwDvs1Q5?{)L4V!#5;lu6OdKf1gR-wqTPNP08kqd-@be>G>tAuC)$`(C>i)~q$Jy5EV5%5PHFL^f zY^2ATEfdw#BW}*Ou6EGa`Wqv5*Gy?grEIC1BvsK1Yi7}&-EGaR7qC-5GG$eTk16WV zqO<|?FtV<$FM`r-P~w&Chu2>zXTXfUWU85#%%6&^-6eP1-qY1T)~(6T{@uLZ^j{)} zD4Aci3iUi!SC#Hu6_;XeudVBKgj(6$&?V}96$ev*y^EcbY}ZM50}cFV`!I#_%DCbo zs-b37dA|-}pKmd{X5_{XZTt4(s_Q8Si?QtwDzmON4UAaFzgn;r&&@2@#|;wMclNcE z%r5q;kPVNgHr_JjmnUA`7w=qu;6*uwK~%+hN0xic^b7k_9iKjCWnU{xzfvKOQ@<(0 zoKro!w2AtH*{oVP?6Y7a|90CI{SHqExN-3NO%ab4+&VNq_UirnL!UlxV`9C(oO-C| zpzci+V~0*^y~8!w<>|FuCu3i2h?!wpy~pz-uP)Bu&xQu9H^;n6NNQnjsan?8Gi-8gR;!Ik)TXtby+;1M z{RO?K#nK)wXY;Mu@S2*ts9MSuW=cMJf{m3?$P6pbq;-{J|471<+RU+yiCgHJRwGW% zDS5lP!!RR%ZdXQCW1Y9cv|_2xhfHa}6mefzU72X~r#&;gxqo!;J>OpFRi;dt^`TX^ zr92M~ZfQPtpi#*4X%?*YC(o)~J2t~irG8`0W}1a0>AMRmAM)Ie!tPf*o??^m?AFa# zkNB|{XBwNAO6ASe(|)rZ6Zv@PnqsP8U`7Zo*)V4L;Tr>LuymrRL=EQAb=$V#wVCIp zwako&TRg$qkG)p1yDOZRh7J6RbQY@;eG66esG5GA*tBk+DlFQv)UlIGwjFM!vNlj%BLa=st{PMdY_KCU zvSg>`09~Jw2xw8oz}kmd+Zrh?6v|OSHGFc2(PuFGeN&ZtBDGo5UYxEF6TNBe{weeO z7+SY_+PFQN71VFt?|o|~7`$xHj7Htu-}Pza!LVeHHrw0os2O){i0_sv?nin~OTN5- znRR&MbLfUqlTb(JCvCM8_y+-OU8hqSBbhRnY4^MrCUK3zMlR|D5$c4zH~p~cnr z4!!)um_~s~uhUbWZ#$s&yh#D=eIEYLV2bZ|(N{LKeq`L+Ox3={sI=+lLq`T4-PkZF zYUZUqhV9sqH*qIRhsOp6KfAwcaKATA`zj_STpt$xV5w{MDHHt7RLu^KP8$>&v9asQ ztNS8cs!W+Mw>`7#khUk-b76YYz0ysmCOo;J-ekA^C*qN%$6ZT4P;E(KtNLesRI6$l zjD51}%vNG;p|^UC+%+%<0-I0XzU+YCu|xwO)qDzZ%Ci0DbLTov>>SXp)Bvw@ zZ?5hdxO-^F$JgsRTPl_{8Ma{0o)N^Qxs*Rcc!Q$X@TAnm8u@gn1((en;rhuI&eWKj_WA3a-<7HW;wK{_CMb zec9{#gy4jP)xN`hET<~cEmhU+lONaGH$K++Q{V8!%@d#13r;xSBy{t(9fwBT2(4r} zc9RbaI##*yoEm{28Ti}Of85tnajCE2njfxo9C7hUi!iT)Jo@#ck!dOWMn-HoJ@2Nw zbET6(UUlmQ|NR3GS=RmMZXFX8m)t)}`*!%$NXOEx`V8_oT`t9Nr}OIXFSc+tKfn0G z%m#H?Wx`~rm8xN~@@CyltJXgw{&(^DjxeiQwD=yaR0pl+pr_`#&5p%TgM!V-gxPk zg{#*a`nNZI-SqK+$Z_*pzB=C|p#0)38;wWoZrr()>JJyy)YB$P_q6yz|I&TyP3MD`ez@Z6;{64hRriO=~ z>>lp$=!nX5uDQx{+R+n%E=Ru#7?t9s7x!tmXZM)TGzgwj|{>|5!#)T~l($`LVdCuAVOxb(s&unT& zec4m7teN|omOS-U_@IfmHe9q%c@m@azi`4Pyy-L7yYcA_EfiBv8z~*0*_^4`d-e0c z(A2Oqit_dQU7C7)Sxn``VXH6*u&7ZuB)GJ3VjoCk9%8r28GW=3ZcWizGxfL zjT%qAmFaWiZn_5#8Z`OAl9*Fvy6^p}&c=#~iO-1@I9C|-!{xnezgJ%BVyS3;-_LRD zfUfS>cD7#anH=5vKzi+dZ_b=_QF>iBrQ+}2{EpE+&$Q$iqeb_89d3`9v21Xp>&1r` zR)&AFbl_)CA3ZVt;V*lZtX%8)J;^QAVy^b?9?+2Q>u*h&Ej{g`bm(uYEWIas!1QQC zFX|#53sbMU8+KcDpMlm^vMVp zReHsUzMGS-jhVE_Ty^Zaw@Y-_G4bE*W?in28gHhWYM)^6rTR$SI{#y8FMhP;%d@pg zN5*ts8y|7{(cf!5_}FPrj4jwy7sH*yLaW~+D$XC-a_qpH2`x%4yO_ALnel0(DC!x# zgHvD5JM`w^%J8}6>TTVVeyBsWH^XAB=G^yDZuh8Do0Yata*Lnr>Xi_2AoYrs@u+Vj z``j`}etJN?HGoRvj^&IAQ-)lxy_}7T4BB<*%v$?udt;qlE8k21#+p6dT}*YX;Xw5x z_v^dASDbRdS;>+jlb_!@eBefM zEbGw4FuBQf^QiGF+ORLnf4TY&D$BddAj_zID;Bk5zaP8rIJmN#FI!fNIhxnJ|LSDG z{)k^9Ms|9s@T;8gs#VFc^VqT)Y_10%*!1X*Bj5I3R7&~yYlpsJ%)w0A%phcX`X1-R zs7yGvgN(Q-uZu9}5e#e;FF& zb=xQ8htsA}R512q4>r1&KDibP`^1u|C#HNI8CiK5Fl++hz+6{9XJh%-QTk>-nJUg|bwz@vFbpN&?4K^vv4#rP^b)i`}jSgj>ys7ac z3wltWJ(=QI+;XfpvuPT#mMUeZ=3oZAi&a6>hPmhubE4hb;b^?M(4q zwyOeFl68Mu*OK1BpPN`Ox#O@nprJu+*HZI>n-^1kX=Ksn=IZr_k5#W;QsMK|z}mm$ zR7F|~bG#^SYLv3PylVRB166F4MivH&$7d$9&ugkId_t0r7`dq|lpiT7t_>T)#{003 zcfL%l^)lQoxuf&;ewI^Q7TOqG^1XJzaO9JcA*Rmh>1_=g`**+6Z{G-~$CKONeSK?_ z^NxX)rhK-j{Kt&lRno*JzPRe-!V`5YS}fk0SY6rB((OU}bE~Eqb!cj`J@rj=O1b_U z#(9=-TUBvZ@}%P{4U;-AHdRdjQnkckbYx;^Kpn$Nwlk*BT4QSMeA(20^x&JPKEI{h zzKHY*2h3QH#s;kHe8!AxG39Z|>t-F^d-V(tOOk2X25Z*TjCE?wMp&@LcfE#82yI~G zvbZ!O=-94X+Z}D(Wt6Bh-wyid2Th5IiJUAqIPEm}U>xmk;Iu2DP>US&Q@yH1 zqNrn9W#Y7}gOkM$rS!$00--2Fs=|>q488U=BIy!P%9sHo&mtTI# z$wCQzwxDEd@Kax#OPUf_mEmIwX?`+w!g+F`tjHjlia$3#jWZC%6%Aly~9`x$c zk7s}X{Wqr_gj)K@Zi$D5g=yO!Sub)I7Z>gO!mexG^k~N-KYR9UfyQC*b!=J2_$CK^ z^y{_(^n0`kJV$(r^Um5pmo8m6?edoTUO~oUvgP4qF_J6#^|b-ChpShwYU97FHUOUU z{P}ZE8*dBL-pFvCljV#Sf6)f?)j!_pYXf8jB*|azstwR?UVi4x8BW$a@05PX0iaQr z51=j54qR;+7G)bipZn>jpQJtud}vp(R0e1Vd2w_sfi!04rT#%Tc)e~L0AE6TgbZHP zZ2VzPo^2aI`b9AokXa?acI_IHFEHene%f%w(GDQ*=(Yj8qn-Li z!UrH%K?X;@g#r1cA8nAVK>7Xq_w}{`xjb5!ZGcW}kmlcoK|9hY2>p;ZHf`D@@gDG^ z-o1Nk$6#HVv@pg3vM}bq{q~#Gr#=Mw!SBf$SgH^3+BtLPWSSQgb{iNrY?#Dz3XArF z)<5bPvOjb#=#QbHp`1<^DUvn--3D1lYk5jxl|ez;KXhQ1LN9T(S}nCneQkhFRgwA_ z@GS@*K;6g0#1t0U+H?v+Kjyi*K)c#9wE^&JgahpW@XH^6{4q-zjdu8PXJ=<^8$utW zlWRCx!xwtp1E0dCA8o+f+dC5u_=Wvb z5c=1zU#}OPD_5>ax?wR-*KGrOBV|0ic=2K;-2!9@I@u??CQ>JejuC*%gBALHQPGd}A=>?ui4RPo6WP$;^#R5ZU7Z=?qb(IB6czoz`NWA695RBaPt41+ zq91Z3+Pesgeh*zjQA1JEkF`O0d(Mu2jFEzNTrnr7Q^<;%{37fBK)fLIXEh%$>;m~v z>;FIcHTqb6^{uPl(HADS&;D)ouS+}pxdnY;|4sB4gm#qC`=%ed8#-Zx)9IFc?b@}O z936O*iT~^C{{^969#`I8ilY9p9)mS0Iun&cXCoiia(j=p4anCwZ{F1E`s6f-dpRxH z-HY(J%AqLehdx9;?&p?f-EfeZ>10;zykAa(xR=wC-Mt9^F6c-52JX7_QCe}i2LklmcPp?d{NYYP*4!3gQ_^}0?-cf<6uVuJ;=0a)1R!ar zeP0yxL%#vp6?4FX*vG-Xj!xTsi*E~B@_N;!9sZo?r##d&H&x5yV*LkgGpqT(JZw?i z=ap`R&kFvH^n;eH${;H`vwHq-rC*dm%9|9Pl9bGG&90uaq8~ONu>F9;y)ICiA6)wv zIKF!Ff^VI)mea}O(iQ%^0`x1e{So#*y750``sq|S{*&VrPN%+0SNIDX{(qw%eMIUr z8U01quUmfE(N8D;NNXF=-Mnje`0!yKdnY>2^)LDi`VH=N{kfqZwYJ> zsdNt~{CI~j2rEDz{aE9~9Or#H-TqHs{owSK4yiwYX5r}T9Gp%7AeW|!yFd$C&nC)&BFH{Gk?^VSOy#DDlU`}6@;dEMWCPydo^2C=3diy{6yPO~7w*S8`dUf-a)31;B$>qYg z`@g2Y|HBV*?*F>^zi+>mr&If-uN~=iy8K+k5zlq~x-?P$du#rq8z#4Y^yR_?QK$5U zBc7Gh<>w-fc&_W$#qUF=Ul-S+@D~>SgJ#$l0JX~kpA+$p+qS$fNx19d0sn?)qTB?oCSKzxe9L^P;_vuzAcc$nnQMZrII> zJWw`ta=Ntl9D9Am^TN6!eXLU!1myUm4zV{1dlrBreZfZBn~vv4j~d!nKlan04zTY7>7n0>^BoGS4q#&n z`x>nK!Oj3SNc08ZY#sU~>>0AdA9P_o4SN~nb%66Z(6Sq&(qcc ztK`sCJdKwbx#0+9#f5zeO&?FZxQ>({S! zgXP&@Q2bE`*lQ#D0c?^%lN=BxI5=36#n5grk1MQwSOvu&cw#RlWEbEDx$DlIJ96}; zu^;lDX!kgi1F}J3Kw;ny83^{FS>ca9Bji4WfvtF9!TZ2pS5_$qEguU0=p(}Ag`N)q ze}T8SzEAwIM-+S==gPs}7Y=$ajNPLD>b4(&x4349ziya^7jQPf20Guc*tdW(dp8chNZKff|kE-dIj;zY2a_8syFEm3IDW|RDN#r3CV5-_5-;A$gntz17|+T zfyzP+hi51k%-{9N&v;*002@!(Il|5bc0UCHefSR^Jeb4Q4`WkdJLuh>KY5lb{NE(J z;n$9b@#x5hTz)U7S0Dc1dl-wvxKx-|oc$bfEJTa{LEk{06i;W)WjNr8c95E!!lQ3K zF!Fm5Mj!r=Ss=p~m4hDk>>p>f_{08FZUZIko9L^teC@Zta8H}j{O3+yeAN&? zKAr9tbW!o0Gd6PiBCOPmbju&}CFlx@(j~l#*W$lr!kSDrOu{}1ef;6Id)%k>WWL8| zD_38Nli$B_4QM=^CH(LA;%-_Ki;$CYVYz~2&y#2sNby4rx z+P0Kc`;jW-9sJ1o=j>J!_@Z93wa)*$#r#Ed9GABrv>DNsvTHx@0Cgz~;Q!mGrQGYY zF>g6v!WFiCsDr0>W2N?fZ0WvC_pl2VAa6h7S#GXqWBCQ(_V~sFu0DVBEq5<0O4_G_ zv|*DB|MQ1WGu_MceINMC^DpQ<@Td97DY{1G#ZjC*h0jacc?^3>#~kQC?>jC5*lEG_ zASdj!l$GB`g6j1{w$u8c?Xalq)NrD|L(h#lEzb2TY=`-}(3yz*a=Oa#yM6n%^t}q` zit){Y!gg2($m==00za%Pj2}NZC!y1&_u1}61kj6R>$`EUtd-m*+ zXocMa=8bv9ON57A1nLHOif36}k?*;4=k%5z${lMV=qHGeI>uU6LCO&8ywEqJ-{K5! z)C=?!`W(()L0ifSKj?C>hAheubIPq-w`$8UKkX2 z^$Q&h)`;;<98rc?KhAF%LVqC73zdep52p`MK3M0H$C2ZQGo!Koh<=MQM0-IQ!nO$X zBVJz05a%!F<-Ek);D>&Ia~Q!#g}o1WAkNLtOFM*}8@`c}7sxGsI3ox4R@f7YGK9V! z=S-phpbT^B%UHwk^YhEI?QCxFLs_A}!3GAp1P>1nsV`$p246xMf`37uBzN+9$GDAk zp}azF@WVQjeEnFIA_YV!-0>352F3a%TJD5cKFHPRy7jxl4`T%6O4zpLG~dJ+h`9jf1@8(! z@ZY$&I1av+(|jHCddQygHl>TFu3z3q^3(q0@$++^9X`70y$}4bPK>p@F34XA-k{_ z&R@t8ziS~^_#eLq^H;GiXkB=(v~DVJl;el*)nPuE9S_OtJ6~G&-Zt5vPi-)Q@1GyQ zLwBE(T=4V-88Zj(0qeI;73=<#uc(D z=D>yJo{-K3?QaU<*o{0*&r;|vn4^QoGS<-Xl!O8p4yu77Pm zC84B?pTM)QuA=`=symF&Xy(DOt_Qc+$y+)TCnER?$J*Y4&MJQRm)(38)%C6)H%aSD zz@fZc`SFzprMlifH-JB)^C1wOXy!rHK526V8DK%|iDKxkmo2z}%Dp^xV)3!(KcqJ2vR+#d?=K zf9M!d2AH?PE(>Lnmoh*+>~}nQ@}#sUTAxi9Yz2WM<`e*tKWui<{{Q;xF9~mifjpm= zGC;Y3F6gPUvd4lwA@=X;=8rfF7cP{(&5SY-x?!x_=B5mw@tc&DS2GCK;zhj!;{5?HA zIrtXl(r5?J$Ac%KFNt+1(WbD*1)U4}1ayF?@7zFk^h3uW)?h$0_9K9oq5jbqfEVVP zaL^}1XAB(B-g67t<&QGQK1>0k48Q~A>*wezSl2`w73*LkPEOanQ1y*{ zXcyoE_}-_WUC^nEgLs}>`XT!rJ9bR6&(BI0!#EGU6V{>S`OEKh@yKodBAz@gefJ`q zxaJflulb8~b9;U8_g#$+g68=806JCdtHl*S_^RPh-{61XC!(F_^@=pGzhQ3MsnQ%? zoFAMv4oc{`XHT2KYOTRqLg4`cp6~t#YA1CROptD@!?8Bk+y7@;0U*Wny zvUA53e(d?srN1C~BQDDNLHHf5gWWXpfs2ibraq7)UEv30(yRbDliaArci}P5hAmrO9QN@- zN01dDeUbyz%a$#Z9vv7UhRA!kF*&`neL@ebdy{{8pgIcSzU%wb`d0NyUrhyEYu z#9+;HIju3|L<3}h%*P;$WBpU^&`vNnk*5#Y5Z_&Zof77cm^)=f18_%~fM$IFSpnxG z$@K%i%CaL;hU3a%HwU zrmWJ(920=@L%W82hkge+7Pf@Y{|Nm;OOfd( zr}PmH`WBS4u)l#k3jLYf7E`3Bdo4)%n41EqT}w_kZTNFaA7zd9gSAD-(y)Po-VZj< z*gGqqSIE;xp1DaMa}(4r%0t)T{5EmMnn+LNA^bVv4}AdIChS0T9p=axd_`MEx@DD9 z`U0PvuGqhI_p(~M)*`}#SLpIL^e?nMtVia?!S>K(p*#IJn)=%xJE{y*`k3z6FNMcL)$`scP& z+_%dN$yNbtuu&Hy`LF$clG4VSCf2kC{&`7PgjExMfvOEW&}#!f=(kHM_wXa3v=20# zpWks>T2IYLKhOKZD4w)0jO70)I9jL6yiY7myU(o1*TW!(l_iI(ki+~;^vYq7S8o@R zJ5GEi3i1>B#acQ;C^t^#XqmV*BZ2l)wdgh&tPN(KZ3a96Ua!*~jrKo>{I zb#i^Fy!;SXo*rZ^oC^wlHs;BwZ^$v=QQ%id8*&`v0DYjF9>!gaxhO}}3*KXl2Tz5~ zGsa}hhqD6R^iamoWn#=jIpX|Y$b7<%8RtY~C8r^etkT0flppqQp#H(nfg8rx>>#`J zAU{D54_Q{M8w&j})t}yEvq}%PoRcR{mUJGFxuMg=S_*W38SOPwdLsR-(nEP+T!1Z= z++iFEcHa)=)(9g1Ss%c()aep8F+vsIHXh9&qej<#%fA+Jai#W07F!W)! z3CAeN3K&~+bn3f&)nGqK&vqr~0>5?cI$u6;zVuDClm17v>B-9?yL+5%fw67<$Y1%+ znVa~1(p3RZjB^;@s0@JLY2cVEN8=UgIHKZT#78B*N{piTQKV;*TpICFN~6%nF^pF* zYp^CK#x120d2|4I(_BhTa&NYd+Nqkt>bjGp=T>8%8hCMb4s&B&K8Ey&U#X$T$GR5e zE-_xnujqT|H|X22p@)O67V(KUsloRkv*Rl4o8|GrQ!!@*|AK>@jlPBWp!>*?Bhnaw zaS3CIJg!(r#P}fWyfJ?TuR?snLyf#aALdmUGvqknEJIx#2xM&VCJ`UHXYg!{&(QCK zmtm{{-$9?%1>N}AiwPc${*3u4^rqk~SUbczfG+5ZPq;|meaBoDJRNf%$Q=4WUwq^b zyus7K+fl|S6EWYAr=u@E_#nnXv?0v5a0L$Foxn{F`r;!DbOK06IJ7rBhkYTwqbC64 zJLaPFPO3lPiTZ?mqR$=PxStjd?~>-W`k29f&B>m>Ed*ca-IybH{C{vX07a_Rs8 literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..455f78c33265 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Testovací projekt MSTest", + "description": "Projekt obsahující testy MSTest, který se dá spustit na .NET v systémech Windows, Linux a MacOS.", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (jenom Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (jenom Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".Net Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Použít MSTest.Sdk", + "symbols/TestRunner/description": "Vyberte spouštěč nebo platformu. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Použít MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Použití platformy VSTest", + "symbols/CoverageTool/description": "Nástroj pokrytí, který se má použít pro projekt.", + "symbols/CoverageTool/displayName": "Nástroj pokrytí", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrytí kódu Microsoftu", + "symbols/CoverageTool/choices/coverlet/description": "pokrývka", + "symbols/ExtensionsProfile/description": "Při použití MSTest Runneru vyberte profil rozšíření sady SDK. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testování profilu rozšíření", + "symbols/ExtensionsProfile/choices/Default/description": "Výchozí profil rozšíření (doporučeno)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Výchozí", + "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", + "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", + "symbols/Fixture/choices/None/displayName": "Žádné", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metoda testovacího přípravku AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metoda testovacího přípravku ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metoda testovacího přípravku ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metoda testovacího přípravku TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Test1.fs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..c21ddc5cb10e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest-Testprojekt", + "description": "Ein Projekt, das MSTest-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (nur Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (nur Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk verwenden", + "symbols/TestRunner/description": "Wählen Sie den Runner/die Plattform aus. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner verwenden (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest-Plattform verwenden", + "symbols/CoverageTool/description": "Das Abdeckungstool, das für das Projekt verwendet werden soll.", + "symbols/CoverageTool/displayName": "Coverage-Tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wählen Sie das SDK-Erweiterungsprofil aus, wenn Sie MSTest Runner verwenden. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Erweiterungsprofil wird getestet", + "symbols/ExtensionsProfile/choices/Default/description": "Standarderweiterungsprofil (empfohlen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Standard", + "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", + "symbols/ExtensionsProfile/choices/None/displayName": "Keine", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", + "symbols/Fixture/choices/None/displayName": "Keine", + "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", + "symbols/Fixture/choices/AssemblyCleanup/description": "Fixierungsmethode \"AssemblyCleanup\"", + "symbols/Fixture/choices/ClassInitialize/description": "Fixturemethode \"ClassInitialize\"", + "symbols/Fixture/choices/ClassCleanup/description": "Fixierungsmethode \"ClassCleanup\"", + "symbols/Fixture/choices/TestInitialize/description": "Fixturemethode \"TestInitialize\"", + "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Test1.fs im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..e75f7d0f0a34 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Project", + "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows only)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows only)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Use MSTest.Sdk", + "symbols/TestRunner/description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/MSTest/description": "Use MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest platform", + "symbols/CoverageTool/description": "The coverage tool to use for the project.", + "symbols/CoverageTool/displayName": "Coverage tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testing extensions profile", + "symbols/ExtensionsProfile/choices/Default/description": "Default extensions profile (recommended)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Default", + "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", + "symbols/ExtensionsProfile/choices/None/displayName": "None", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/choices/None/description": "No fixture methods", + "symbols/Fixture/choices/None/displayName": "None", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture method", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture method", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture method", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture method", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Test1.fs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..2d02065e9a7c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de MSTest", + "description": "Proyecto que contiene pruebas de MSTest que se pueden ejecutar en .NET en Windows, Linux y MacOS.", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.Sdk", + "symbols/TestRunner/description": "Seleccione el ejecutor o la plataforma. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Ejecutor de pruebas", + "symbols/TestRunner/choices/MSTest/description": "Usar MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Uso de la plataforma VSTest", + "symbols/CoverageTool/description": "Herramienta de cobertura que se va a usar para el proyecto.", + "symbols/CoverageTool/displayName": "Herramienta de cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de código de Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "cubrecama", + "symbols/ExtensionsProfile/description": "Seleccione el perfil de extensiones del SDK al usar MSTest Runner. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Probar perfil de extensiones", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensiones predeterminadas (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Valor predeterminado", + "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", + "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", + "symbols/Fixture/choices/None/displayName": "Ninguno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de accesorio AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de accesorio ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de accesorio ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de accesorio TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Test1.fs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..23dc1927f2fe --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projet de test MSTest", + "description": "Un projet qui contient des tests MSTest pouvant être exécutés sur .NET sous Windows, Linux et MacOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows uniquement)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows uniquement)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Utiliser MSTest.Sdk", + "symbols/TestRunner/description": "Sélectionnez l’exécuteur/la plateforme. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Utilisez MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Utiliser la plateforme VSTest", + "symbols/CoverageTool/description": "Outil de couverture à utiliser pour le projet.", + "symbols/CoverageTool/displayName": "Outil de couverture", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Couverture du code Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Sélectionnez le profil d’extensions du Kit de développement logiciel (SDK) lors de l’utilisation de l’exécuteur MSTest. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test du profil d’extensions", + "symbols/ExtensionsProfile/choices/Default/description": "Profil d’extensions par défaut (recommandé)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Par défaut", + "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", + "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", + "symbols/Fixture/choices/None/displayName": "Aucun", + "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Méthode de fixture assemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Méthode de fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Méthode de fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Méthode de fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Test1.fs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..3db678af6144 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Progetto di test MSTest", + "description": "Progetto che contiene i test MSTest eseguibili in .NET in Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usa MSTest.Sdk", + "symbols/TestRunner/description": "Selezionare lo strumento di esecuzione/la piattaforma. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/MSTest/description": "Usa MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usa la piattaforma VSTest", + "symbols/CoverageTool/description": "Strumento di copertura da usare per il progetto.", + "symbols/CoverageTool/displayName": "Strumento di copertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selezionare il profilo delle estensioni SDK quando si usa MSTest Runner. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test del profilo delle estensioni", + "symbols/ExtensionsProfile/choices/Default/description": "Profilo estensioni predefinito (scelta consigliata)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Predefinita", + "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", + "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", + "symbols/Fixture/choices/None/displayName": "Nessuno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metodo fixture AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metodo fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metodo fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metodo fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Test1.fs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..f80b00f9fbb5 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest テスト プロジェクト", + "description": "Windows、Linux、MacOS 上の .NET Core で実行できる MSTest テストを含むプロジェクト。", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows のみ)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows のみ)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk を使用します", + "symbols/TestRunner/description": "ランナー/プラットフォームを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner を使用する (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest プラットフォームを使用する", + "symbols/CoverageTool/description": "プロジェクトに使用するカバレッジ ツール。", + "symbols/CoverageTool/displayName": "カバレッジ ツール", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft コード カバレッジ", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "MSTest Runner を使用する場合は、SDK 拡張機能プロファイルを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/ExtensionsProfile/displayName": "拡張機能プロファイルをテストしています", + "symbols/ExtensionsProfile/choices/Default/description": "既定の拡張機能プロファイル (推奨)", + "symbols/ExtensionsProfile/choices/Default/displayName": "既定値", + "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", + "symbols/ExtensionsProfile/choices/None/displayName": "なし", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", + "symbols/Fixture/choices/None/displayName": "なし", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Test1.fs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..da5128a2360d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 MSTest 테스트가 포함된 프로젝트", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7(Windows만 해당)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6(Windows만 해당)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk 사용", + "symbols/TestRunner/description": "실행기/플랫폼을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest 실행기 사용(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest 플랫폼 사용", + "symbols/CoverageTool/description": "프로젝트에 사용할 검사 도구입니다.", + "symbols/CoverageTool/displayName": "적용 범위 도구", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 코드 검사", + "symbols/CoverageTool/choices/coverlet/description": "침대보", + "symbols/ExtensionsProfile/description": "MSTest 실행기를 사용할 때 SDK 확장 프로필을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/ExtensionsProfile/displayName": "확장 프로필 테스트 중", + "symbols/ExtensionsProfile/choices/Default/description": "기본 확장 프로필(권장)", + "symbols/ExtensionsProfile/choices/Default/displayName": "기본값", + "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", + "symbols/ExtensionsProfile/choices/None/displayName": "없음", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", + "symbols/Fixture/choices/None/displayName": "없음", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture 메서드", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture 메서드", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture 메서드", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture 메서드", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Test1.fs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..abd4970b8b7a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest — projekt testowy", + "description": "Projekt zawierający testy MSTest, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i MacOS.", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (tylko system Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (tylko system Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": "Platforma .NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Korzystaj z narzędzia MSTest.Sdk", + "symbols/TestRunner/description": "Wybierz moduł uruchamiający/platformę. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Moduł uruchamiający", + "symbols/TestRunner/choices/MSTest/description": "Korzystanie z modułu uruchamiającego MSTest (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Korzystanie z platformy VSTest", + "symbols/CoverageTool/description": "Narzędzie pokrycia do użycia w projekcie.", + "symbols/CoverageTool/displayName": "Narzędzie pokrycia", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrycie kodu firmy Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wybierz profil rozszerzeń zestawu SDK podczas korzystania z modułu uruchamiającego MSTest. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testowanie profilu rozszerzeń", + "symbols/ExtensionsProfile/choices/Default/description": "Domyślny profil rozszerzeń (rekomendowane)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Wartość domyślna", + "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", + "symbols/ExtensionsProfile/choices/None/displayName": "Brak", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/choices/None/description": "Brak metod początkowych", + "symbols/Fixture/choices/None/displayName": "Brak", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup — metoda początkowa", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize — metoda początkowa", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup — metoda początkowa", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize — metoda początkowa", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Test1.fs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..b8a4ed5ce34c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste MSTest", + "description": "Um projeto que contém testes do MSTest que podem ser executados no .NET no Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (somente Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (somente Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.Sdk", + "symbols/TestRunner/description": "Selecione o executor/plataforma. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Executor de teste", + "symbols/TestRunner/choices/MSTest/description": "Usar o MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usar a plataforma VSTest", + "symbols/CoverageTool/description": "A ferramenta de cobertura a ser usada para o projeto.", + "symbols/CoverageTool/displayName": "Ferramenta de cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de Código da Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selecione o perfil de extensões do SDK ao usar o Executor do MSTest. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testando o perfil de extensões", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensões padrão (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Padrão", + "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", + "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/choices/None/description": "Nenhum método de acessório", + "symbols/Fixture/choices/None/displayName": "Nenhum", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de acessório AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de acessório ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de acessório ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de acessório TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o Test1.fs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..d1f5c0093310 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,54 @@ +{ + "author": "Майкрософт", + "name": "Тестовый проект MSTest", + "description": "Проект, содержащий тесты MSTest, которые могут работать на .NET в Windows, Linux и MacOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (только для Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (только для Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Использовать MSTest.Sdk", + "symbols/TestRunner/description": "Выберите средство выполнения тестов или платформу. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Используйте MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Используйте платформу VSTest", + "symbols/CoverageTool/description": "Инструмент покрытия, который следует использовать для проекта.", + "symbols/CoverageTool/displayName": "Средство охвата", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Покрытие кода (Майкрософт)", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Выберите профиль расширений SDK при использовании MSTest Runner. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Проверка профиля расширений", + "symbols/ExtensionsProfile/choices/Default/description": "Профиль расширений по умолчанию (рекомендуется)", + "symbols/ExtensionsProfile/choices/Default/displayName": "По умолчанию", + "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", + "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", + "symbols/Fixture/choices/None/displayName": "Отсутствует", + "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Метод работы со средствами AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Метод работы со средствами ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Метод работы со средствами ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Метод работы со средствами TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает Test1.fs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..e7754242a4ab --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen MSTest testlerini içeren bir proje.", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (yalnızca Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (yalnızca Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk’sını kullan", + "symbols/TestRunner/description": "Çalıştırıcıyı/platformu seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test çalıştırıcı", + "symbols/TestRunner/choices/MSTest/description": "MSTest Çalıştırıcısı'nı kullan (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest platformunu kullan", + "symbols/CoverageTool/description": "Projede kullanılacak kapsam aracı.", + "symbols/CoverageTool/displayName": "Kapsam aracı", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Kod Kapsamı", + "symbols/CoverageTool/choices/coverlet/description": "kapakçık", + "symbols/ExtensionsProfile/description": "MSTest Çalıştırıcısı kullanılırken SDK uzantıları profilini seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Uzantılar profili test ediliyor", + "symbols/ExtensionsProfile/choices/Default/description": "Varsayılan uzantılar profili (önerilen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Varsayılan", + "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", + "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", + "symbols/Fixture/choices/None/displayName": "Hiçbiri", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup düzen yöntemi", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize düzen yöntemi", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup düzen yöntemi", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize düzen yöntemi", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Test1.fs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..44975680716f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 测试项目", + "description": "一个包含 MSTest 测试的项目，这些测试可在 Windows、Linux 和 MacOS 的 .NET 上运行。", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (仅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (仅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "选择运行器/平台。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "测试运行程序", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 运行器(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用于项目的覆盖率工具。", + "symbols/CoverageTool/displayName": "覆盖率工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 代码覆盖率", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "使用 MSTest 运行器时选择 SDK 扩展配置文件。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "测试扩展配置文件", + "symbols/ExtensionsProfile/choices/Default/description": "默认扩展配置文件(推荐)", + "symbols/ExtensionsProfile/choices/Default/displayName": "默认", + "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", + "symbols/ExtensionsProfile/choices/None/displayName": "无", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/choices/None/description": "无固定例程方法", + "symbols/Fixture/choices/None/displayName": "无", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固定例程方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固定例程方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固定例程方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固定例程方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Test1.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..09330aae0236 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest 測試專案", + "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行的 MSTest 測試的專案。", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (僅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (僅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "選取執行器/平台。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "測試執行器", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 執行器 (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用於專案的涵蓋範圍工具。", + "symbols/CoverageTool/displayName": "涵蓋範圍工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 程式碼涵蓋範圍", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "選取使用 MSTest 執行器時的 SDK 延伸模組設定檔。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "正在測試擴充功能設定檔", + "symbols/ExtensionsProfile/choices/Default/description": "預設延伸模組設定檔 (建議)", + "symbols/ExtensionsProfile/choices/Default/displayName": "預設", + "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", + "symbols/ExtensionsProfile/choices/None/displayName": "無", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/choices/None/description": "沒有固件方法", + "symbols/Fixture/choices/None/displayName": "無", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固件方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固件方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固件方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固件方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Test1.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json new file mode 100644 index 000000000000..4104522fca5a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json @@ -0,0 +1,253 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Test", "MSTest"], + "name": "MSTest Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", + "groupIdentity": "Microsoft.Test.MSTest", + "precedence": "11000", + "identity": "Microsoft.Test.MSTest.FSharp.9.0", + "shortName": "mstest", + "tags": { + "language": "F#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", + "description": ".NET 9 (Windows only)" + }, + { + "choice": "net8.0", + "description": ".NET 8" + }, + { + "choice": "net8.0-windows", + "description": ".NET 8 (Windows only)" + }, + { + "choice": "net7.0", + "description": ".NET 7" + }, + { + "choice": "net7.0-windows", + "description": ".NET 7 (Windows only)" + }, + { + "choice": "net6.0", + "description": ".NET 6" + }, + { + "choice": "net6.0-windows", + "description": ".NET 6 (Windows only)" + }, + { + "choice": "netcoreapp3.1", + "description": ".NET Core 3.1" + }, + { + "choice": "net481", + "description": ".NET Framework 4.8.1" + }, + { + "choice": "net48", + "description": ".NET Framework 4.8" + }, + { + "choice": "net472", + "description": ".NET Framework 4.7.2" + }, + { + "choice": "net471", + "description": ".NET Framework 4.7.1" + }, + { + "choice": "net47", + "description": ".NET Framework 4.7" + }, + { + "choice": "net462", + "description": ".NET Framework 4.6.2" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + }, + "UseMSTestSdk": { + "type": "parameter", + "datatype": "bool", + "description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "displayName": "Use MSTest.Sdk", + "defaultValue": "False" + }, + "TestRunner": { + "type": "parameter", + "datatype": "choice", + "enableQuotelessLiterals": true, + "description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Test runner", + "defaultValue": "VSTest", + "choices": [ + { + "choice": "MSTest", + "description": "Use MSTest Runner (Microsoft.Testing.Platform)" + }, + { + "choice": "VSTest", + "description": "Use VSTest platform" + } + ] + }, + "CoverageTool": { + "type": "parameter", + "datatype": "choice", + "description": "The coverage tool to use for the project.", + "displayName": "Coverage tool", + "defaultValue": "Microsoft.CodeCoverage", + "choices": [ + { + "choice": "Microsoft.CodeCoverage", + "description": "Microsoft Code Coverage" + }, + { + "choice": "coverlet", + "description": "coverlet" + } + ] + }, + "ExtensionsProfile": { + "type": "parameter", + "datatype": "choice", + "description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Testing extensions profile", + "isEnabled": "UseMSTestSdk && (TestRunner == MSTest)", + "defaultValue": "Default", + "replaces": "$(ExtensionsProfile)", + "choices": [ + { + "choice": "Default", + "description": "Default extensions profile (recommended)", + "displayName": "Default" + }, + { + "choice": "None", + "description": "No extensions are enabled", + "displayName": "None" + }, + { + "choice": "AllMicrosoft", + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + } + ] + }, + "Fixture": { + "type": "parameter", + "datatype": "choice", + "description": "Select the fixture kinds to include in the project.", + "allowMultipleValues": true, + "enableQuotelessLiterals": true, + "defaultValue": "None", + "choices": [ + { + "choice": "None", + "description": "No fixture methods", + "displayName": "None" + }, + { + "choice": "AssemblyInitialize", + "description": "AssemblyInitialize fixture method" + }, + { + "choice": "AssemblyCleanup", + "description": "AssemblyCleanup fixture method" + }, + { + "choice": "ClassInitialize", + "description": "ClassInitialize fixture method" + }, + { + "choice": "ClassCleanup", + "description": "ClassCleanup fixture method" + }, + { + "choice": "TestInitialize", + "description": "TestInitialize fixture method" + }, + { + "choice": "TestCleanup", + "description": "TestCleanup fixture method" + } + ] + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.fsproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "MSTestSettings.fs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Test1.fs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Test1.fs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj new file mode 100644 index 000000000000..32f1d7f35847 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj @@ -0,0 +1,82 @@ + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + + + + + + + + + + true + $(ExtensionsProfile) + + + + + + + + + + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + Exe + true + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs new file mode 100644 index 000000000000..63af03a4340a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs @@ -0,0 +1,6 @@ +module MSTestSettings + +open Microsoft.VisualStudio.TestTools.UnitTesting + +[] +do() diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs new file mode 100644 index 000000000000..c84f25a1b906 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs @@ -0,0 +1,53 @@ +namespace Company.TestProject1 + +open System +open Microsoft.VisualStudio.TestTools.UnitTesting + +[] +type Test1 () = + +#if (Fixture == AssemblyInitialize) + [] + static member AssemblyInit (context: TestContext) = + // This method is called once for the test assembly, before any tests are run. + () + +#endif +#if (Fixture == AssemblyCleanup) + [] + static member AssemblyCleanup () = + // This method is called once for the test assembly, after all tests are run. + () + +#endif +#if (Fixture == ClassInitialize) + [] + member this.ClassInit (context: TestContext) = + // This method is called once for the test class, before any tests of the class are run. + () + +#endif +#if (Fixture == ClassCleanup) + [] + member this.ClassCleanup () = + // This method is called once for the test class, after all tests of the class are run. + () + +#endif +#if (Fixture == TestInitialize) + [] + member this.TestInit () = + // This method is called before each test method. + () + +#endif +#if (Fixture == TestCleanup) + [] + member this.TestCleanup () = + // This method is called after each test method. + () + +#endif + [] + member this.TestMethodPassing () = + Assert.IsTrue(true); diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..8cb77b63f5c4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "UseMSTestSdk": { + "shortName": "", + "longName": "sdk" + }, + "TestRunner": { + "shortName": "", + "longName": "test-runner" + }, + "CoverageTool": { + "shortName": "", + "longName": "coverage-tool" + }, + "ExtensionsProfile": { + "shortName": "", + "longName": "extensions-profile" + }, + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json new file mode 100644 index 000000000000..bdd89182698f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "symbolInfo": [ + { + "id": "UseMSTestSdk", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "TestRunner", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "ExtensionsProfile", + "isVisible": true + }, + { + "id": "CoverageTool", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "Fixture", + "isVisible": true + } + ], + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..14998ba8c0230ce9432f58149ae3874979717331 GIT binary patch literal 48778 zcmeHQ3tWuZ`#oTKU*UxG#f6I!H%Ua};JIyRsYel(c*;QFq z3a#5(q1v_Xm#|_LYFBQFR7yq7|9NKSOlMv*-Ag{7-jCxsm*+gs_j%59&b;sG%sYf| z#FXI05fO2!OUNe3J3Fh(p%#Sv1$7dMrYs_4sy!iAR_gL(At5#&U~eo-RQ(sXB}67u zms`3J64r~#laSEngj`!ja=C}+~l+k(Ft+?o|zuLZ;a2;1#_YX`b6Gr{H?t_ z;&p09Y=YPCQaS@~E&ntKtGWLsL+XOCWXlK6`Uh!Wa$v<`cK^9}2K_m%&G36n0wZ;ZRVsKur5Q!ew!z@ze$N5cC(JH9XS#ky4& zqi43aOYtV6KaXsQN{>nyu-JRw_mLToN4hMUnf2z%zEO9Rd$w4ye52Q*JGD%^m~wkhfY&@cjc4@O zJu2*ItYF5|!->xQ($^+tNnGekgo<*w$$TYsK-cX66u*8{ehucdx%K3?K; zw-KiZUi@jBgg(Jf1a1vBWwhvcEV289HMc?6`APdHw*UK88{#@lIe4yD)7*YevkN9( zSUo#h{POC(L1!-flrJL2&AXACosSM8IUkbf32WjVUUoTqIDdH4(Nb|Or(<j$qU*zrn-Kkkm$L!nOzn{mG z+bzaycIcMXVF>-x_&ZmVQUykxR zGSOHTKFaIRS9Qt0*}ulF{-oXW+&w}EGP3!`8*~2du`lu%^bao(`@9%4`})O8H*?b3 zipZhUbN=l#-TF}^d6B!vMf97cTW;>&o0}cxb+?SUdj0x_t{+@j)1+J2xpP;8ei(D! z+-qCdvpK)}y7x3uo^5jThvBQvEo(n@9yze#(2|sZr30p zZ<86hDfFnF8NK}Gy|&p+m2n;Z^7KEDX4`quhizX4nf)b73cYSE>z@DO@3`|DTVHD3 zEn`LCq`SBBUW$FXzZeveAAMwlli2kA|Wd|SXDrRjTDFPoq0O=_bpHUn|8g~ zl?mLVg?+XU%vkXKNq>KzaWg;9ZxJma9#50Lz7#lY*{FyU{*ew>?pwrcXj))Detnx) z$*!*Z=6#<1Ug}~~@5Mo7U z%*y%omBa2sf|v>LweR6zjHLNr0S!m-GL~+pRC2=y3`6oK( zUFYW}C@V;lr#6>$p27VNKtoy%@^6m%z;Lxpm-95tQ-Fr?w71ug! z(zYe1j~{rL;hFe;a_isSqh@<;4j3$Kkdf&%|G$90-PimkAHJGQ{$?UcRc5Yw(9&sM z!J{=(5~G&H9hfk^bHZ8QFOv)APRo$h+54WtMcUwX;G(;8KF*!sJ1b{@!o}9z{D|A% z*}lt8&&)mE>&qSS7Y4L7AGF|uUl(7zc|X~3i-(-oS*k%=^I|1tcuq zr~lcOU1OCW-A%ncMVYGbS=`Ne=~u7p?U(KN`1Hcu*ud9Q)1+Ch5vRsT1tbNzgBvHv zO*`cNA~~A;@YSow{fNvx0b+5(`IFL3%~~8E)nMcL(M@gNpVuL8>g!kOSxK{hx9%T! zTXfy)%$g=~$vc$m%p!BfG~)&^2~Q+SreY@$Bb^mpu^eZ$_;AZr5)qwsPsb#rs!SEHiRvSl#Z}#NCt_ z&q+S}+3e-N{gb*E*69100apKfbuGgZdTdA~zc;qqbYbNf2V!+Q#MSqr^`WENa=-z9 zddYv&a(<}Ac?lWigG9fm8gqZaueper?UlzPdnReQNY>IhLbQF|+ z7$lTzu_uCiA$HRbHEq?`_DBbThwV z#*hCt`~0-xlt@8bhACS|ym)o(VnC-mhtD;BJl@vIf(vfrnPs_PUGBOWBab|5kok%D zn8H~^9I|goUzq;#jgzE@amn*UMX>=^0cN6bPCR?X}q zsbj2Y5vH8s&3)Cf6WN@9(mXdY;+Am3p0mUw+w07VI*FFq_Vyw5qni73exzw=!NB!F zJN`_j(BlZ_>Ti=v_0?1<}F)3>Noa^@Sk%%0rkCR((u<8LnedHvmax5 z!+EFRuVe+m}Y9cO!`G3Q(>ZcLEzn6s9qrgOPVp6`*11?ge1MA=?B z(Z&dL`h-Xw9Ulo!k2n585GUQUTfF>)W9Thma>~+(2b=Fro$O6APA_;A;(M{RyX9@A ztTi_yBY9=Y)iKg3qc;wiF7?Sc*WyxZX}x;&9<&tSngi0!v-4*Lb^XBhm}2LI`dHqP z=bP7X$Vn%U4s(fXvRnSVr|}ck$ZVY(an2Io6lLBMdHARD8S%%L2AkVCZG}-76O$Uf zd7^E=`ZnMc`8PwA?I&H{Jp9qF`p>$qhA~+ZTCiZe?XPy6hg<%I7^kGg=V0KK0vH!> z?%_c6hOJxv)}PJ4h!Hvari^KD$w@Njl!+`QPPu(m+Z}n`u9)RtKcnyjh1x;QMl z$6T(*fLbsX{zH|I9}nMMu;w43O-}(JwQM~9-0`I!Mk zu&c*Vd6O;fvhUZKk%`KtVbM-|#|8Xn=awvzW%Y|*H;;qJh!daO5NY23eSowmv|#Lp zc%h>;^gMCCZD_&28$e4(!H!Y+_Y=H(_MEpVMH~P&e?Lwj$+|Tr^=>|lhV$NLYtP$R zErCFOc{a7JIIq_iJD&=+TYy60;-pg*moX zeE?|N;Jh=f&$!F}&jA$J-~UJGS&s~rAF@B<6r8CBwyPHa>$OV_EXZQ-xOyk;0#2dZ zw!%c&=PJo1!FfNMA59f}Y>uuyni!N4v~5(R;!_L7y+)tejOPr443=Ux|I+i^?i z-TW4Gai}%2PiT0%;4HP8hxS?SvT%(S{|)oF0c!xrUyk>kBuA0E@9w$WUYxC#anivs zkXuKZqF;w97k^cMSEnDN9=LM9`FB%{!4;FXxGOeI768(^lk0cgyDy;|85fj)Dr{KzrO&zym3OdC zaEfV7Is{tp8XVNAU*5L-{Pqu8)((?SJ^QM8gR6cd;kRk+`{g;#8RK(5;=#tKhuab- ztWoUTJNiWA$Y`Gv3*vf25O`j7?pN@Bix%M>zrL|~cwY9iJMTFz7`(0fXO}Ks+&nyH z@`X(whX3Z3IDPaf`z;o-vu*qN46r}DB-g$#H&Nc<@Pf<-xvhtc>|plmJOa*~m9eXX zS^q4{Irjw%*4~icJH7hBu>HLB}j|c8Lu{;L0zK6f9fn zO}hFEhRXfwZO^j&EdLZdiMKlw))~E%SUyccYa2mZ~XIy-0k{suGY85KOi}ujD;2m8M9#H-Ba^T4qxM(%_NgrP0KfF z-cfMfPH45>=1b+sueq3(ipD#C%MxFoVglJ8mru@5*pw`C8*d{E95Oxs>%AuAXEG}w z1w^-K0@)!Awr8bn&s(*lpQ6#vBz}YIlQB=)5IbSO_UmB5$4@c4&T6mx<^elyil0E# zYS)eE8w&u2M0gZn^tp;KCfbiw+J!}*onjo?&P?|Cn!WN5w-65-ncu90Jj?IHj3E0z zmqP{n&&@Ipy|spY_Jrk$-CwSW9Z_fbVA$g!1Nwa0d!LKP(w2~i4J+aS z33stnmwHo6omX!jsq!u^E@aT4LF9`sz962So@Dy;>15%;h2+Q23EA#$Np?*VlfAQ? z$ic-u$?q!$k*I)CBoX@}$iagLNmNu6iH-Q4TtB*n z#Gl+vk}e%3r~W!c&Ye3)u3x`S5^lwl`!~;$C;#0f50dYbCr_S`=cx}#dfIc6ot;f` za&pudYyPkCK#d0~%>zoMlFD{0`l4)Pw`t8p#bq~N1y}>81aM@uRupU!Eh+r0v++iE8vMQRsm0Z zaSGlLUyOn`#22kVkN6@L=n-F(0=?pkP@q>lPXR^}To`-?#PbxW*qdO~8W68ffn`zR z-&9bv_%{_4Bfe093cN#c;?)Y!L^Xe-qS51QgL$CKFD#t3+S$ltc>Il_taCA}sw^}z z@&!7)s)Ek4uBu`9E#Ktluev(&Z5$oVO-w}C3n*OXVrEfMS*ycu@7N5v8fy7X%ygD@ zs7EyPGIn&dLw*Z2f5T>=q$vxC$8YWESO@t*DB@}8Xo3GR7W4Sub96KX%qAv)8vd^X z?4o9d`N5k_fgQMPsl8@R-?SH$Xs-qU-qysVwu-;Dsfnl4idADjg}b@6LO zV+Ot1)Diw`sNx4_nd|WDMu*y)D$y3mk5?TX{Cs}!CI|$B&D8v+7R?OvPI|?i{e9S0%iE8rIuJ$5JIUK%P{~;L#0TQ0EULjk%D4MiKV(sjMV+` zKmqpGQpl>xhGGOFS_&4Z%0N+{5-8}$=Tr$K86@p(Xr5E++Zed&t1U3l3e~Fi z`ZnhD-awa{+o%NC*cf<*6sQCk?9Op20jln1)_9l5zf=M=?bfFJR=6id1uFRhYkdOL z01XOI<1;KkV;?afK-1kI0@@u;wV{X1taVM$b~hlPu)AIXOn1Ek*zS4+=yca3K(~9L z0Bg9+G@fVUpN;~ygR%VXtN?x83lUgbv*F07u(5#v0O@SACPGzQh3ytbMiw?UMsQg% z42A6?BO?*E+ZY>Z+fk}YK2V{Nkx2)fV%=V(fTCd z!34KCmYCqaN{k8ar=*zRu0xIqZ-pQk!Tl45_fVLiUSHy%-U#ngtRP7sY41}s_a#uJ zzDLoN@%|)4vu}=j=0}zfRPC9c+qsBb4EI&-i{qX+?tiD=|5s=4J2y91C9dYb8V}TX z;N9|o>ORF%=OR`*pZBI#mO4AIMwa|Cfsd8K3l4i*GF#QP;DL$M(cY#A>Y#rLHJIW8 z1wD*K7I2A-ksB{_L2V0*+5&TR33`|aEi8m4YHqBwN5vvm|Bds~*UUSO5=9GKQDfh88r`&5!x!0U>uQ}yj zbIQHulzYu7_nK4gHK*KbPPx~da<4h%UUSO5=9Ih6DR&v}GC{(3EvPPdzd~6rIDKvf zDG`#gnx`3MwXvvvV6%TUx0{Yj8sL-^WlL$>K%VR!v7P!Ly0kVL;s?9mmAI$2Q(7VO z0PKGw?%^9SN;q*;Z4!J#N12qAMD3=u-19(R+`~6`s*T<37sr_?b^lKPV;4&2k%1M^L<}Y^Wa^Id%h3KI}b_|_vml<_MSFXm$^}%c~F|T zk31Twgp;G%wB?5%s>Rw+)_G8xxL+`TzSeH)1Ng>fwOJp_G7rH18Ib6@siG){KgY0) zwoXVYUtMCr!1#LnE)YvojzcVpV z(PPi};GKwpiXMB${%Risl{NN^52|$xRMyxt_E*~&sO+(4d{8Z8pt8rFvA^2IKvj)B z>2wjJqD`l*fTz;)EIy_R_I+L-uBot_E%aAz*{-=+WxlZ zJ++-u*ek7+7^v=J&)8q#G4QU8J>!E4je#9M@6a3j)n(pOyD2Tr-wW8!HbZ%Re>mgRzqBFY~#c%J4;v{S`a@@YZOZ zSmMW48Ow>#F9?#PqGF&Z9Oa3BJY!ds>+sf^OqOg?J{%cpS zR`%Fa`4w?Kl*)R8meu|jnJ;u?!Q1&UwAk5sfO*zN%p0;Few9MoR-Ns~Gn=eU@CGm~ZnTXZM=Zmy zWa#j-_M@Gc*x1K*J@Y25BynzthsBF|HkQkhXXU}Kgy`6hYaVMO`h(?X+xU6(gMsxw z$dGL%sb}?9be@e{#EwL!ZlpBU`E!DeX_lYG!`9>HA=?J|YH2@z zoGEVp{Q!*%w25yg^0IRX+o>GJ2j#NABr#GF9>5dJV0vTSX7Be{JK4`cwq9Qzd09Cc zeQ(`()CPS-VkHq$y>5BZ;$8hOqo8K27J0UR@^ZBhp7%#1U zU0i@qfz1r=7%WqJfF@ztvXH6(h?V$j5BPf!N)-TUAyom8E7gVqRRK^IQUm~MRgO_n zg-X2&2*A*x2t;jwk%n?wL->YOR9TIHAQH4tLv;{CH6lfgmiYE&XGk89=zAg*27g=x zn0Ob&6n=hTeDUwCs-j%(bqsLhdQcTu4e5yBxwOPZ!2Py9JNdS_l^C>!5wPpTO;vxd zp7%F~QpXV+H*e#6@wi`tdYRZQaUAjE=54*t0rfKYF<)#P0nb~F8~(mdY2yg+M^l^i z#SMO6h<>-WD!w~Ynm7X7I_r(TxWRL4?BDaN;`>h}jU&LXpuR_nwzK1jf16;jW4@}! zfW-xQ4}I$?)LTK)e%9i-2o^u)@%#|qhRPlT-ua9~eb{Lo;Mb0UzWB$pUwr(PIR<*- zU$5^O{MBjY*hQ6J#B0eXgj zJ!_$_o$?{Ye!R0r#qR4;8>wuTmd5{dPn>^V4sr3%zp(bP_%Y8rUsjsEb*=ySxQi>Z z=YRQUpb!(Dhh_c3;z!%iX10zw^HJg$V&xZym*38w-{qfS(&JMdtaNPHGrzPBFjWbD z_B)2`*-_S~Y+SSTXfKPMciyPd@w4kDdxi)xvbfkYb1Z%~{xSBM*uj{aLFZ?2l#QRV z=Gk+8h#fIgeC(Mw7C+Y0F+<<;@XLzBP20D*Qjn#_C<9Nzg-FPgDQxZa{>ev*NpCgmJkS1YS3cqNKR9r|EShiIE z9*veV?J?L6{gPNJFO;j&ql8~Y#&!*5@gOcEsK-N1l$t;p{=p$EHMK;lz|&xADn=TE zr@+)yiZlseXs8@1Du!QXR-KQ7Uu)K((4;;$R{>OWFidqU3-w?beid4Y2hl)3p3{;* zl0nj*)3Sm>5f_YMP$k3$KfZ$WK>)pyD$q@_Ncb42?S|gp&A)doOPP6A((wUnyS{g4 zmqnMpJ}8^h**v7NzCqz|ZGO4+~RmdAERe~Eoyz;=92l2CbNp~ZbJP}_k|S&9@3yly4I z1AJN^&@~w;)r&MEJ)<BRjQ1vmS|3zk|s-4}-z&!N_f3Je>(Lj4*34Ktc{;aGl zRXe*E!S07p{fGzmv#?CD6{Vl@P^!=VjOXcES#&=S@P^AAUM%HeAo}MSCd!RV(G!C#1Wl+8RJd~qLVn1IeTc#N4-V)kI zeL?r5szN`jgKsBoqm=P~k$s z1Prn48eLp}%^Ds{hXVRL<32H6!;9*VJeoaaXWCzb!M`Nqpz-?~d%1uC$1)MumW$!O zI-kS%S&Vg>bte&dS=}@b^=|lgxe&mZdjDUo49sJl=5KaxlwThO84>uNi6hGgYWrhe z^X`cv*A + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + + + + + + + + + + true + $(ExtensionsProfile) + + + + + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + Exe + true + + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb new file mode 100644 index 000000000000..2ea6cd266913 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb @@ -0,0 +1,3 @@ +Imports Microsoft.VisualStudio.TestTools.UnitTesting + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb new file mode 100644 index 000000000000..b23c00043a6f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb @@ -0,0 +1,54 @@ +Imports Microsoft.VisualStudio.TestTools.UnitTesting + +Namespace Company.TestProject1 + + Public Class Test1 +#If (Fixture == AssemblyInitialize) + + Public Shared Sub AssemblyInit(ByVal testContext As TestContext) + ' This method is called once for the test assembly, before any tests are run. + End Sub + +#End If +#If (Fixture == AssemblyCleanup) + + Public Shared Sub AssemblyCleanup() + ' This method is called once for the test assembly, after all tests are run. + End Sub + +#End If +#If (Fixture == ClassInitialize) + + Public Shared Sub ClassInit(ByVal testContext As TestContext) + ' This method is called once for the test class, before any tests of the class are run. + End Sub + +#End If +#If (Fixture == ClassCleanup) + + Public Shared Sub ClassCleanup() + ' This method is called once for the test class, after all tests of the class are run. + End Sub + +#End If +#If (Fixture == TestInitialize) + + Public Sub TestInit() + ' This method is called before each test method. + End Sub + +#End If +#If (Fixture == TestCleanup) + + Public Sub TestCleanup() + ' This method is called after each test method. + End Sub + +#End If + + Sub TestSub() + + End Sub + End Class +End Namespace + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..40382f8898eb327d5c68b1d76423d5b1034fdfdd GIT binary patch literal 47213 zcmeHw30zF;|Nk@7w693fV(Qwi+~QtBsK%O05lV|TM7D%Ni<+@7UE&KUqmKop>b1Vn&{Gyo@I zeeBrQcAyjhzOYY4rL8Rj!0aIa$jG#|R|^90c?6P1Z51#P@-F!e02-~e{p)l94o$)I zser)Y0NixP^uadNW9g6SQvs_f00>3`aKLcBo}`$97*s3y=bV{~kT$kOAy`;!4qSy= zj*IlBgV1M6#jruKn`ST#fa_l3&C4JrAi8mmnIiyF_s~juI)e<94j&pc(6U9|`?&V$)fJ*nLex2{ zmStUA`a5$?LBjoqx+^FdtCJ2cSvJ5!`U>rd{_LQ;r@`;c%hKC_DRkQwy2jL=UgxV@ z=j-@3>{7l@e-YBNq9*M+UpKn?iWMuw0zD5OKK#N}L|oy}Y|kOjR{Jvh1twL#f4bo5 zKXzZ5^nl+V4gatjOT%im|x2&Ld6+RQwXw=z8$13dmD3PKb||6tTNh z5>ZilND9mkufInFiIe5%lSF{&g92%B5?E*2oUaOO1U+^2Dd3vTmwgAa8Dl>bGE$Cu zc?AkkH!;j`Yn9Hcz=jvy8FXG{Gu1?~g6-_m~u)*Q|SCpIMTY^ftQ4 zUi<8s;;>sg0Hfb2PiwiRT7j@Yx>An+eD^JL>6uBli+tQhP)-Iti<+PAl6G?~v$>(s z?x3eCct!RbpH)|S!8j~|b=JIT`GVS-#suq#sQNw4R{eins@GJr?fGorH$JdW5jmmWsZr<9bO#y0}nwlqWHr~kGN2dU>2;-K^ z$*lB>WUJTiNq+&FYLrIvlZy!~{ihC9Wa`1f2`XaO7q*n%s5fwUVVwNXe)?qKJlu_$ z>!qXrK1`Gh3?de`+={IUPuFG@2zsU)%WFK14_$hr();>$s^bcA#+5Td45h@Z>JkCh zC5L_9-T7R3A~>S#?3Kec|7PtRN@b0lV(7HBB3w`fqz-!#&~mBf)M)0)rF66UiB>KV zF~tWpFH2V_u_~ioL%-h?rtrwiKYJUDqcT4GulF-9<4$UvW>6;lm z;o8T=_qN6P*vtD(0oegDjN(g`TXk>EPC0mVkD6zcm=jCf z{03H4RKhcTYLRA3&4g4^V$hA0O5N(JeKjH){lLbx(g?uMQbWA_>g81vU!d~Y9wADgC4sp%ftGl%2lg?rb0WkM(J;p*fmOj5ap0u{g z5lj#PFK1^>6uK}qlw`9+CyexXRAO=_Yko>eO0|o}3u^}fW#BW))tbIjow1DqRt(vBCQ_op9Pq#^{6Hb&MG0fbVSw*f!7H5vRZ`Y5u zhLT%8-CF@W($pD8>>1n7O2deZy?Siqf|7-sHV20#3Fs`{RyEzwS_CAmEqJ_p$O*@l z2ke?Jiy!f-*y-jYkm#fTj2z2ku3KBWI>C2f#D%M4np6yT8o+QWE}@S9#m?(ekFp zqqwzYp4w)5sYwT>HCT|%s=ck;X)Oh3PW;w9cw;{qgW|F>P(3oDH0etjMCWH`0{hk zotkY0N5(Wy`5dcVx^=o9NF1CcBq1STyG>+zZvXpH6^?LQ$xfgrloS_Vuhk%(9~QlL z@7{|`>$S+h>YezXJ8jB+;~MYO45z=%&(F8nb=8alV*g&C`1Zz@c~Rjd&h9D>HSbeK zl4Ke)R%%QYXUu&PL9w*7T>IeQz~GP&1A68dvucNOm(gxDw=H5N_8hV!!42}^KYPT} z(@m^HPFlpzRB!t7hh562dB&%f9&f5GTP!TCB(XMafgVs^^(?wBfO1$FimhQNWS0LxhEFb_39VHat>atyZ9AX-mlL3eJ$u z1i)4Vs4PP~WH4tC2@LzIjcq7k?Cu9>|Fn_A^Ue$AouiB^)beaBGy~woFCFRM5JzOw zmsH7&7cW*+n^kyIUtiO!Rc@*{t)QUrJfgt)&BX0noRub(fLGC*{1vFw%!mSJjQhSJ zS=;I>qF-0%jnE!_7>H2I1%Tlw-az>P^3_esT4!fdFGeMDGEFG)<;&w|eSBU<)GJMO zHiX?5B^l?YY+I!&GrA#m*NlBq#e)s!A1A4ZTa#6`j)|?k-A z7`(d147~*k4vv0ZOg0P(B&%F1Iqxq{J8@Bzks3@ttO1M**I5M+e9 zE!GWIR9vjAtQ=4id&KzalH!G%T3TAx7C*o2nxWJ%R^o;9{Udu=aC0^nWhAVp&+>Y6 z22RMPx^ftaf1BO!sUNEuI(zo)>cG>p{nIY)OQ$f5ZmKVh`e^2Osj;rQdeALaPEJnA z6-9@Ph|0Iyt0Xm}?F~~(!jf{e-UQD8MmGeb%c8QY16{UcHzib8&U2L&3Kg^&@m7GQ zwlHl;v}>sv*FLRgx;0x86#CQDUtf1N4hDK_D~TUp&$2Eg5!E zok)*e#6d9KJylSpXgH+R%#a89?UkvhXO=uDBGGEX#>9Y0l90D0P4H6k8erH`>ZPG# z{|xG(O2sgow2+=jAIZ<(4}((q7sTfrI|lq3_wCbAG01@SsTwhiYEx;*6b+eHARzhv z;&VLH5fjv;o`Ez;Lrtbg(^SZ`3<3E9HSIb9nI1t+k`EygFL_H^^Iu5im>5R=U_p?s z>)}M&G)@ePHGd=*tdfO(k53i6|Fm9#*3XDFHVsynLcsTC%gc;(fEuI~EonZn6euX= zMEdfjKjfbT`5(DJro!p+GV;h_FL6tng^v(qnh%*aDj+7P>7E&4f|`Ww5EIm-}D1}T5pr%*XkR}7jbOUJ`pC-8bsX1bTnntWcOio{;7G?SV&*t<0@` zP!J{;La+CsFp@(+$$<=Asrh8utJu+u#{6Kql8+!G{PsYadurpOduu@W!2Qx8bU4-w zo6$1z=B(&R(%|kA6{$$(mra|cY(`X`_X`VKkRqcXT5>19ihliIzJmj>naFjdhkpN`8xEZh{*kWEix%rO@P0Xe?0IoHgF4 zKkAE1YYe!Xtpz}h;S=`X#S0&uPyh)qvQ(fdb!?OZ@nyL*QZaP4h#$o zfSH*Y*sx&(aB*<~;}1>(w4*bD{%J#C>T3a3US170U2_EP5p=M7*De509l+6}N5R=M zXMm574>)k!69fbVfUwXo5D^gpP9&ZJ7asY8kY{1w_RBlq!Tkr|$&)AGVfG{N^5sjA zo%I?#FL(~#7QY2~d3oT&yZ4~9v=o$-mw+$j6`-=>3#hKDf@?LXt*HeK4GpchfByd& zfu9lRl?bp{EViCe92c%8IC75~rN&W!3p4L-3aQhg$U|a4CvJFGVJKGtRWgYrD?^l# zhWtdkttw!z>~JL1ae;_bJNA%T`61_!;ln!_kmAMD9*2h{*y@1-FZFnSG%;X^WDq}` zt(?$zz=QZledXtb{=4(TsJAZ=5Ia^K{y{1Nih!d^J9BHZ11r1HLw>fYum8TO|0^rI z*1Pn|s- zLX_ahk9KboLTHiWiyx|&6A}^@mk>exLPF@TZQ-P!3~9nb!cljZS{G*0S2tx^ZsP!v;uKdsdr-eH|CjlPZh}6jd02Kh}qSK%}0H|%J zL*G#Hlgv*9;JGCO@!`tEwssy6VE5Of5?!aNz?BBq_Ulv%Y+wtA>r_)yQ($Xr%f421 zb#-N5tD@^vbd8FxPx05K_-oSm_;~hpDRwQInv%l44#i)8vadbARI;xDcN8e!~An8D3H##yX5AJXYN0wK{)1iP+#{;(@L18}+m zx}b6g1z*M6=%fw`aN-!fg94m5Mu#X60=Nty;l*)uHUb3&K@wiPovzTPU|>gaJY9k$ zfz-p;BRg$NtN$btlp>;D!VH{uvLShnNC^`UAj_g8xRaI-6v!L4-EK(&rk z5}co+!otF>JRIoakSy9?lq+3USy+Tk6jp9kLeLNCY+-1l)k*Na#ETrkt_QRoc%} z(76e=a5zuF&P`}XX0p#s9D+Bq?~$W>3~r7>%#7rpkRvxn<9!eDWU>!4=gJ!*w!H^)vsSalB}$F zTU%VVwJjnf1}kDhsEO!gNkN%@GJ=w*iP|JtQQ>~VqHHp|-A|U%kJ8#~rL)^#>9TAC zxOOYz*24kR*J0`0{^}pQ#y(Y}b_hY28hw+$n}p@>F4#|f5A%2b9P`f@wIS2DdY-aX zyzqchvxqYBvc25QoCzlu4RyO7dVgNF=9m6a52Bbs^X6VH4t<`n$DnLkkeuT3QwNU( zzLX6)HE4ODVNT62w!2a>y;Go>=6&Xbx5Q-aPNm)>sN z@Te*!6Sh5T$a&%)6j$$7^I&TEP<@khC737sfz|pt6?N~e73w3Kl<&%dw`W}9gLMWb zEYl~Y25+xexAOef1pkj9&p@Z1?n_^@hpIdaB#K9*KC(zCgc+HS@}z}HAYf4QGF6Z# zu}gQVg&<=*0q_R0J>`i*)kX2ts2 zRUWavcSj3H+#MZ%+I`K7r~>EgE9-8QhHl;FpFi<@{aG#ZoO!yIW_88kb=9<|0*!nPeA4!k2+{-jA=k@uA%#yFn%8-Uc;Zf+R+ak4B?*Ly3MA>+wu$N4Mx1!0$$EH4o~*(+gf`w#KcYfZ9`t} zgS{8$?bS^86%&#m#M~CvWc4NJ&W@r_dUg>3xsxn*?~nm- z^mVo0L`;y3joD>g*1UMzvz6Q2Yc^cXaoc4gu}XNW!K$il+DrB2Z6-6O=IE+F1JXt= zk9_0r`561}2%eTLG#MoBxbZ$TIQi~*F_`aMSC+MO^exuP?A(=6x2j$p zpvIIfbflaY0nS^N7w^_8IWN}~X(P;n?aNYr2P-#I&%(@eMf=#G*Ua4Uwsog9jAp>L z_Wg+9{E&MeL=0d8adMV)%2|JAkO0jQidAiR;O*fwK>F+h9pLOA$1;uq>dY3KBCjN~ zrdOgOrh$_MZN7xLP{8C}ZuQ>RWdf&BGpn~ z_F{f+j-96_@Eegs{_FElkT>gGT(hf_{MlJhuteu~k(%p53{B13LVlJE>D)$f#|-zV zx~l9}{|wSg8_WL?T&+Z6Xr9xhzg056W&c9+L!j>KN%squMTmfFYc_34Q!<{oab?Y( z#NZTZhB6tznGb@?KNV``C;tM%M|ey5mB`Y@OQvRTPnCew$=g2rXa&!|(^&E*&#_{X zG{s&FYR_^4n=KEyHKz-HG?-rD}X?q!@1wD%@+g`W9FaN zu|FLA0))DqPuMwwR3LCiYK#g9*YE~1-jBAArdU`HHVk~zloYKsPm#pf631*T{SY|B z+r;(hv9M>hb=2D_B_#~Cc%k?qi?0|4HAY@Eg&~MfN={zsJ<(x;UHY1ZDG&bft(E(D z`9h3?P23cz8Y{B>7@h0R%hM%i8+^K1KA8;Mv+itjh;pmj;JD6Ls&QS8LTT-}D-3v_o;J}&su?3<)YE? zi@jQeNDMJwI@86`=)4?7bD!QsNY1{#;?cDYQfkVtH2)Nd49qOG|5Xh3i-eTgz|9uF<y$ z2=A!R`mV1pJkWKV1N`EzU%y^Zca`tl(G{r z9L)!u_VJ1I@SvS4_Siot22MMxSDT)RU5@eNug67zJg zl3R`I-@kufuzk&%ph<^GFjqHe7T7pgraf&pqeOw0qXjd2qaI4H13>KCS-tGE+=@DK zh5pX;P3LFTZ5jg@OK@4gd?wTWR${U%$1z2FN%>BC{e^wWN8MZ(w7kjJa$KT(t7&hT z_$>iFWq`7gi(dpJn{A=HeBQ6MxjgC2tsBA~jSQ`;D78050Hmt*YHF{C$6F;*4e|!& z@m3Y3*m-(-e)vsig4Yz`xiHxmzO>*ev;PE{A;SpyRe&a7O_G_CL9!YBFW9)SW#Wc6 zs}DDS)T(cS3B99Zz((U1J-vjLhnru;tXvn>^1AH9HJupnYQF}sFlMD?e|npp;ic_X zd)mJd=J^f{1{=*<+!v7Ey^a;|6Q_A!6k{9-rXSD%_9&0{Dsy-Yh#Ykmh+Jqy}%9!WXAOfX_=i?>gu z!&5FD^=E1d$|2UX0hFq895E4BV!VRVM|&}EJ~?Wav~L1qI}kh zRKZJ6=D}3edo$#Zj6j*O(l7zn)khdISwN;uD4(?gCIvr0Nx}D^COLLyEYvjF2Wc7t znKmL#^-$B@KOs{g)Ff1ja(X>AR6H_J9xcl0y@oP?bz>OOW>`*d#Agr;(}NFas90sJ z1IAGOOnI5Ghlp=N3}cd}9Ml>PlX8QOB4s-?RCErtXZ0eFqhVI>12<$5W%Y(3Ljx>n zQ<3xRtlkQwAQ~#Ti}HinS-oRWF0Ozjt)879%+BgXnj&FVZ!*dcW@q&VASS3O+6T+( z-HbFv!mQpWC_k8;)jJY0?So>Ekjttt^Y^+G2-ekr3BPisXk%MhdQ$zvW2y86ODEE@ zEI-z@YuC1$`=pQk{r98l8X9LK8Yeis^=WA|@iN;&3TBR5kaT)nuh*rkuHE8hzqq`7ff=>^t)G-nKNkcikh>b#VkLJqT-WL25v>_7AT3gBpkL!H zuMA!I-V*KgX_&p6tyfCb2q2|CG=dXW!<-dvRxV(g{OQxR2-{qbvaOEQE{(&@T^*kI zT##J6c=65Pgr~Vjjc&gZ&KnNKkG(l<|82`RFB>zngfC{$H*bFKb0Kv8dW!j>r$HbF zW%XK-X%YZ;( zL@Q{t>^30jXlq+uZS-FnYb|6Uxp+r-x_wKU{UJfd*nuL8b26wonXBPGP-W^Cla_va zXA96yi|yW%p}XObFk%o0p*Ne0f-B@4z0&i0myjXVNil@3ppY#L{1nZz;D0yth6V0; z^eG~pb_(ukszb|7U~_?l*Mt zCcjhlE7FbIoG;POHI<@G{;*QaaJia{x;bl(vn9n=O=h?`Yrk_DnCmif<0RIiiHr*E zbHYv3q~C#xzFDnqiOXJrH3}nR(RDRG-IoU247j4#Y1s>Wg_fTM-eMdJSJn?&QI_%# zU7+77Kgf3!^OPUyJhadFfxcsNj`1U60R8ST?_t^i3#P(QJuqf@Ll7eA=)g0LNYSO1Cg9;Q~Y;Hx<8{=?UF`rLnn;d{<^ye*>t__6<9bKpn% z4`0>lFuw3LunyyoV$j!f0Aaw!gwys&+-LCH#&mwGB+dc&N?ZH<@9Q~09D4@`hYsVx zudkf=zU4PY|B-W`uf`t51M`oc@<+^pz8w3m`u`*50DkOis%tuJbJ(`WZ%Nz+_!)OR z&-a`I#IdjZQu)LE|DJQ8x5pmMk)Dn}nhW1!4)n#?_r!nv`RDhT1AQ^}J@FqMbHCSq zps&WhC;p@D=6lV7z8d?U`u{!VKwpl1PyPQMbD%HBzBl~u&Ky8?Ij!g#0)IT}>#^?* z|GP5>IQfq5AE4_T1E{+`!(YWEqk<NFQ+yaN@!2;!7eQ z-fnMP%45^aS-c7IZQ8}j~frhiTeq8x?~&&Q1i(^n-g+jtzrIzMtm9&SDm`G~eqo11J;`}wiW2@gMVL>_KfiF};wag*(7KR>oP z;o(P)$iodQk&lx-Zn8b?=f^fDJiO$HwC=X?c6;h4H+dp9yiHzpUUEcQciVXT-0=6b zpNI`_lUJRW9Ff-DHr{?u{p2Q3#D=%YtIkV~Nb7DJZ=W0fp7s;5;cfD&cUO*=PF}R0 z`pHecyMA<6j+c+TXx#Akw7(M$G3D~bfVn%Y@_=H@N>Xj z@*TsCN?us;e7x$sbo4cioA2iFu!BeiMB~ z;|)LO#$Hh!(R;&Rq7H5t`?4SZycOX=e&YRypHA=OE7~@Q*n6Yhmws~7O~eg9HQ(+( z{EQ#pequ4h^by-wKd+J-#=h();=ypE5`HfK|Fr-7%yWFac-4t<=G5-XaptC*hy(A# z|3&}t+drp$A2D878;cvaHrD@NFX2yXwD12=Ea1;z@U;*4|HXea=P_SUiOvD>+W|U1 zfS*lkj|rZaSN*>}?s$B}a{x|$Vf>tEocb{S|CRDvF(CSZ`Hb}w+gShqQi9XY`=^)ZDIzyV_5@f7aLWfGyzIOAj5l{&xpdwUG<`v}V_|wikihWn` z^E(E3?5K|a{!gcO__*XD5q0ot^BaF&W8mWK%rTBUV-NF(c;Vug))oBl=TO@B*~IMt z{v=x`JUnCH3*SpXK6V8^;>Eugh2IyUb2(znHrQ`y*N>m~z45IJ%vM+N6Z6b4`ETLJ zA8UJZyuxr}C1xL$cpLaSFCL8675qpyX1}K;X8->pe!TDe)bV55)3{^uc)NK0_&PTp zd_O;RyiUx1PfNUAyncM08xOvppE_P=PjO@Nc)NK0_&Ps4cz%BBnEjrX{9xmUhab#% zo}S{y3yf!(-zIKc2rg>gc`<{@jQY26XL#zX!<8E+<*k$BnSn^-yNg4j`BLN4A1G!EFl6pJY_7aHqFa`-x?2P-+*?Cm~iYb;#*B)6isv2xSb z=0p29VDam2$<0n*_d~pBdr0Acn^Pax{Vawv55V8sh6zK7Z6((Kv+P*}U^*6C0j^}A z4%kiv0_?H^l_*b31+Fx>V!!9Z;E^d+S68P3$G#`qVmZeJ2q8egt+;qO18W=y?j#+udt@^n4D*wL3XNC~j!}pl8FxvEkGv`j6T@ zi2>$2x`%_sk5h?ZA=<~DX?G_EnD21z^R$idaI=ri-|obKU*CDzN4UBZgRc1gE&JVx zL05eLmVFch?D-^d9w1q4MbBChZ&!Wi$3FJmL{9SnvyVL&?W*tm*hf6PVvw4W(rw@Q zwO`ft{ZQl|iZlM%Bo=#Yu5|TTD$<8m;`WdABa9f0ANz|?%T zxHy&A81U;m;=}Y{eq$xpkNN+j?PIw3DSO-huIMB3qU`}~zt~z;+3^_$7H6VgSbuj* zTU%S6`Pf9gy=foqhq3cdbPox;u16)&4!1TDUsu{#9yewimFT_+ulrd<99^+TwuJl$zy_W`l-M{T5s=sUMD=#EXI z42A)-iP15eSc&y_kLm16$xCNfY4G~nrmCtcmtXrxereF}72LItkaeF_={HhOvCHztS=#*s!``T4dInp@nSLExX!VRMsH ziTH^30T3p1Kb?4Qmne_uIYl`g&c)Dv4D%h`3nt3o+lWs5#yDOcUEiZ^+xMPd2OFr3 z`Z=A8;^onCDlPvxi*{rt>wR(SZ$zRJwNXFuSdQ9wc~nQ|#wbP(!JFCqs6=hl&yPIf zLGeI-qdF>4o0BZ+BihGeNtEZNgOfZy=2*Qe@)!nUiEMFNF+NT-e)@V#9@EpEvhB8K IxAzMF52~oniU0rr literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..6deeaed41841 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Projekt testů NUnit 3", + "description": "Projekt obsahující testy NUnit, který se dá spustit na .NET v systémech Windows, Linux a macOS", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře UnitTest1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..9fe39465a3d0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3-Testprojekt", + "description": "Ein Projekt, das NUnit-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet UnitTest1.cs im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..3b4c04b9cd14 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Project", + "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens UnitTest1.cs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..719af44fe772 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Proyecto de prueba de NUnit 3", + "description": "Proyecto que contiene pruebas NUnit que se pueden ejecutar en .NET en Windows, Linux y macOS", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir UnitTest1.cs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..61492bdbd489 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov alias halex2005 (codeofclimber.ru)", + "name": "Projet de tests NUnit 3", + "description": "Un projet qui contient des tests NUnit pouvant être exécutés sur .NET sous Windows, Linux et macOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre UnitTest1.cs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..60257ea335a3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Progetto di test NUnit 3", + "description": "Progetto che contiene i test NUnit eseguibili in .NET in Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre UnitTest1.cs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..5c1ef823fe79 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 テスト プロジェクト", + "description": "Windows、Linux、macOS 上の .NET で実行できる NUnit テストを含むプロジェクト", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで UnitTest1.cs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..5c5c1cb49102 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 NUnit 테스트가 포함된 프로젝트", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 UnitTest1.cs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..91bd4a0a2063 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 — projekt testowy", + "description": "Projekt zawierający testy NUnit, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik UnitTest1.cs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..1e632c677607 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov, também conhecido como halex2005 (codeofclimber.ru)", + "name": "Projeto de Teste NUnit 3", + "description": "Um projeto que contém testes NUnit que podem ser executados no .NET no Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o UnitTest1.cs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..76b078dd9088 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,15 @@ +{ + "author": "Алексей Харлов aka halex2005 (codeofclimber.ru)", + "name": "Тестовый проект NUnit 3", + "description": "Проект, содержащий тесты NUnit, которые могут работать на .NET в Windows, Linux и macOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает UnitTest1.cs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..2e7d651149aa --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov, halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen NUnit testlerini içeren bir proje", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "UnitTest1.cs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..912d4a14e2d4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 测试项目", + "description": "一个包含 NUnit 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 UnitTest1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..f4b434474ef2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 測試專案", + "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 NUnit 測試的專案", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 UnitTest1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json new file mode 100644 index 000000000000..32858f567048 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json @@ -0,0 +1,97 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "classifications": [ "Test", "NUnit" ], + "name": "NUnit 3 Test Project", + "defaultName": "TestProject1", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", + "groupIdentity": "NUnit3.DotNetNew.Template", + "precedence": "11000", + "identity": "NUnit3.DotNetNew.Template.CSharp.9.0", + "shortName": "nunit", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": "Target net9.0" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "EnablePack": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UnitTest1.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "GlobalUsings.cs" + } + ], + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens UnitTest1.cs in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj new file mode 100644 index 000000000000..6d6ebed1bfa2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj @@ -0,0 +1,26 @@ + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + true + false + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs new file mode 100644 index 000000000000..3ff69886477a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs @@ -0,0 +1,15 @@ +namespace Company.TestProject1; + +public class Tests +{ + [SetUp] + public void Setup() + { + } + + [Test] + public void Test1() + { + Assert.Pass(); + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..671271e7595d5a5b30325db0bdaad7d5469e58dd GIT binary patch literal 55748 zcmeHw2S8NE^Zy=Qu|Vt<)Wqo5N{m>7aEiv>1vM%VH8EDi#IA4}6{1GaXzYq6b`iT+ z!4@@9QITLl54(T`3q{)g=kt!eJkFzon*T2Yd++UgTV}S*&d$#6V@$zHGHYuKx*D;^ z28{j97_+d@`0FSbJ7&mO^>9eS+mWbFgElD#_H73y#KB;VS@Nxmeu%!Oc?w9qR8KxeMh(r45#!ce`|7-E#W~A2~m;sZdkV#_&Ow`0QHO+XSdCw<$O*EBYQc_Y91yOl< zYy2t-=f!#Aq(sSY=1u8R93N9nlJtrv(a)re1mNfNev)cZ98!cA?j!}_X=p|Xv@~*L^}_mdjW;k z&NFCFMEQDg?u}aW^5IF7=sIztZ_=di9Xli?`6fWm27CY)ZZ1Y+A#SY+9pH%+qExYtyC;YuBzF>(r?e>(;Fs>)Ep>>(i$X>)*dW z8#HJT`}*sz*|*<*%Z3jh&c=)x!^Vvp$A0+X2R3=~WHx>JbT+%y1m>-r#C%#$W^>z3 zWj}ZHWDB~e*rHyu+2THP*s=lh*s39ZY|YR`%>TQ^?6*-%*#`IJY|Df-Y{rZkZ0_8- zY{7yB?3Z7DVZZ+RD_gyKHQPC3Bil1)E8F9?A+!P?0mp!7IG|vT{&=`9Y21Y z{qe^i?Cc+B*`I&@$u3;Dz^)w+W7kh!Ww-yl!PMt(vdfn*v+(e6roI%(Zrr%RA|oT& zy|5_u@Y+50_{IYk9r=*mxpRj-eE5((y&KD(KX}Tbqodi=r%&07=s5QJ=}Y$F#S513 z;x&tpk7r5oNi6wIGD}TPVQDF;EImD)m2JdW%^p-=V;O7Z$5@x0jP(y?Y*-v4zGcbg zavQda_hdV`2Mgf~*%iKv-RGAjevDeIP4SgI82f50jU9e8KJ8>|3&lSX$Jk|xe~seb zrug?Lel*2@PVp0D@f+1jZHmjQvAjg-=5-krTCOq+;ECN*^=?OHjJW)K@t$)S_gKaF!rhGTI?MQFwJg3h#kZyS zT`2xwia&|sFQE9pQ~W&?{}{zTL-8rkg^?8h0mYBg#;?yBvCfpja7w|OQrJK#oT3!& zPzrIDoV~Q+>~&Ah59EcWt0@y#ecN}wFYuR`%_Q2g2yzdpscx8$s!4QC!bIh*f6 zX)WX|co%0kE^FeuX~A6rtrs_VlJP)xqY0S1U!*}!B$i_&gdgN++cZn)k~s+q?_8&t zan|sOOQr}EzNtypp^eRy64BZ?6u!ABg*P$B@7wV4Ky6Uz2KbaVHa4r%+4Akc^t?^x z;8NMxni!XMc5kUKgR+htJBYsyPMWfGcPedc>fql0qqj3C-n@h)D`|e3P+o+OyBlTj zk-iK}YIi9vOXRbR^j)1x8Jjk9@BbDB=AE6&lANr8(x#tj(s%1HfHJUnI|Gxtu5JSd z4#<|2IEHbjBR+ZmMTnSn4a?!82K_u3!#M-e&c6p=}jOjYG1!n@Trb3g`7+%i*8 zsu!jE56HqBmvN>>QLYQ(jkO-l4e+a7vIA9<9&px%AJn$Tz;-<- ziWJ_2YDv#uu~t^B(Le%smmU=x(f>dV{nVZGf=LT2R-sz8YBl@XRW+zk)v!X%zEb+1 zmC_5POSiUS3PVG~N`36Dj4D+(s{FrxQuqNRhwFu}tXM6Q+rJ#-(yc=MPURa6(BP9X zg1>zkWW^eMMc_vGl&@ltfsam!$-ET4T-7R7t^3+r8&#%%4L-5}I=6#r7y&BxaqC^# zhW@FI%WE7hEEBkOZx84?$bC@PKJ-s7vkjjqvc~f^kvTlk%!2;=eP1Pjd8#!zB{}Up zmF5Ck$e5>2Z7@=rm$q%&mUZaRL7JEL>eY)mIXS&GFa7Sj@7UF&8SH>G*0G$&oLUz(F{+_;f# z+qR7b1_rX-yLYn#2M(~Hpdfba*fDl|RS-M1?kGFI;}2;*8g}p^J9+XXJAL{zJ9q9J zJAeMXG#9=3M+Ccd?mD}4>5?=Ty?*^VyLIapdk}s{nuEsNe$4LOyC=;-W22(klRGi& z+5IQldFacSxQsbyJWEJOU`ekN$tAHjZ{A4r(A121Xe*j04xoABWSS=~qj};!nkQbB z%@hBdr~WrjeP8ob*9_>V0aw?In|}Q=?&v)pX_F4*)H0s8f8ZK8M! zK9;?2W2`VNX_P65X8~%ncWrG{yelR0512JD#_(uN z&+)#OwLt?XSpo(PTbcuk7c-;xu6WeoYGZ9s8wqGa z7&aEjbu1~xFI~&d$h2)6L1u|=|GY?Z4r3Si6@trMfdbBb! zY2#S3c=6&!ic&qqYuAoa{!UhQuDz@bY7$bt9L)?{YG2cP(C2K`%GH$;aCCKb{=~qd zm;AkyKi>B$t!U!v>S$tQ_s?s2eAgOyZ)a%QG1Gf(eAgNVpHVJ`rd>0=*XB>}ZJeCG zkiYMz#lMwnzYe7gikB*7ZeY?%Tl21({9S>+vvo%48&H*HK&JSg*VHtznvHrA$xS+KXi1H))GeNuNeI$R6hCL`DXDd4z>tx_uuY4DJ->-My-sl5PrOh*o zk+tfUYuB@9-%iz))!S3Ya4Jorq#R0o$|_W<+OC>qCCh5vDS)G0W@z(2%R2RJySJ!V zzhVogOdSik64Wcx%wE|=#LtAf8J5*^_#lbm))J%c8LsoTm?$oD~vy>jv z%o4QnzA8iD8?wZWQ{gP~Yy?wZyvZUWBG~QQw^{V9M=UBT ziamPth(T_6{P;0@^5hANd-RNS*U#B2(p~?fzmCt)UnjCRq{EhEhYY!47k@x{=702| ztPv@0d(Z;rSW*i6)hC6nEh%)Bq|oieEcpOtL-IvW?#(>-YPOK?X1n+~ivN#3)`0Zc zMm-oa8OxZNA7jOLGG{4-5{`@2MpPXXzpFX|khpA7uYuPLVnoI1ov8Ab*=C5o^ zQsvn-GA^x|-6+b{uV25Z-4|8LRFPPRNtt41rd92l)iC>*ObVERb<@U;>sr}0EmPJK z0g5%H*bS`hnpXLrX^raT3_m8XX;~TGjQ7<|tDBbn!cO>G zmNhjqvuvvMJG5-xym?CpTN?+5#-G?VEo)^>U}asc(&wMmuJc8+%9a`^Z(gycc_~}% z81ZR|O0`N>_{ZP8Uc(kmZ0$5$F#o?l_2|~VWbw*asVv#CL)%^&#!4KQ)`r-?ahty- zHvCP;wypb2y7BbZxxjKx)k9vKoZoz1^D}iTdprMR=CQ`I$LDqGG_M`AyNqL(GvAFe z{pgGT{ZXuJ(`pmv%yyhKx#EK0AiLSJpLC8YUR@Ffh2JV*W-( z{t7EYcxE1D_ZP6e*6eIG#dpWg!1IG!Bi5o8t45J7nyC~C29e1r>hwxeJ}UL{IUkeI z(qWLVdrG3MnQGl-vz_ykYq2r>wuwU3+#o99`DhE~lluojR}Cy~zFzP}+GsO&>h%6L zmdt>)-WAZpNX3+wg6b^}4Gpp1*tfDm*~?5dpr^6h*o)J`oPIbsx7CVuF1~jje3s;H z5cO*Z)@i`HJKmn|mh8Y0Q`Hiy9TqInj4fI?m>v4zLg=r2)QGe+hhNj{T}v&)d^*Ng zR4#pD*f_~sRnnk`FY`Au@~^H?Cd^UyHi~jHV%PT+Q@I}tG&x_BZ7gjvzw&ekOVy9x zlu=a~6LkFMteRcdPEWYLcP%}$WJBwDvs1Q5?{)L4V!#5;lu6OdKf1gR-wqTPNP08kqd-@be>G>tAuC)$`(C>i)~q$Jy5EV5%5PHFL^f zY^2ATEfdw#BW}*Ou6EGa`Wqv5*Gy?grEIC1BvsK1Yi7}&-EGaR7qC-5GG$eTk16WV zqO<|?FtV<$FM`r-P~w&Chu2>zXTXfUWU85#%%6&^-6eP1-qY1T)~(6T{@uLZ^j{)} zD4Aci3iUi!SC#Hu6_;XeudVBKgj(6$&?V}96$ev*y^EcbY}ZM50}cFV`!I#_%DCbo zs-b37dA|-}pKmd{X5_{XZTt4(s_Q8Si?QtwDzmON4UAaFzgn;r&&@2@#|;wMclNcE z%r5q;kPVNgHr_JjmnUA`7w=qu;6*uwK~%+hN0xic^b7k_9iKjCWnU{xzfvKOQ@<(0 zoKro!w2AtH*{oVP?6Y7a|90CI{SHqExN-3NO%ab4+&VNq_UirnL!UlxV`9C(oO-C| zpzci+V~0*^y~8!w<>|FuCu3i2h?!wpy~pz-uP)Bu&xQu9H^;n6NNQnjsan?8Gi-8gR;!Ik)TXtby+;1M z{RO?K#nK)wXY;Mu@S2*ts9MSuW=cMJf{m3?$P6pbq;-{J|471<+RU+yiCgHJRwGW% zDS5lP!!RR%ZdXQCW1Y9cv|_2xhfHa}6mefzU72X~r#&;gxqo!;J>OpFRi;dt^`TX^ zr92M~ZfQPtpi#*4X%?*YC(o)~J2t~irG8`0W}1a0>AMRmAM)Ie!tPf*o??^m?AFa# zkNB|{XBwNAO6ASe(|)rZ6Zv@PnqsP8U`7Zo*)V4L;Tr>LuymrRL=EQAb=$V#wVCIp zwako&TRg$qkG)p1yDOZRh7J6RbQY@;eG66esG5GA*tBk+DlFQv)UlIGwjFM!vNlj%BLa=st{PMdY_KCU zvSg>`09~Jw2xw8oz}kmd+Zrh?6v|OSHGFc2(PuFGeN&ZtBDGo5UYxEF6TNBe{weeO z7+SY_+PFQN71VFt?|o|~7`$xHj7Htu-}Pza!LVeHHrw0os2O){i0_sv?nin~OTN5- znRR&MbLfUqlTb(JCvCM8_y+-OU8hqSBbhRnY4^MrCUK3zMlR|D5$c4zH~p~cnr z4!!)um_~s~uhUbWZ#$s&yh#D=eIEYLV2bZ|(N{LKeq`L+Ox3={sI=+lLq`T4-PkZF zYUZUqhV9sqH*qIRhsOp6KfAwcaKATA`zj_STpt$xV5w{MDHHt7RLu^KP8$>&v9asQ ztNS8cs!W+Mw>`7#khUk-b76YYz0ysmCOo;J-ekA^C*qN%$6ZT4P;E(KtNLesRI6$l zjD51}%vNG;p|^UC+%+%<0-I0XzU+YCu|xwO)qDzZ%Ci0DbLTov>>SXp)Bvw@ zZ?5hdxO-^F$JgsRTPl_{8Ma{0o)N^Qxs*Rcc!Q$X@TAnm8u@gn1((en;rhuI&eWKj_WA3a-<7HW;wK{_CMb zec9{#gy4jP)xN`hET<~cEmhU+lONaGH$K++Q{V8!%@d#13r;xSBy{t(9fwBT2(4r} zc9RbaI##*yoEm{28Ti}Of85tnajCE2njfxo9C7hUi!iT)Jo@#ck!dOWMn-HoJ@2Nw zbET6(UUlmQ|NR3GS=RmMZXFX8m)t)}`*!%$NXOEx`V8_oT`t9Nr}OIXFSc+tKfn0G z%m#H?Wx`~rm8xN~@@CyltJXgw{&(^DjxeiQwD=yaR0pl+pr_`#&5p%TgM!V-gxPk zg{#*a`nNZI-SqK+$Z_*pzB=C|p#0)38;wWoZrr()>JJyy)YB$P_q6yz|I&TyP3MD`ez@Z6;{64hRriO=~ z>>lp$=!nX5uDQx{+R+n%E=Ru#7?t9s7x!tmXZM)TGzgwj|{>|5!#)T~l($`LVdCuAVOxb(s&unT& zec4m7teN|omOS-U_@IfmHe9q%c@m@azi`4Pyy-L7yYcA_EfiBv8z~*0*_^4`d-e0c z(A2Oqit_dQU7C7)Sxn``VXH6*u&7ZuB)GJ3VjoCk9%8r28GW=3ZcWizGxfL zjT%qAmFaWiZn_5#8Z`OAl9*Fvy6^p}&c=#~iO-1@I9C|-!{xnezgJ%BVyS3;-_LRD zfUfS>cD7#anH=5vKzi+dZ_b=_QF>iBrQ+}2{EpE+&$Q$iqeb_89d3`9v21Xp>&1r` zR)&AFbl_)CA3ZVt;V*lZtX%8)J;^QAVy^b?9?+2Q>u*h&Ej{g`bm(uYEWIas!1QQC zFX|#53sbMU8+KcDpMlm^vMVp zReHsUzMGS-jhVE_Ty^Zaw@Y-_G4bE*W?in28gHhWYM)^6rTR$SI{#y8FMhP;%d@pg zN5*ts8y|7{(cf!5_}FPrj4jwy7sH*yLaW~+D$XC-a_qpH2`x%4yO_ALnel0(DC!x# zgHvD5JM`w^%J8}6>TTVVeyBsWH^XAB=G^yDZuh8Do0Yata*Lnr>Xi_2AoYrs@u+Vj z``j`}etJN?HGoRvj^&IAQ-)lxy_}7T4BB<*%v$?udt;qlE8k21#+p6dT}*YX;Xw5x z_v^dASDbRdS;>+jlb_!@eBefM zEbGw4FuBQf^QiGF+ORLnf4TY&D$BddAj_zID;Bk5zaP8rIJmN#FI!fNIhxnJ|LSDG z{)k^9Ms|9s@T;8gs#VFc^VqT)Y_10%*!1X*Bj5I3R7&~yYlpsJ%)w0A%phcX`X1-R zs7yGvgN(Q-uZu9}5e#e;FF& zb=xQ8htsA}R512q4>r1&KDibP`^1u|C#HNI8CiK5Fl++hz+6{9XJh%-QTk>-nJUg|bwz@vFbpN&?4K^vv4#rP^b)i`}jSgj>ys7ac z3wltWJ(=QI+;XfpvuPT#mMUeZ=3oZAi&a6>hPmhubE4hb;b^?M(4q zwyOeFl68Mu*OK1BpPN`Ox#O@nprJu+*HZI>n-^1kX=Ksn=IZr_k5#W;QsMK|z}mm$ zR7F|~bG#^SYLv3PylVRB166F4MivH&$7d$9&ugkId_t0r7`dq|lpiT7t_>T)#{003 zcfL%l^)lQoxuf&;ewI^Q7TOqG^1XJzaO9JcA*Rmh>1_=g`**+6Z{G-~$CKONeSK?_ z^NxX)rhK-j{Kt&lRno*JzPRe-!V`5YS}fk0SY6rB((OU}bE~Eqb!cj`J@rj=O1b_U z#(9=-TUBvZ@}%P{4U;-AHdRdjQnkckbYx;^Kpn$Nwlk*BT4QSMeA(20^x&JPKEI{h zzKHY*2h3QH#s;kHe8!AxG39Z|>t-F^d-V(tOOk2X25Z*TjCE?wMp&@LcfE#82yI~G zvbZ!O=-94X+Z}D(Wt6Bh-wyid2Th5IiJUAqIPEm}U>xmk;Iu2DP>US&Q@yH1 zqNrn9W#Y7}gOkM$rS!$00--2Fs=|>q488U=BIy!P%9sHo&mtTI# z$wCQzwxDEd@Kax#OPUf_mEmIwX?`+w!g+F`tjHjlia$3#jWZC%6%Aly~9`x$c zk7s}X{Wqr_gj)K@Zi$D5g=yO!Sub)I7Z>gO!mexG^k~N-KYR9UfyQC*b!=J2_$CK^ z^y{_(^n0`kJV$(r^Um5pmo8m6?edoTUO~oUvgP4qF_J6#^|b-ChpShwYU97FHUOUU z{P}ZE8*dBL-pFvCljV#Sf6)f?)j!_pYXf8jB*|azstwR?UVi4x8BW$a@05PX0iaQr z51=j54qR;+7G)bipZn>jpQJtud}vp(R0e1Vd2w_sfi!04rT#%Tc)e~L0AE6TgbZHP zZ2VzPo^2aI`b9AokXa?acI_IHFEHene%f%w(GDQ*=(Yj8qn-Li z!UrH%K?X;@g#r1cA8nAVK>7Xq_w}{`xjb5!ZGcW}kmlcoK|9hY2>p;ZHf`D@@gDG^ z-o1Nk$6#HVv@pg3vM}bq{q~#Gr#=Mw!SBf$SgH^3+BtLPWSSQgb{iNrY?#Dz3XArF z)<5bPvOjb#=#QbHp`1<^DUvn--3D1lYk5jxl|ez;KXhQ1LN9T(S}nCneQkhFRgwA_ z@GS@*K;6g0#1t0U+H?v+Kjyi*K)c#9wE^&JgahpW@XH^6{4q-zjdu8PXJ=<^8$utW zlWRCx!xwtp1E0dCA8o+f+dC5u_=Wvb z5c=1zU#}OPD_5>ax?wR-*KGrOBV|0ic=2K;-2!9@I@u??CQ>JejuC*%gBALHQPGd}A=>?ui4RPo6WP$;^#R5ZU7Z=?qb(IB6czoz`NWA695RBaPt41+ zq91Z3+Pesgeh*zjQA1JEkF`O0d(Mu2jFEzNTrnr7Q^<;%{37fBK)fLIXEh%$>;m~v z>;FIcHTqb6^{uPl(HADS&;D)ouS+}pxdnY;|4sB4gm#qC`=%ed8#-Zx)9IFc?b@}O z936O*iT~^C{{^969#`I8ilY9p9)mS0Iun&cXCoiia(j=p4anCwZ{F1E`s6f-dpRxH z-HY(J%AqLehdx9;?&p?f-EfeZ>10;zykAa(xR=wC-Mt9^F6c-52JX7_QCe}i2LklmcPp?d{NYYP*4!3gQ_^}0?-cf<6uVuJ;=0a)1R!ar zeP0yxL%#vp6?4FX*vG-Xj!xTsi*E~B@_N;!9sZo?r##d&H&x5yV*LkgGpqT(JZw?i z=ap`R&kFvH^n;eH${;H`vwHq-rC*dm%9|9Pl9bGG&90uaq8~ONu>F9;y)ICiA6)wv zIKF!Ff^VI)mea}O(iQ%^0`x1e{So#*y750``sq|S{*&VrPN%+0SNIDX{(qw%eMIUr z8U01quUmfE(N8D;NNXF=-Mnje`0!yKdnY>2^)LDi`VH=N{kfqZwYJ> zsdNt~{CI~j2rEDz{aE9~9Or#H-TqHs{owSK4yiwYX5r}T9Gp%7AeW|!yFd$C&nC)&BFH{Gk?^VSOy#DDlU`}6@;dEMWCPydo^2C=3diy{6yPO~7w*S8`dUf-a)31;B$>qYg z`@g2Y|HBV*?*F>^zi+>mr&If-uN~=iy8K+k5zlq~x-?P$du#rq8z#4Y^yR_?QK$5U zBc7Gh<>w-fc&_W$#qUF=Ul-S+@D~>SgJ#$l0JX~kpA+$p+qS$fNx19d0sn?)qTB?oCSKzxe9L^P;_vuzAcc$nnQMZrII> zJWw`ta=Ntl9D9Am^TN6!eXLU!1myUm4zV{1dlrBreZfZBn~vv4j~d!nKlan04zTY7>7n0>^BoGS4q#&n z`x>nK!Oj3SNc08ZY#sU~>>0AdA9P_o4SN~nb%66Z(6Sq&(qcc ztK`sCJdKwbx#0+9#f5zeO&?FZxQ>({S! zgXP&@Q2bE`*lQ#D0c?^%lN=BxI5=36#n5grk1MQwSOvu&cw#RlWEbEDx$DlIJ96}; zu^;lDX!kgi1F}J3Kw;ny83^{FS>ca9Bji4WfvtF9!TZ2pS5_$qEguU0=p(}Ag`N)q ze}T8SzEAwIM-+S==gPs}7Y=$ajNPLD>b4(&x4349ziya^7jQPf20Guc*tdW(dp8chNZKff|kE-dIj;zY2a_8syFEm3IDW|RDN#r3CV5-_5-;A$gntz17|+T zfyzP+hi51k%-{9N&v;*002@!(Il|5bc0UCHefSR^Jeb4Q4`WkdJLuh>KY5lb{NE(J z;n$9b@#x5hTz)U7S0Dc1dl-wvxKx-|oc$bfEJTa{LEk{06i;W)WjNr8c95E!!lQ3K zF!Fm5Mj!r=Ss=p~m4hDk>>p>f_{08FZUZIko9L^teC@Zta8H}j{O3+yeAN&? zKAr9tbW!o0Gd6PiBCOPmbju&}CFlx@(j~l#*W$lr!kSDrOu{}1ef;6Id)%k>WWL8| zD_38Nli$B_4QM=^CH(LA;%-_Ki;$CYVYz~2&y#2sNby4rx z+P0Kc`;jW-9sJ1o=j>J!_@Z93wa)*$#r#Ed9GABrv>DNsvTHx@0Cgz~;Q!mGrQGYY zF>g6v!WFiCsDr0>W2N?fZ0WvC_pl2VAa6h7S#GXqWBCQ(_V~sFu0DVBEq5<0O4_G_ zv|*DB|MQ1WGu_MceINMC^DpQ<@Td97DY{1G#ZjC*h0jacc?^3>#~kQC?>jC5*lEG_ zASdj!l$GB`g6j1{w$u8c?Xalq)NrD|L(h#lEzb2TY=`-}(3yz*a=Oa#yM6n%^t}q` zit){Y!gg2($m==00za%Pj2}NZC!y1&_u1}61kj6R>$`EUtd-m*+ zXocMa=8bv9ON57A1nLHOif36}k?*;4=k%5z${lMV=qHGeI>uU6LCO&8ywEqJ-{K5! z)C=?!`W(()L0ifSKj?C>hAheubIPq-w`$8UKkX2 z^$Q&h)`;;<98rc?KhAF%LVqC73zdep52p`MK3M0H$C2ZQGo!Koh<=MQM0-IQ!nO$X zBVJz05a%!F<-Ek);D>&Ia~Q!#g}o1WAkNLtOFM*}8@`c}7sxGsI3ox4R@f7YGK9V! z=S-phpbT^B%UHwk^YhEI?QCxFLs_A}!3GAp1P>1nsV`$p246xMf`37uBzN+9$GDAk zp}azF@WVQjeEnFIA_YV!-0>352F3a%TJD5cKFHPRy7jxl4`T%6O4zpLG~dJ+h`9jf1@8(! z@ZY$&I1av+(|jHCddQygHl>TFu3z3q^3(q0@$++^9X`70y$}4bPK>p@F34XA-k{_ z&R@t8ziS~^_#eLq^H;GiXkB=(v~DVJl;el*)nPuE9S_OtJ6~G&-Zt5vPi-)Q@1GyQ zLwBE(T=4V-88Zj(0qeI;73=<#uc(D z=D>yJo{-K3?QaU<*o{0*&r;|vn4^QoGS<-Xl!O8p4yu77Pm zC84B?pTM)QuA=`=symF&Xy(DOt_Qc+$y+)TCnER?$J*Y4&MJQRm)(38)%C6)H%aSD zz@fZc`SFzprMlifH-JB)^C1wOXy!rHK526V8DK%|iDKxkmo2z}%Dp^xV)3!(KcqJ2vR+#d?=K zf9M!d2AH?PE(>Lnmoh*+>~}nQ@}#sUTAxi9Yz2WM<`e*tKWui<{{Q;xF9~mifjpm= zGC;Y3F6gPUvd4lwA@=X;=8rfF7cP{(&5SY-x?!x_=B5mw@tc&DS2GCK;zhj!;{5?HA zIrtXl(r5?J$Ac%KFNt+1(WbD*1)U4}1ayF?@7zFk^h3uW)?h$0_9K9oq5jbqfEVVP zaL^}1XAB(B-g67t<&QGQK1>0k48Q~A>*wezSl2`w73*LkPEOanQ1y*{ zXcyoE_}-_WUC^nEgLs}>`XT!rJ9bR6&(BI0!#EGU6V{>S`OEKh@yKodBAz@gefJ`q zxaJflulb8~b9;U8_g#$+g68=806JCdtHl*S_^RPh-{61XC!(F_^@=pGzhQ3MsnQ%? zoFAMv4oc{`XHT2KYOTRqLg4`cp6~t#YA1CROptD@!?8Bk+y7@;0U*Wny zvUA53e(d?srN1C~BQDDNLHHf5gWWXpfs2ibraq7)UEv30(yRbDliaArci}P5hAmrO9QN@- zN01dDeUbyz%a$#Z9vv7UhRA!kF*&`neL@ebdy{{8pgIcSzU%wb`d0NyUrhyEYu z#9+;HIju3|L<3}h%*P;$WBpU^&`vNnk*5#Y5Z_&Zof77cm^)=f18_%~fM$IFSpnxG z$@K%i%CaL;hU3a%HwU zrmWJ(920=@L%W82hkge+7Pf@Y{|Nm;OOfd( zr}PmH`WBS4u)l#k3jLYf7E`3Bdo4)%n41EqT}w_kZTNFaA7zd9gSAD-(y)Po-VZj< z*gGqqSIE;xp1DaMa}(4r%0t)T{5EmMnn+LNA^bVv4}AdIChS0T9p=axd_`MEx@DD9 z`U0PvuGqhI_p(~M)*`}#SLpIL^e?nMtVia?!S>K(p*#IJn)=%xJE{y*`k3z6FNMcL)$`scP& z+_%dN$yNbtuu&Hy`LF$clG4VSCf2kC{&`7PgjExMfvOEW&}#!f=(kHM_wXa3v=20# zpWks>T2IYLKhOKZD4w)0jO70)I9jL6yiY7myU(o1*TW!(l_iI(ki+~;^vYq7S8o@R zJ5GEi3i1>B#acQ;C^t^#XqmV*BZ2l)wdgh&tPN(KZ3a96Ua!*~jrKo>{I zb#i^Fy!;SXo*rZ^oC^wlHs;BwZ^$v=QQ%id8*&`v0DYjF9>!gaxhO}}3*KXl2Tz5~ zGsa}hhqD6R^iamoWn#=jIpX|Y$b7<%8RtY~C8r^etkT0flppqQp#H(nfg8rx>>#`J zAU{D54_Q{M8w&j})t}yEvq}%PoRcR{mUJGFxuMg=S_*W38SOPwdLsR-(nEP+T!1Z= z++iFEcHa)=)(9g1Ss%c()aep8F+vsIHXh9&qej<#%fA+Jai#W07F!W)! z3CAeN3K&~+bn3f&)nGqK&vqr~0>5?cI$u6;zVuDClm17v>B-9?yL+5%fw67<$Y1%+ znVa~1(p3RZjB^;@s0@JLY2cVEN8=UgIHKZT#78B*N{piTQKV;*TpICFN~6%nF^pF* zYp^CK#x120d2|4I(_BhTa&NYd+Nqkt>bjGp=T>8%8hCMb4s&B&K8Ey&U#X$T$GR5e zE-_xnujqT|H|X22p@)O67V(KUsloRkv*Rl4o8|GrQ!!@*|AK>@jlPBWp!>*?Bhnaw zaS3CIJg!(r#P}fWyfJ?TuR?snLyf#aALdmUGvqknEJIx#2xM&VCJ`UHXYg!{&(QCK zmtm{{-$9?%1>N}AiwPc${*3u4^rqk~SUbczfG+5ZPq;|meaBoDJRNf%$Q=4WUwq^b zyus7K+fl|S6EWYAr=u@E_#nnXv?0v5a0L$Foxn{F`r;!DbOK06IJ7rBhkYTwqbC64 zJLaPFPO3lPiTZ?mqR$=PxStjd?~>-W`k29f&B>m>Ed*ca-IybH{C{vX07a_Rs8 literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..23e4e1d928b6 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Projekt testů NUnit 3", + "description": "Projekt obsahující testy NUnit, který se dá spustit na .NET v systémech Windows, Linux a macOS", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře UnitTest1.fs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..3443ab932ff4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3-Testprojekt", + "description": "Ein Projekt, das NUnit-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet UnitTest1.fs im Editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..a18b387cbbec --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Project", + "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens UnitTest1.fs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..3928359f45a3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Proyecto de prueba de NUnit 3", + "description": "Proyecto que contiene pruebas NUnit que se pueden ejecutar en .NET en Windows, Linux y macOS", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir UnitTest1.fs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..ff91de2840b7 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov alias halex2005 (codeofclimber.ru)", + "name": "Projet de tests NUnit 3", + "description": "Un projet qui contient des tests NUnit pouvant être exécutés sur .NET sous Windows, Linux et macOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre UnitTest1.fs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..b6abf2d8962f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "Progetto di test NUnit 3", + "description": "Progetto che contiene i test NUnit eseguibili in .NET in Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre UnitTest1.fs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..edcc7abce68e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 テスト プロジェクト", + "description": "Windows、Linux、macOS 上の .NET で実行できる NUnit テストを含むプロジェクト", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで UnitTest1.fs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..b4f932ced3c8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 NUnit 테스트가 포함된 프로젝트", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 UnitTest1.fs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..3e4125522476 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 — projekt testowy", + "description": "Projekt zawierający testy NUnit, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik UnitTest1.fs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..01b81d84aec9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov, também conhecido como halex2005 (codeofclimber.ru)", + "name": "Projeto de Teste NUnit 3", + "description": "Um projeto que contém testes NUnit que podem ser executados no .NET no Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o UnitTest1.fs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..2e0160cb6207 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,15 @@ +{ + "author": "Алексей Харлов aka halex2005 (codeofclimber.ru)", + "name": "Тестовый проект NUnit 3", + "description": "Проект, содержащий тесты NUnit, которые могут работать на .NET в Windows, Linux и macOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает UnitTest1.fs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..5375d136767b --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov, halex2005 (codeofclimber.ru)", + "name": "NUnit 3 Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen NUnit testlerini içeren bir proje", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "UnitTest1.fs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..aab602481e11 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 测试项目", + "description": "一个包含 NUnit 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 UnitTest1.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..3b1439da8474 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,15 @@ +{ + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "name": "NUnit 3 測試專案", + "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 NUnit 測試的專案", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 UnitTest1.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json new file mode 100644 index 000000000000..1cf15ceb1129 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json @@ -0,0 +1,93 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", + "classifications": [ "Test", "NUnit" ], + "name": "NUnit 3 Test Project", + "defaultName": "TestProject1", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", + "groupIdentity": "NUnit3.DotNetNew.Template", + "precedence": "11000", + "identity": "NUnit3.DotNetNew.Template.FSharp.9.0", + "shortName": "nunit", + "tags": { + "language": "F#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": "Target net9.0" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "EnablePack": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.fsproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UnitTest1.fs" + } + ], + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens UnitTest1.fs in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj new file mode 100644 index 000000000000..870348322747 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj @@ -0,0 +1,26 @@ + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + true + false + false + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs new file mode 100644 index 000000000000..31dc4f7357bb --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs @@ -0,0 +1,4 @@ +module Program + +[] +let main _ = 0 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs new file mode 100644 index 000000000000..04ad1fc8c27c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs @@ -0,0 +1,11 @@ +module Company.TestProject1 + +open NUnit.Framework + +[] +let Setup () = + () + +[] +let Test1 () = + Assert.Pass() diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..14998ba8c0230ce9432f58149ae3874979717331 GIT binary patch literal 48778 zcmeHQ3tWuZ`#oTKU*UxG#f6I!H%Ua};JIyRsYel(c*;QFq z3a#5(q1v_Xm#|_LYFBQFR7yq7|9NKSOlMv*-Ag{7-jCxsm*+gs_j%59&b;sG%sYf| z#FXI05fO2!OUNe3J3Fh(p%#Sv1$7dMrYs_4sy!iAR_gL(At5#&U~eo-RQ(sXB}67u zms`3J64r~#laSEngj`!ja=C}+~l+k(Ft+?o|zuLZ;a2;1#_YX`b6Gr{H?t_ z;&p09Y=YPCQaS@~E&ntKtGWLsL+XOCWXlK6`Uh!Wa$v<`cK^9}2K_m%&G36n0wZ;ZRVsKur5Q!ew!z@ze$N5cC(JH9XS#ky4& zqi43aOYtV6KaXsQN{>nyu-JRw_mLToN4hMUnf2z%zEO9Rd$w4ye52Q*JGD%^m~wkhfY&@cjc4@O zJu2*ItYF5|!->xQ($^+tNnGekgo<*w$$TYsK-cX66u*8{ehucdx%K3?K; zw-KiZUi@jBgg(Jf1a1vBWwhvcEV289HMc?6`APdHw*UK88{#@lIe4yD)7*YevkN9( zSUo#h{POC(L1!-flrJL2&AXACosSM8IUkbf32WjVUUoTqIDdH4(Nb|Or(<j$qU*zrn-Kkkm$L!nOzn{mG z+bzaycIcMXVF>-x_&ZmVQUykxR zGSOHTKFaIRS9Qt0*}ulF{-oXW+&w}EGP3!`8*~2du`lu%^bao(`@9%4`})O8H*?b3 zipZhUbN=l#-TF}^d6B!vMf97cTW;>&o0}cxb+?SUdj0x_t{+@j)1+J2xpP;8ei(D! z+-qCdvpK)}y7x3uo^5jThvBQvEo(n@9yze#(2|sZr30p zZ<86hDfFnF8NK}Gy|&p+m2n;Z^7KEDX4`quhizX4nf)b73cYSE>z@DO@3`|DTVHD3 zEn`LCq`SBBUW$FXzZeveAAMwlli2kA|Wd|SXDrRjTDFPoq0O=_bpHUn|8g~ zl?mLVg?+XU%vkXKNq>KzaWg;9ZxJma9#50Lz7#lY*{FyU{*ew>?pwrcXj))Detnx) z$*!*Z=6#<1Ug}~~@5Mo7U z%*y%omBa2sf|v>LweR6zjHLNr0S!m-GL~+pRC2=y3`6oK( zUFYW}C@V;lr#6>$p27VNKtoy%@^6m%z;Lxpm-95tQ-Fr?w71ug! z(zYe1j~{rL;hFe;a_isSqh@<;4j3$Kkdf&%|G$90-PimkAHJGQ{$?UcRc5Yw(9&sM z!J{=(5~G&H9hfk^bHZ8QFOv)APRo$h+54WtMcUwX;G(;8KF*!sJ1b{@!o}9z{D|A% z*}lt8&&)mE>&qSS7Y4L7AGF|uUl(7zc|X~3i-(-oS*k%=^I|1tcuq zr~lcOU1OCW-A%ncMVYGbS=`Ne=~u7p?U(KN`1Hcu*ud9Q)1+Ch5vRsT1tbNzgBvHv zO*`cNA~~A;@YSow{fNvx0b+5(`IFL3%~~8E)nMcL(M@gNpVuL8>g!kOSxK{hx9%T! zTXfy)%$g=~$vc$m%p!BfG~)&^2~Q+SreY@$Bb^mpu^eZ$_;AZr5)qwsPsb#rs!SEHiRvSl#Z}#NCt_ z&q+S}+3e-N{gb*E*69100apKfbuGgZdTdA~zc;qqbYbNf2V!+Q#MSqr^`WENa=-z9 zddYv&a(<}Ac?lWigG9fm8gqZaueper?UlzPdnReQNY>IhLbQF|+ z7$lTzu_uCiA$HRbHEq?`_DBbThwV z#*hCt`~0-xlt@8bhACS|ym)o(VnC-mhtD;BJl@vIf(vfrnPs_PUGBOWBab|5kok%D zn8H~^9I|goUzq;#jgzE@amn*UMX>=^0cN6bPCR?X}q zsbj2Y5vH8s&3)Cf6WN@9(mXdY;+Am3p0mUw+w07VI*FFq_Vyw5qni73exzw=!NB!F zJN`_j(BlZ_>Ti=v_0?1<}F)3>Noa^@Sk%%0rkCR((u<8LnedHvmax5 z!+EFRuVe+m}Y9cO!`G3Q(>ZcLEzn6s9qrgOPVp6`*11?ge1MA=?B z(Z&dL`h-Xw9Ulo!k2n585GUQUTfF>)W9Thma>~+(2b=Fro$O6APA_;A;(M{RyX9@A ztTi_yBY9=Y)iKg3qc;wiF7?Sc*WyxZX}x;&9<&tSngi0!v-4*Lb^XBhm}2LI`dHqP z=bP7X$Vn%U4s(fXvRnSVr|}ck$ZVY(an2Io6lLBMdHARD8S%%L2AkVCZG}-76O$Uf zd7^E=`ZnMc`8PwA?I&H{Jp9qF`p>$qhA~+ZTCiZe?XPy6hg<%I7^kGg=V0KK0vH!> z?%_c6hOJxv)}PJ4h!Hvari^KD$w@Njl!+`QPPu(m+Z}n`u9)RtKcnyjh1x;QMl z$6T(*fLbsX{zH|I9}nMMu;w43O-}(JwQM~9-0`I!Mk zu&c*Vd6O;fvhUZKk%`KtVbM-|#|8Xn=awvzW%Y|*H;;qJh!daO5NY23eSowmv|#Lp zc%h>;^gMCCZD_&28$e4(!H!Y+_Y=H(_MEpVMH~P&e?Lwj$+|Tr^=>|lhV$NLYtP$R zErCFOc{a7JIIq_iJD&=+TYy60;-pg*moX zeE?|N;Jh=f&$!F}&jA$J-~UJGS&s~rAF@B<6r8CBwyPHa>$OV_EXZQ-xOyk;0#2dZ zw!%c&=PJo1!FfNMA59f}Y>uuyni!N4v~5(R;!_L7y+)tejOPr443=Ux|I+i^?i z-TW4Gai}%2PiT0%;4HP8hxS?SvT%(S{|)oF0c!xrUyk>kBuA0E@9w$WUYxC#anivs zkXuKZqF;w97k^cMSEnDN9=LM9`FB%{!4;FXxGOeI768(^lk0cgyDy;|85fj)Dr{KzrO&zym3OdC zaEfV7Is{tp8XVNAU*5L-{Pqu8)((?SJ^QM8gR6cd;kRk+`{g;#8RK(5;=#tKhuab- ztWoUTJNiWA$Y`Gv3*vf25O`j7?pN@Bix%M>zrL|~cwY9iJMTFz7`(0fXO}Ks+&nyH z@`X(whX3Z3IDPaf`z;o-vu*qN46r}DB-g$#H&Nc<@Pf<-xvhtc>|plmJOa*~m9eXX zS^q4{Irjw%*4~icJH7hBu>HLB}j|c8Lu{;L0zK6f9fn zO}hFEhRXfwZO^j&EdLZdiMKlw))~E%SUyccYa2mZ~XIy-0k{suGY85KOi}ujD;2m8M9#H-Ba^T4qxM(%_NgrP0KfF z-cfMfPH45>=1b+sueq3(ipD#C%MxFoVglJ8mru@5*pw`C8*d{E95Oxs>%AuAXEG}w z1w^-K0@)!Awr8bn&s(*lpQ6#vBz}YIlQB=)5IbSO_UmB5$4@c4&T6mx<^elyil0E# zYS)eE8w&u2M0gZn^tp;KCfbiw+J!}*onjo?&P?|Cn!WN5w-65-ncu90Jj?IHj3E0z zmqP{n&&@Ipy|spY_Jrk$-CwSW9Z_fbVA$g!1Nwa0d!LKP(w2~i4J+aS z33stnmwHo6omX!jsq!u^E@aT4LF9`sz962So@Dy;>15%;h2+Q23EA#$Np?*VlfAQ? z$ic-u$?q!$k*I)CBoX@}$iagLNmNu6iH-Q4TtB*n z#Gl+vk}e%3r~W!c&Ye3)u3x`S5^lwl`!~;$C;#0f50dYbCr_S`=cx}#dfIc6ot;f` za&pudYyPkCK#d0~%>zoMlFD{0`l4)Pw`t8p#bq~N1y}>81aM@uRupU!Eh+r0v++iE8vMQRsm0Z zaSGlLUyOn`#22kVkN6@L=n-F(0=?pkP@q>lPXR^}To`-?#PbxW*qdO~8W68ffn`zR z-&9bv_%{_4Bfe093cN#c;?)Y!L^Xe-qS51QgL$CKFD#t3+S$ltc>Il_taCA}sw^}z z@&!7)s)Ek4uBu`9E#Ktluev(&Z5$oVO-w}C3n*OXVrEfMS*ycu@7N5v8fy7X%ygD@ zs7EyPGIn&dLw*Z2f5T>=q$vxC$8YWESO@t*DB@}8Xo3GR7W4Sub96KX%qAv)8vd^X z?4o9d`N5k_fgQMPsl8@R-?SH$Xs-qU-qysVwu-;Dsfnl4idADjg}b@6LO zV+Ot1)Diw`sNx4_nd|WDMu*y)D$y3mk5?TX{Cs}!CI|$B&D8v+7R?OvPI|?i{e9S0%iE8rIuJ$5JIUK%P{~;L#0TQ0EULjk%D4MiKV(sjMV+` zKmqpGQpl>xhGGOFS_&4Z%0N+{5-8}$=Tr$K86@p(Xr5E++Zed&t1U3l3e~Fi z`ZnhD-awa{+o%NC*cf<*6sQCk?9Op20jln1)_9l5zf=M=?bfFJR=6id1uFRhYkdOL z01XOI<1;KkV;?afK-1kI0@@u;wV{X1taVM$b~hlPu)AIXOn1Ek*zS4+=yca3K(~9L z0Bg9+G@fVUpN;~ygR%VXtN?x83lUgbv*F07u(5#v0O@SACPGzQh3ytbMiw?UMsQg% z42A6?BO?*E+ZY>Z+fk}YK2V{Nkx2)fV%=V(fTCd z!34KCmYCqaN{k8ar=*zRu0xIqZ-pQk!Tl45_fVLiUSHy%-U#ngtRP7sY41}s_a#uJ zzDLoN@%|)4vu}=j=0}zfRPC9c+qsBb4EI&-i{qX+?tiD=|5s=4J2y91C9dYb8V}TX z;N9|o>ORF%=OR`*pZBI#mO4AIMwa|Cfsd8K3l4i*GF#QP;DL$M(cY#A>Y#rLHJIW8 z1wD*K7I2A-ksB{_L2V0*+5&TR33`|aEi8m4YHqBwN5vvm|Bds~*UUSO5=9GKQDfh88r`&5!x!0U>uQ}yj zbIQHulzYu7_nK4gHK*KbPPx~da<4h%UUSO5=9Ih6DR&v}GC{(3EvPPdzd~6rIDKvf zDG`#gnx`3MwXvvvV6%TUx0{Yj8sL-^WlL$>K%VR!v7P!Ly0kVL;s?9mmAI$2Q(7VO z0PKGw?%^9SN;q*;Z4!J#N12qAMD3=u-19(R+`~6`s*T<37sr_?b^lKPV;4&2k%1M^L<}Y^Wa^Id%h3KI}b_|_vml<_MSFXm$^}%c~F|T zk31Twgp;G%wB?5%s>Rw+)_G8xxL+`TzSeH)1Ng>fwOJp_G7rH18Ib6@siG){KgY0) zwoXVYUtMCr!1#LnE)YvojzcVpV z(PPi};GKwpiXMB${%Risl{NN^52|$xRMyxt_E*~&sO+(4d{8Z8pt8rFvA^2IKvj)B z>2wjJqD`l*fTz;)EIy_R_I+L-uBot_E%aAz*{-=+WxlZ zJ++-u*ek7+7^v=J&)8q#G4QU8J>!E4je#9M@6a3j)n(pOyD2Tr-wW8!HbZ%Re>mgRzqBFY~#c%J4;v{S`a@@YZOZ zSmMW48Ow>#F9?#PqGF&Z9Oa3BJY!ds>+sf^OqOg?J{%cpS zR`%Fa`4w?Kl*)R8meu|jnJ;u?!Q1&UwAk5sfO*zN%p0;Few9MoR-Ns~Gn=eU@CGm~ZnTXZM=Zmy zWa#j-_M@Gc*x1K*J@Y25BynzthsBF|HkQkhXXU}Kgy`6hYaVMO`h(?X+xU6(gMsxw z$dGL%sb}?9be@e{#EwL!ZlpBU`E!DeX_lYG!`9>HA=?J|YH2@z zoGEVp{Q!*%w25yg^0IRX+o>GJ2j#NABr#GF9>5dJV0vTSX7Be{JK4`cwq9Qzd09Cc zeQ(`()CPS-VkHq$y>5BZ;$8hOqo8K27J0UR@^ZBhp7%#1U zU0i@qfz1r=7%WqJfF@ztvXH6(h?V$j5BPf!N)-TUAyom8E7gVqRRK^IQUm~MRgO_n zg-X2&2*A*x2t;jwk%n?wL->YOR9TIHAQH4tLv;{CH6lfgmiYE&XGk89=zAg*27g=x zn0Ob&6n=hTeDUwCs-j%(bqsLhdQcTu4e5yBxwOPZ!2Py9JNdS_l^C>!5wPpTO;vxd zp7%F~QpXV+H*e#6@wi`tdYRZQaUAjE=54*t0rfKYF<)#P0nb~F8~(mdY2yg+M^l^i z#SMO6h<>-WD!w~Ynm7X7I_r(TxWRL4?BDaN;`>h}jU&LXpuR_nwzK1jf16;jW4@}! zfW-xQ4}I$?)LTK)e%9i-2o^u)@%#|qhRPlT-ua9~eb{Lo;Mb0UzWB$pUwr(PIR<*- zU$5^O{MBjY*hQ6J#B0eXgj zJ!_$_o$?{Ye!R0r#qR4;8>wuTmd5{dPn>^V4sr3%zp(bP_%Y8rUsjsEb*=ySxQi>Z z=YRQUpb!(Dhh_c3;z!%iX10zw^HJg$V&xZym*38w-{qfS(&JMdtaNPHGrzPBFjWbD z_B)2`*-_S~Y+SSTXfKPMciyPd@w4kDdxi)xvbfkYb1Z%~{xSBM*uj{aLFZ?2l#QRV z=Gk+8h#fIgeC(Mw7C+Y0F+<<;@XLzBP20D*Qjn#_C<9Nzg-FPgDQxZa{>ev*NpCgmJkS1YS3cqNKR9r|EShiIE z9*veV?J?L6{gPNJFO;j&ql8~Y#&!*5@gOcEsK-N1l$t;p{=p$EHMK;lz|&xADn=TE zr@+)yiZlseXs8@1Du!QXR-KQ7Uu)K((4;;$R{>OWFidqU3-w?beid4Y2hl)3p3{;* zl0nj*)3Sm>5f_YMP$k3$KfZ$WK>)pyD$q@_Ncb42?S|gp&A)doOPP6A((wUnyS{g4 zmqnMpJ}8^h**v7NzCqz|ZGO4+~RmdAERe~Eoyz;=92l2CbNp~ZbJP}_k|S&9@3yly4I z1AJN^&@~w;)r&MEJ)<BRjQ1vmS|3zk|s-4}-z&!N_f3Je>(Lj4*34Ktc{;aGl zRXe*E!S07p{fGzmv#?CD6{Vl@P^!=VjOXcES#&=S@P^AAUM%HeAo}MSCd!RV(G!C#1Wl+8RJd~qLVn1IeTc#N4-V)kI zeL?r5szN`jgKsBoqm=P~k$s z1Prn48eLp}%^Ds{hXVRL<32H6!;9*VJeoaaXWCzb!M`Nqpz-?~d%1uC$1)MumW$!O zI-kS%S&Vg>bte&dS=}@b^=|lgxe&mZdjDUo49sJl=5KaxlwThO84>uNi6hGgYWrhe z^X`cv*A + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + true + false + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb new file mode 100644 index 000000000000..27ef109c8967 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb @@ -0,0 +1,18 @@ +Imports NUnit.Framework + +Namespace Company.TestProject1 + + Public Class Tests + + + Public Sub Setup() + End Sub + + + Public Sub Test1() + Assert.Pass() + End Sub + + End Class + +End Namespace diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..8cb77b63f5c4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "UseMSTestSdk": { + "shortName": "", + "longName": "sdk" + }, + "TestRunner": { + "shortName": "", + "longName": "test-runner" + }, + "CoverageTool": { + "shortName": "", + "longName": "coverage-tool" + }, + "ExtensionsProfile": { + "shortName": "", + "longName": "extensions-profile" + }, + "Fixture" : { + "shortName": "", + "longName": "fixture" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..bdd89182698f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "symbolInfo": [ + { + "id": "UseMSTestSdk", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "TestRunner", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "ExtensionsProfile", + "isVisible": true + }, + { + "id": "CoverageTool", + "isVisible": true, + "persistenceScope": "shared" + }, + { + "id": "Fixture", + "isVisible": true + } + ], + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..40382f8898eb327d5c68b1d76423d5b1034fdfdd GIT binary patch literal 47213 zcmeHw30zF;|Nk@7w693fV(Qwi+~QtBsK%O05lV|TM7D%Ni<+@7UE&KUqmKop>b1Vn&{Gyo@I zeeBrQcAyjhzOYY4rL8Rj!0aIa$jG#|R|^90c?6P1Z51#P@-F!e02-~e{p)l94o$)I zser)Y0NixP^uadNW9g6SQvs_f00>3`aKLcBo}`$97*s3y=bV{~kT$kOAy`;!4qSy= zj*IlBgV1M6#jruKn`ST#fa_l3&C4JrAi8mmnIiyF_s~juI)e<94j&pc(6U9|`?&V$)fJ*nLex2{ zmStUA`a5$?LBjoqx+^FdtCJ2cSvJ5!`U>rd{_LQ;r@`;c%hKC_DRkQwy2jL=UgxV@ z=j-@3>{7l@e-YBNq9*M+UpKn?iWMuw0zD5OKK#N}L|oy}Y|kOjR{Jvh1twL#f4bo5 zKXzZ5^nl+V4gatjOT%im|x2&Ld6+RQwXw=z8$13dmD3PKb||6tTNh z5>ZilND9mkufInFiIe5%lSF{&g92%B5?E*2oUaOO1U+^2Dd3vTmwgAa8Dl>bGE$Cu zc?AkkH!;j`Yn9Hcz=jvy8FXG{Gu1?~g6-_m~u)*Q|SCpIMTY^ftQ4 zUi<8s;;>sg0Hfb2PiwiRT7j@Yx>An+eD^JL>6uBli+tQhP)-Iti<+PAl6G?~v$>(s z?x3eCct!RbpH)|S!8j~|b=JIT`GVS-#suq#sQNw4R{eins@GJr?fGorH$JdW5jmmWsZr<9bO#y0}nwlqWHr~kGN2dU>2;-K^ z$*lB>WUJTiNq+&FYLrIvlZy!~{ihC9Wa`1f2`XaO7q*n%s5fwUVVwNXe)?qKJlu_$ z>!qXrK1`Gh3?de`+={IUPuFG@2zsU)%WFK14_$hr();>$s^bcA#+5Td45h@Z>JkCh zC5L_9-T7R3A~>S#?3Kec|7PtRN@b0lV(7HBB3w`fqz-!#&~mBf)M)0)rF66UiB>KV zF~tWpFH2V_u_~ioL%-h?rtrwiKYJUDqcT4GulF-9<4$UvW>6;lm z;o8T=_qN6P*vtD(0oegDjN(g`TXk>EPC0mVkD6zcm=jCf z{03H4RKhcTYLRA3&4g4^V$hA0O5N(JeKjH){lLbx(g?uMQbWA_>g81vU!d~Y9wADgC4sp%ftGl%2lg?rb0WkM(J;p*fmOj5ap0u{g z5lj#PFK1^>6uK}qlw`9+CyexXRAO=_Yko>eO0|o}3u^}fW#BW))tbIjow1DqRt(vBCQ_op9Pq#^{6Hb&MG0fbVSw*f!7H5vRZ`Y5u zhLT%8-CF@W($pD8>>1n7O2deZy?Siqf|7-sHV20#3Fs`{RyEzwS_CAmEqJ_p$O*@l z2ke?Jiy!f-*y-jYkm#fTj2z2ku3KBWI>C2f#D%M4np6yT8o+QWE}@S9#m?(ekFp zqqwzYp4w)5sYwT>HCT|%s=ck;X)Oh3PW;w9cw;{qgW|F>P(3oDH0etjMCWH`0{hk zotkY0N5(Wy`5dcVx^=o9NF1CcBq1STyG>+zZvXpH6^?LQ$xfgrloS_Vuhk%(9~QlL z@7{|`>$S+h>YezXJ8jB+;~MYO45z=%&(F8nb=8alV*g&C`1Zz@c~Rjd&h9D>HSbeK zl4Ke)R%%QYXUu&PL9w*7T>IeQz~GP&1A68dvucNOm(gxDw=H5N_8hV!!42}^KYPT} z(@m^HPFlpzRB!t7hh562dB&%f9&f5GTP!TCB(XMafgVs^^(?wBfO1$FimhQNWS0LxhEFb_39VHat>atyZ9AX-mlL3eJ$u z1i)4Vs4PP~WH4tC2@LzIjcq7k?Cu9>|Fn_A^Ue$AouiB^)beaBGy~woFCFRM5JzOw zmsH7&7cW*+n^kyIUtiO!Rc@*{t)QUrJfgt)&BX0noRub(fLGC*{1vFw%!mSJjQhSJ zS=;I>qF-0%jnE!_7>H2I1%Tlw-az>P^3_esT4!fdFGeMDGEFG)<;&w|eSBU<)GJMO zHiX?5B^l?YY+I!&GrA#m*NlBq#e)s!A1A4ZTa#6`j)|?k-A z7`(d147~*k4vv0ZOg0P(B&%F1Iqxq{J8@Bzks3@ttO1M**I5M+e9 zE!GWIR9vjAtQ=4id&KzalH!G%T3TAx7C*o2nxWJ%R^o;9{Udu=aC0^nWhAVp&+>Y6 z22RMPx^ftaf1BO!sUNEuI(zo)>cG>p{nIY)OQ$f5ZmKVh`e^2Osj;rQdeALaPEJnA z6-9@Ph|0Iyt0Xm}?F~~(!jf{e-UQD8MmGeb%c8QY16{UcHzib8&U2L&3Kg^&@m7GQ zwlHl;v}>sv*FLRgx;0x86#CQDUtf1N4hDK_D~TUp&$2Eg5!E zok)*e#6d9KJylSpXgH+R%#a89?UkvhXO=uDBGGEX#>9Y0l90D0P4H6k8erH`>ZPG# z{|xG(O2sgow2+=jAIZ<(4}((q7sTfrI|lq3_wCbAG01@SsTwhiYEx;*6b+eHARzhv z;&VLH5fjv;o`Ez;Lrtbg(^SZ`3<3E9HSIb9nI1t+k`EygFL_H^^Iu5im>5R=U_p?s z>)}M&G)@ePHGd=*tdfO(k53i6|Fm9#*3XDFHVsynLcsTC%gc;(fEuI~EonZn6euX= zMEdfjKjfbT`5(DJro!p+GV;h_FL6tng^v(qnh%*aDj+7P>7E&4f|`Ww5EIm-}D1}T5pr%*XkR}7jbOUJ`pC-8bsX1bTnntWcOio{;7G?SV&*t<0@` zP!J{;La+CsFp@(+$$<=Asrh8utJu+u#{6Kql8+!G{PsYadurpOduu@W!2Qx8bU4-w zo6$1z=B(&R(%|kA6{$$(mra|cY(`X`_X`VKkRqcXT5>19ihliIzJmj>naFjdhkpN`8xEZh{*kWEix%rO@P0Xe?0IoHgF4 zKkAE1YYe!Xtpz}h;S=`X#S0&uPyh)qvQ(fdb!?OZ@nyL*QZaP4h#$o zfSH*Y*sx&(aB*<~;}1>(w4*bD{%J#C>T3a3US170U2_EP5p=M7*De509l+6}N5R=M zXMm574>)k!69fbVfUwXo5D^gpP9&ZJ7asY8kY{1w_RBlq!Tkr|$&)AGVfG{N^5sjA zo%I?#FL(~#7QY2~d3oT&yZ4~9v=o$-mw+$j6`-=>3#hKDf@?LXt*HeK4GpchfByd& zfu9lRl?bp{EViCe92c%8IC75~rN&W!3p4L-3aQhg$U|a4CvJFGVJKGtRWgYrD?^l# zhWtdkttw!z>~JL1ae;_bJNA%T`61_!;ln!_kmAMD9*2h{*y@1-FZFnSG%;X^WDq}` zt(?$zz=QZledXtb{=4(TsJAZ=5Ia^K{y{1Nih!d^J9BHZ11r1HLw>fYum8TO|0^rI z*1Pn|s- zLX_ahk9KboLTHiWiyx|&6A}^@mk>exLPF@TZQ-P!3~9nb!cljZS{G*0S2tx^ZsP!v;uKdsdr-eH|CjlPZh}6jd02Kh}qSK%}0H|%J zL*G#Hlgv*9;JGCO@!`tEwssy6VE5Of5?!aNz?BBq_Ulv%Y+wtA>r_)yQ($Xr%f421 zb#-N5tD@^vbd8FxPx05K_-oSm_;~hpDRwQInv%l44#i)8vadbARI;xDcN8e!~An8D3H##yX5AJXYN0wK{)1iP+#{;(@L18}+m zx}b6g1z*M6=%fw`aN-!fg94m5Mu#X60=Nty;l*)uHUb3&K@wiPovzTPU|>gaJY9k$ zfz-p;BRg$NtN$btlp>;D!VH{uvLShnNC^`UAj_g8xRaI-6v!L4-EK(&rk z5}co+!otF>JRIoakSy9?lq+3USy+Tk6jp9kLeLNCY+-1l)k*Na#ETrkt_QRoc%} z(76e=a5zuF&P`}XX0p#s9D+Bq?~$W>3~r7>%#7rpkRvxn<9!eDWU>!4=gJ!*w!H^)vsSalB}$F zTU%VVwJjnf1}kDhsEO!gNkN%@GJ=w*iP|JtQQ>~VqHHp|-A|U%kJ8#~rL)^#>9TAC zxOOYz*24kR*J0`0{^}pQ#y(Y}b_hY28hw+$n}p@>F4#|f5A%2b9P`f@wIS2DdY-aX zyzqchvxqYBvc25QoCzlu4RyO7dVgNF=9m6a52Bbs^X6VH4t<`n$DnLkkeuT3QwNU( zzLX6)HE4ODVNT62w!2a>y;Go>=6&Xbx5Q-aPNm)>sN z@Te*!6Sh5T$a&%)6j$$7^I&TEP<@khC737sfz|pt6?N~e73w3Kl<&%dw`W}9gLMWb zEYl~Y25+xexAOef1pkj9&p@Z1?n_^@hpIdaB#K9*KC(zCgc+HS@}z}HAYf4QGF6Z# zu}gQVg&<=*0q_R0J>`i*)kX2ts2 zRUWavcSj3H+#MZ%+I`K7r~>EgE9-8QhHl;FpFi<@{aG#ZoO!yIW_88kb=9<|0*!nPeA4!k2+{-jA=k@uA%#yFn%8-Uc;Zf+R+ak4B?*Ly3MA>+wu$N4Mx1!0$$EH4o~*(+gf`w#KcYfZ9`t} zgS{8$?bS^86%&#m#M~CvWc4NJ&W@r_dUg>3xsxn*?~nm- z^mVo0L`;y3joD>g*1UMzvz6Q2Yc^cXaoc4gu}XNW!K$il+DrB2Z6-6O=IE+F1JXt= zk9_0r`561}2%eTLG#MoBxbZ$TIQi~*F_`aMSC+MO^exuP?A(=6x2j$p zpvIIfbflaY0nS^N7w^_8IWN}~X(P;n?aNYr2P-#I&%(@eMf=#G*Ua4Uwsog9jAp>L z_Wg+9{E&MeL=0d8adMV)%2|JAkO0jQidAiR;O*fwK>F+h9pLOA$1;uq>dY3KBCjN~ zrdOgOrh$_MZN7xLP{8C}ZuQ>RWdf&BGpn~ z_F{f+j-96_@Eegs{_FElkT>gGT(hf_{MlJhuteu~k(%p53{B13LVlJE>D)$f#|-zV zx~l9}{|wSg8_WL?T&+Z6Xr9xhzg056W&c9+L!j>KN%squMTmfFYc_34Q!<{oab?Y( z#NZTZhB6tznGb@?KNV``C;tM%M|ey5mB`Y@OQvRTPnCew$=g2rXa&!|(^&E*&#_{X zG{s&FYR_^4n=KEyHKz-HG?-rD}X?q!@1wD%@+g`W9FaN zu|FLA0))DqPuMwwR3LCiYK#g9*YE~1-jBAArdU`HHVk~zloYKsPm#pf631*T{SY|B z+r;(hv9M>hb=2D_B_#~Cc%k?qi?0|4HAY@Eg&~MfN={zsJ<(x;UHY1ZDG&bft(E(D z`9h3?P23cz8Y{B>7@h0R%hM%i8+^K1KA8;Mv+itjh;pmj;JD6Ls&QS8LTT-}D-3v_o;J}&su?3<)YE? zi@jQeNDMJwI@86`=)4?7bD!QsNY1{#;?cDYQfkVtH2)Nd49qOG|5Xh3i-eTgz|9uF<y$ z2=A!R`mV1pJkWKV1N`EzU%y^Zca`tl(G{r z9L)!u_VJ1I@SvS4_Siot22MMxSDT)RU5@eNug67zJg zl3R`I-@kufuzk&%ph<^GFjqHe7T7pgraf&pqeOw0qXjd2qaI4H13>KCS-tGE+=@DK zh5pX;P3LFTZ5jg@OK@4gd?wTWR${U%$1z2FN%>BC{e^wWN8MZ(w7kjJa$KT(t7&hT z_$>iFWq`7gi(dpJn{A=HeBQ6MxjgC2tsBA~jSQ`;D78050Hmt*YHF{C$6F;*4e|!& z@m3Y3*m-(-e)vsig4Yz`xiHxmzO>*ev;PE{A;SpyRe&a7O_G_CL9!YBFW9)SW#Wc6 zs}DDS)T(cS3B99Zz((U1J-vjLhnru;tXvn>^1AH9HJupnYQF}sFlMD?e|npp;ic_X zd)mJd=J^f{1{=*<+!v7Ey^a;|6Q_A!6k{9-rXSD%_9&0{Dsy-Yh#Ykmh+Jqy}%9!WXAOfX_=i?>gu z!&5FD^=E1d$|2UX0hFq895E4BV!VRVM|&}EJ~?Wav~L1qI}kh zRKZJ6=D}3edo$#Zj6j*O(l7zn)khdISwN;uD4(?gCIvr0Nx}D^COLLyEYvjF2Wc7t znKmL#^-$B@KOs{g)Ff1ja(X>AR6H_J9xcl0y@oP?bz>OOW>`*d#Agr;(}NFas90sJ z1IAGOOnI5Ghlp=N3}cd}9Ml>PlX8QOB4s-?RCErtXZ0eFqhVI>12<$5W%Y(3Ljx>n zQ<3xRtlkQwAQ~#Ti}HinS-oRWF0Ozjt)879%+BgXnj&FVZ!*dcW@q&VASS3O+6T+( z-HbFv!mQpWC_k8;)jJY0?So>Ekjttt^Y^+G2-ekr3BPisXk%MhdQ$zvW2y86ODEE@ zEI-z@YuC1$`=pQk{r98l8X9LK8Yeis^=WA|@iN;&3TBR5kaT)nuh*rkuHE8hzqq`7ff=>^t)G-nKNkcikh>b#VkLJqT-WL25v>_7AT3gBpkL!H zuMA!I-V*KgX_&p6tyfCb2q2|CG=dXW!<-dvRxV(g{OQxR2-{qbvaOEQE{(&@T^*kI zT##J6c=65Pgr~Vjjc&gZ&KnNKkG(l<|82`RFB>zngfC{$H*bFKb0Kv8dW!j>r$HbF zW%XK-X%YZ;( zL@Q{t>^30jXlq+uZS-FnYb|6Uxp+r-x_wKU{UJfd*nuL8b26wonXBPGP-W^Cla_va zXA96yi|yW%p}XObFk%o0p*Ne0f-B@4z0&i0myjXVNil@3ppY#L{1nZz;D0yth6V0; z^eG~pb_(ukszb|7U~_?l*Mt zCcjhlE7FbIoG;POHI<@G{;*QaaJia{x;bl(vn9n=O=h?`Yrk_DnCmif<0RIiiHr*E zbHYv3q~C#xzFDnqiOXJrH3}nR(RDRG-IoU247j4#Y1s>Wg_fTM-eMdJSJn?&QI_%# zU7+77Kgf3!^OPUyJhadFfxcsNj`1U60R8ST?_t^i3#P(QJuqf@Ll7eA=)g0LNYSO1Cg9;Q~Y;Hx<8{=?UF`rLnn;d{<^ye*>t__6<9bKpn% z4`0>lFuw3LunyyoV$j!f0Aaw!gwys&+-LCH#&mwGB+dc&N?ZH<@9Q~09D4@`hYsVx zudkf=zU4PY|B-W`uf`t51M`oc@<+^pz8w3m`u`*50DkOis%tuJbJ(`WZ%Nz+_!)OR z&-a`I#IdjZQu)LE|DJQ8x5pmMk)Dn}nhW1!4)n#?_r!nv`RDhT1AQ^}J@FqMbHCSq zps&WhC;p@D=6lV7z8d?U`u{!VKwpl1PyPQMbD%HBzBl~u&Ky8?Ij!g#0)IT}>#^?* z|GP5>IQfq5AE4_T1E{+`!(YWEqk<NFQ+yaN@!2;!7eQ z-fnMP%45^aS-c7IZQ8}j~frhiTeq8x?~&&Q1i(^n-g+jtzrIzMtm9&SDm`G~eqo11J;`}wiW2@gMVL>_KfiF};wag*(7KR>oP z;o(P)$iodQk&lx-Zn8b?=f^fDJiO$HwC=X?c6;h4H+dp9yiHzpUUEcQciVXT-0=6b zpNI`_lUJRW9Ff-DHr{?u{p2Q3#D=%YtIkV~Nb7DJZ=W0fp7s;5;cfD&cUO*=PF}R0 z`pHecyMA<6j+c+TXx#Akw7(M$G3D~bfVn%Y@_=H@N>Xj z@*TsCN?us;e7x$sbo4cioA2iFu!BeiMB~ z;|)LO#$Hh!(R;&Rq7H5t`?4SZycOX=e&YRypHA=OE7~@Q*n6Yhmws~7O~eg9HQ(+( z{EQ#pequ4h^by-wKd+J-#=h();=ypE5`HfK|Fr-7%yWFac-4t<=G5-XaptC*hy(A# z|3&}t+drp$A2D878;cvaHrD@NFX2yXwD12=Ea1;z@U;*4|HXea=P_SUiOvD>+W|U1 zfS*lkj|rZaSN*>}?s$B}a{x|$Vf>tEocb{S|CRDvF(CSZ`Hb}w+gShqQi9XY`=^)ZDIzyV_5@f7aLWfGyzIOAj5l{&xpdwUG<`v}V_|wikihWn` z^E(E3?5K|a{!gcO__*XD5q0ot^BaF&W8mWK%rTBUV-NF(c;Vug))oBl=TO@B*~IMt z{v=x`JUnCH3*SpXK6V8^;>Eugh2IyUb2(znHrQ`y*N>m~z45IJ%vM+N6Z6b4`ETLJ zA8UJZyuxr}C1xL$cpLaSFCL8675qpyX1}K;X8->pe!TDe)bV55)3{^uc)NK0_&PTp zd_O;RyiUx1PfNUAyncM08xOvppE_P=PjO@Nc)NK0_&Ps4cz%BBnEjrX{9xmUhab#% zo}S{y3yf!(-zIKc2rg>gc`<{@jQY26XL#zX!<8E+<*k$BnSn^-yNg4j`BLN4A1G!EFl6pJY_7aHqFa`-x?2P-+*?Cm~iYb;#*B)6isv2xSb z=0p29VDam2$<0n*_d~pBdr0Acn^Pax{Vawv55V8sh6zK7Z6((Kv+P*}U^*6C0j^}A z4%kiv0_?H^l_*b31+Fx>V!!9Z;E^d+S68P3$G#`qVmZeJ2q8egt+;qO18W=y?j#+udt@^n4D*wL3XNC~j!}pl8FxvEkGv`j6T@ zi2>$2x`%_sk5h?ZA=<~DX?G_EnD21z^R$idaI=ri-|obKU*CDzN4UBZgRc1gE&JVx zL05eLmVFch?D-^d9w1q4MbBChZ&!Wi$3FJmL{9SnvyVL&?W*tm*hf6PVvw4W(rw@Q zwO`ft{ZQl|iZlM%Bo=#Yu5|TTD$<8m;`WdABa9f0ANz|?%T zxHy&A81U;m;=}Y{eq$xpkNN+j?PIw3DSO-huIMB3qU`}~zt~z;+3^_$7H6VgSbuj* zTU%S6`Pf9gy=foqhq3cdbPox;u16)&4!1TDUsu{#9yewimFT_+ulrd<99^+TwuJl$zy_W`l-M{T5s=sUMD=#EXI z42A)-iP15eSc&y_kLm16$xCNfY4G~nrmCtcmtXrxereF}72LItkaeF_={HhOvCHztS=#*s!``T4dInp@nSLExX!VRMsH ziTH^30T3p1Kb?4Qmne_uIYl`g&c)Dv4D%h`3nt3o+lWs5#yDOcUEiZ^+xMPd2OFr3 z`Z=A8;^onCDlPvxi*{rt>wR(SZ$zRJwNXFuSdQ9wc~nQ|#wbP(!JFCqs6=hl&yPIf zLGeI-qdF>4o0BZ+BihGeNtEZNgOfZy=2*Qe@)!nUiEMFNF+NT-e)@V#9@EpEvhB8K IxAzMF52~oniU0rr literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..3adab9cb3790 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Testovací projekt MSTest Playwright", + "description": "Projekt, který obsahuje testy Playwright pomocí testovací architektury MSTest, který se dá spustit v .NET ve Windows, Linuxu a MacOS.", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (jenom Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (jenom Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".Net Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Použít MSTest.Sdk", + "symbols/TestRunner/description": "Vyberte spouštěč nebo platformu. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Použít MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Použití platformy VSTest", + "symbols/CoverageTool/description": "Nástroj pokrytí, který se má použít pro projekt.", + "symbols/CoverageTool/displayName": "Nástroj pokrytí", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrytí kódu Microsoftu", + "symbols/CoverageTool/choices/coverlet/description": "pokrývka", + "symbols/ExtensionsProfile/description": "Při použití MSTest Runneru vyberte profil rozšíření sady SDK. Další informace najdete na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testování profilu rozšíření", + "symbols/ExtensionsProfile/choices/Default/description": "Výchozí profil rozšíření (doporučeno)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Výchozí", + "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", + "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", + "symbols/Fixture/choices/None/displayName": "Žádné", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metoda testovacího přípravku AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metoda testovacího přípravku ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metoda testovacího přípravku ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metoda testovacího přípravku TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Test1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..8f9027554279 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright-Testprojekt", + "description": "Ein Projekt, das Playwright-Tests mit MSTest-Testframework enthält, das unter .NET unter Windows, Linux und MacOS ausgeführt werden kann.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (nur Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (nur Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk verwenden", + "symbols/TestRunner/description": "Wählen Sie den Runner/die Plattform aus. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner verwenden (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest-Plattform verwenden", + "symbols/CoverageTool/description": "Das Abdeckungstool, das für das Projekt verwendet werden soll.", + "symbols/CoverageTool/displayName": "Coverage-Tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wählen Sie das SDK-Erweiterungsprofil aus, wenn Sie MSTest Runner verwenden. Weitere Informationen finden Sie unter https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Erweiterungsprofil wird getestet", + "symbols/ExtensionsProfile/choices/Default/description": "Standarderweiterungsprofil (empfohlen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Standard", + "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", + "symbols/ExtensionsProfile/choices/None/displayName": "Keine", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", + "symbols/Fixture/choices/None/displayName": "Keine", + "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", + "symbols/Fixture/choices/AssemblyCleanup/description": "Fixierungsmethode \"AssemblyCleanup\"", + "symbols/Fixture/choices/ClassInitialize/description": "Fixturemethode \"ClassInitialize\"", + "symbols/Fixture/choices/ClassCleanup/description": "Fixierungsmethode \"ClassCleanup\"", + "symbols/Fixture/choices/TestInitialize/description": "Fixturemethode \"TestInitialize\"", + "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Test1.cs im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..7ce91b6482f3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright Test Project", + "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows only)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows only)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Use MSTest.Sdk", + "symbols/TestRunner/description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/MSTest/description": "Use MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest platform", + "symbols/CoverageTool/description": "The coverage tool to use for the project.", + "symbols/CoverageTool/displayName": "Coverage tool", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testing extensions profile", + "symbols/ExtensionsProfile/choices/Default/description": "Default extensions profile (recommended)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Default", + "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", + "symbols/ExtensionsProfile/choices/None/displayName": "None", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/choices/None/description": "No fixture methods", + "symbols/Fixture/choices/None/displayName": "None", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture method", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture method", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture method", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture method", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Test1.cs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..88f77daf8d7c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de MSTest Playwright", + "description": "Proyecto que contiene pruebas de Playwright mediante el marco de pruebas de MSTest, que se puede ejecutar en .NET en Windows, Linux y MacOS.", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.Sdk", + "symbols/TestRunner/description": "Seleccione el ejecutor o la plataforma. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Usar MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Uso de la plataforma VSTest", + "symbols/CoverageTool/description": "Herramienta de cobertura que se va a usar para el proyecto.", + "symbols/CoverageTool/displayName": "Herramienta de cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de código de Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "cubrecama", + "symbols/ExtensionsProfile/description": "Seleccione el perfil de extensiones del SDK al usar MSTest Runner. Más información en https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Prueba del perfil de extensiones", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensiones predeterminadas (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Valor predeterminado", + "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", + "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", + "symbols/Fixture/choices/None/displayName": "Ninguno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de accesorio AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de accesorio ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de accesorio ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de accesorio TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Test1.cs en el editor." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..c4b450232710 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projet de test MSTest Playwright", + "description": "Un projet qui contient des tests Playwright utilisant le framework de test MSTest, qui peut être exécuté sur .NET sur Windows, Linux et MacOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows uniquement)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows uniquement)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Utiliser MSTest.Sdk", + "symbols/TestRunner/description": "Sélectionnez l’exécuteur/la plateforme. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Utilisez MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Utiliser la plateforme VSTest", + "symbols/CoverageTool/description": "Outil de couverture à utiliser pour le projet.", + "symbols/CoverageTool/displayName": "Outil de couverture", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Couverture du code Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Sélectionnez le profil d’extensions du Kit de développement logiciel (SDK) lors de l’utilisation de l’exécuteur MSTest. Plus d’informations sur https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test du profil des extensions", + "symbols/ExtensionsProfile/choices/Default/description": "Profil d’extensions par défaut (recommandé)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Par défaut", + "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", + "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", + "symbols/Fixture/choices/None/displayName": "Aucun", + "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Méthode de fixture assemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Méthode de fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Méthode de fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Méthode de fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..2973dde71265 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Progetto di test playwright MSTest", + "description": "Progetto che contiene test Playwright che usano il framework di test MSTest, eseguibile in .NET in Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (solo Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (solo Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usa MSTest.Sdk", + "symbols/TestRunner/description": "Selezionare lo strumento di esecuzione/la piattaforma. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "Usa MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usa la piattaforma VSTest", + "symbols/CoverageTool/description": "Strumento di copertura da usare per il progetto.", + "symbols/CoverageTool/displayName": "Strumento di copertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Code Coverage", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selezionare il profilo delle estensioni SDK quando si usa MSTest Runner. Per altre informazioni, vedere https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Test del profilo delle estensioni", + "symbols/ExtensionsProfile/choices/Default/description": "Profilo estensioni predefinito (scelta consigliata)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Predefinita", + "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", + "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", + "symbols/Fixture/choices/None/displayName": "Nessuno", + "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Metodo fixture AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Metodo fixture ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Metodo fixture ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Metodo fixture TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Test1.cs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..29612731054a --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright テスト プロジェクト", + "description": "Windows、Linux、MacOS 上の .NET で実行できる、MSTest テスト フレームワークを使用した Playwright テストを含むプロジェクト。", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (Windows のみ)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (Windows のみ)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk を使用する", + "symbols/TestRunner/description": "ランナー/プラットフォームを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/TestRunner/displayName": "テスト ランナー", + "symbols/TestRunner/choices/MSTest/description": "MSTest Runner を使用する (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest プラットフォームを使用する", + "symbols/CoverageTool/description": "プロジェクトに使用するカバレッジ ツール。", + "symbols/CoverageTool/displayName": "カバレッジ ツール", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft コード カバレッジ", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "MSTest Runner を使用する場合は、SDK 拡張機能プロファイルを選択します。https://aka.ms/mstest/sdk/extensions-profile の詳細情報", + "symbols/ExtensionsProfile/displayName": "拡張機能プロファイルをテストしています", + "symbols/ExtensionsProfile/choices/Default/description": "既定の拡張機能プロファイル (推奨)", + "symbols/ExtensionsProfile/choices/Default/displayName": "既定値", + "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", + "symbols/ExtensionsProfile/choices/None/displayName": "なし", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", + "symbols/Fixture/choices/None/displayName": "なし", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup フィクスチャ メソッド", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize フィクスチャ メソッド", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Test1.cs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..73b9c961b9fa --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright 테스트 프로젝트", + "description": "Windows, Linux 및 MacOS의 .NET에서 실행할 수 있는 MSTest 테스트 프레임워크를 사용하는 Playwright 테스트를 포함하는 프로젝트입니다.", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7(Windows만 해당)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6(Windows만 해당)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk 사용", + "symbols/TestRunner/description": "실행기/플랫폼을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "MSTest 실행기 사용(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest 플랫폼 사용", + "symbols/CoverageTool/description": "프로젝트에 사용할 검사 도구입니다.", + "symbols/CoverageTool/displayName": "적용 범위 도구", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 코드 검사", + "symbols/CoverageTool/choices/coverlet/description": "침대보", + "symbols/ExtensionsProfile/description": "MSTest 실행기를 사용할 때 SDK 확장 프로필을 선택합니다. 자세한 내용은 https://aka.ms/mstest/sdk/extensions-profile을 확인하세요.", + "symbols/ExtensionsProfile/displayName": "확장 프로필 테스트 중", + "symbols/ExtensionsProfile/choices/Default/description": "기본 확장 프로필(권장)", + "symbols/ExtensionsProfile/choices/Default/displayName": "기본값", + "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", + "symbols/ExtensionsProfile/choices/None/displayName": "없음", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", + "symbols/Fixture/choices/None/displayName": "없음", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup fixture 메서드", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize fixture 메서드", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup fixture 메서드", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize fixture 메서드", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Test1.cs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..979a21a61d89 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projekt testowy MSTest Playwright", + "description": "Projekt, który zawiera testy Playwright wykorzystujące strukturę testową MSTest, który można uruchomić na platformie .NET w systemach Windows, Linux i MacOS.", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (tylko system Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (tylko system Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": "Platforma .NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Korzystaj z narzędzia MSTest.Sdk", + "symbols/TestRunner/description": "Wybierz moduł uruchamiający/platformę. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Moduł uruchamiający", + "symbols/TestRunner/choices/MSTest/description": "Korzystanie z modułu uruchamiającego MSTest (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Korzystanie z platformy VSTest", + "symbols/CoverageTool/description": "Narzędzie pokrycia do użycia w projekcie.", + "symbols/CoverageTool/displayName": "Narzędzie pokrycia", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Pokrycie kodu firmy Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Wybierz profil rozszerzeń zestawu SDK podczas korzystania z modułu uruchamiającego MSTest. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Testowanie profilu rozszerzeń", + "symbols/ExtensionsProfile/choices/Default/description": "Domyślny profil rozszerzeń (rekomendowane)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Wartość domyślna", + "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", + "symbols/ExtensionsProfile/choices/None/displayName": "Brak", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/choices/None/description": "Brak metod początkowych", + "symbols/Fixture/choices/None/displayName": "Brak", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup — metoda początkowa", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize — metoda początkowa", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup — metoda początkowa", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize — metoda początkowa", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..676a77d55c69 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste MSTest do Playwright", + "description": "Um projeto que contém testes do Playwright usando a estrutura de teste MSTest, que pode ser executada no .NET no Windows, Linux e macOS.", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (somente Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (somente Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Usar MSTest.SDK", + "symbols/TestRunner/description": "Selecione o executor/plataforma. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Executar teste", + "symbols/TestRunner/choices/MSTest/description": "Usar o MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Usar a plataforma VSTest", + "symbols/CoverageTool/description": "A ferramenta de cobertura a ser usada para o projeto.", + "symbols/CoverageTool/displayName": "Ferramenta de cobertura", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Cobertura de Código da Microsoft", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Selecione o perfil de extensões do SDK ao usar o Executor do MSTest. Mais informações em https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Perfil de extensões de teste", + "symbols/ExtensionsProfile/choices/Default/description": "Perfil de extensões padrão (recomendado)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Padrão", + "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", + "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/choices/None/description": "Nenhum método de acessório", + "symbols/Fixture/choices/None/displayName": "Nenhum", + "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Método de acessório AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Método de acessório ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Método de acessório ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Método de acessório TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o Test1.cs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..f950f2e948f1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,54 @@ +{ + "author": "Майкрософт", + "name": "Тестовый проект MSTest Playwright", + "description": "Проект, содержащий тесты Playwright с использованием инфраструктуры MSTest, которая может работать на .NET в Windows, Linux и MacOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (только для Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (только для Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "Использовать MSTest.Sdk", + "symbols/TestRunner/description": "Выберите средство выполнения тестов или платформу. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Средство выполнения тестов", + "symbols/TestRunner/choices/MSTest/description": "Используйте MSTest Runner (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "Используйте платформу VSTest", + "symbols/CoverageTool/description": "Инструмент покрытия, который следует использовать для проекта.", + "symbols/CoverageTool/displayName": "Средство оценки объема протестированного кода", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Покрытие кода (Майкрософт)", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "Выберите профиль расширений SDK при использовании MSTest Runner. Дополнительные сведения на https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Проверка профиля расширений", + "symbols/ExtensionsProfile/choices/Default/description": "Профиль расширений по умолчанию (рекомендуется)", + "symbols/ExtensionsProfile/choices/Default/displayName": "По умолчанию", + "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", + "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", + "symbols/Fixture/choices/None/displayName": "Отсутствует", + "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", + "symbols/Fixture/choices/AssemblyCleanup/description": "Метод работы со средствами AssemblyCleanup", + "symbols/Fixture/choices/ClassInitialize/description": "Метод работы со средствами ClassInitialize", + "symbols/Fixture/choices/ClassCleanup/description": "Метод работы со средствами ClassCleanup", + "symbols/Fixture/choices/TestInitialize/description": "Метод работы со средствами TestInitialize", + "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает Test1.cs редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..e8d1c9bbd225 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen ve MSTest test çerçevesini kullanan Playwright testlerini içeren bir proje.", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (yalnızca Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (yalnızca Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "MSTest.Sdk kullan", + "symbols/TestRunner/description": "Çalıştırıcıyı/platformu seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test çalıştırıcı", + "symbols/TestRunner/choices/MSTest/description": "MSTest Çalıştırıcısı'nı kullan (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "VSTest platformunu kullan", + "symbols/CoverageTool/description": "Projede kullanılacak kapsam aracı.", + "symbols/CoverageTool/displayName": "Kapsam aracı", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft Kod Kapsamı", + "symbols/CoverageTool/choices/coverlet/description": "kapakçık", + "symbols/ExtensionsProfile/description": "MSTest Çalıştırıcısı kullanılırken SDK uzantıları profilini seçin. Daha fazla bilgi: https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "Uzantılar profili test ediliyor", + "symbols/ExtensionsProfile/choices/Default/description": "Varsayılan uzantılar profili (önerilen)", + "symbols/ExtensionsProfile/choices/Default/displayName": "Varsayılan", + "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", + "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", + "symbols/Fixture/choices/None/displayName": "Hiçbiri", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup düzen yöntemi", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize düzen yöntemi", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup düzen yöntemi", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize düzen yöntemi", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..9a6979a1bab5 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright 测试项目", + "description": "一个包含使用 MSTest 测试框架的 Playwright 测试的项目，这些测试可在 Windows、Linux 和 MacOS 上的 .NET 上运行。", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (仅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (仅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "选择运行器/平台。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "Test Runner", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 运行器(Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用于项目的覆盖率工具。", + "symbols/CoverageTool/displayName": "覆盖工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 代码覆盖率", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "使用 MSTest 运行器时选择 SDK 扩展配置文件。有关详细信息，请访问 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "测试扩展配置文件", + "symbols/ExtensionsProfile/choices/Default/description": "默认扩展配置文件(推荐)", + "symbols/ExtensionsProfile/choices/Default/displayName": "默认", + "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", + "symbols/ExtensionsProfile/choices/None/displayName": "无", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/choices/None/description": "无固定例程方法", + "symbols/Fixture/choices/None/displayName": "无", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固定例程方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固定例程方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固定例程方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固定例程方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Test1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..c7f7d14f2bb8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,54 @@ +{ + "author": "Microsoft", + "name": "MSTest Playwright 測試專案", + "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行、使用 MSTest 測試架構的 Playwright 測試的專案。", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net8.0/description": ".NET 8", + "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", + "symbols/Framework/choices/net7.0/description": ".NET 7", + "symbols/Framework/choices/net7.0-windows/description": ".NET 7 (僅限 Windows)", + "symbols/Framework/choices/net6.0/description": ".NET 6", + "symbols/Framework/choices/net6.0-windows/description": ".NET 6 (僅限 Windows)", + "symbols/Framework/choices/netcoreapp3.1/description": ".NET Core 3.1", + "symbols/Framework/choices/net481/description": ".NET Framework 4.8.1", + "symbols/Framework/choices/net48/description": ".NET Framework 4.8", + "symbols/Framework/choices/net472/description": ".NET Framework 4.7.2", + "symbols/Framework/choices/net471/description": ".NET Framework 4.7.1", + "symbols/Framework/choices/net47/description": ".NET Framework 4.7", + "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", + "symbols/UseMSTestSdk/displayName": "使用 MSTest.Sdk", + "symbols/TestRunner/description": "選取執行器/平台。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/TestRunner/displayName": "測試執行器", + "symbols/TestRunner/choices/MSTest/description": "使用 MSTest 執行器 (Microsoft.Testing.Platform)", + "symbols/TestRunner/choices/VSTest/description": "使用 VSTest 平台", + "symbols/CoverageTool/description": "要用於專案的涵蓋範圍工具。", + "symbols/CoverageTool/displayName": "涵蓋範圍工具", + "symbols/CoverageTool/choices/Microsoft.CodeCoverage/description": "Microsoft 程式碼涵蓋範圍", + "symbols/CoverageTool/choices/coverlet/description": "coverlet", + "symbols/ExtensionsProfile/description": "選取使用 MSTest 執行器時的 SDK 延伸模組設定檔。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk/extensions-profile", + "symbols/ExtensionsProfile/displayName": "正在測試擴充功能設定檔", + "symbols/ExtensionsProfile/choices/Default/description": "預設延伸模組設定檔 (建議)", + "symbols/ExtensionsProfile/choices/Default/displayName": "預設", + "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", + "symbols/ExtensionsProfile/choices/None/displayName": "無", + "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/choices/None/description": "沒有固件方法", + "symbols/Fixture/choices/None/displayName": "無", + "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", + "symbols/Fixture/choices/AssemblyCleanup/description": "AssemblyCleanup 固件方法", + "symbols/Fixture/choices/ClassInitialize/description": "ClassInitialize 固件方法", + "symbols/Fixture/choices/ClassCleanup/description": "ClassCleanup 固件方法", + "symbols/Fixture/choices/TestInitialize/description": "TestInitialize 固件方法", + "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json new file mode 100644 index 000000000000..95205c44b7ff --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json @@ -0,0 +1,253 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Test", "MSTest", "Playwright"], + "name": "MSTest Playwright Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", + "groupIdentity": "Microsoft.Test.Playwright.MSTest", + "precedence": "11000", + "identity": "Microsoft.Test.Playwright.MSTest.CSharp.9.0", + "shortName": "mstest-playwright", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", + "description": ".NET 9 (Windows only)" + }, + { + "choice": "net8.0", + "description": ".NET 8" + }, + { + "choice": "net8.0-windows", + "description": ".NET 8 (Windows only)" + }, + { + "choice": "net7.0", + "description": ".NET 7" + }, + { + "choice": "net7.0-windows", + "description": ".NET 7 (Windows only)" + }, + { + "choice": "net6.0", + "description": ".NET 6" + }, + { + "choice": "net6.0-windows", + "description": ".NET 6 (Windows only)" + }, + { + "choice": "netcoreapp3.1", + "description": ".NET Core 3.1" + }, + { + "choice": "net481", + "description": ".NET Framework 4.8.1" + }, + { + "choice": "net48", + "description": ".NET Framework 4.8" + }, + { + "choice": "net472", + "description": ".NET Framework 4.7.2" + }, + { + "choice": "net471", + "description": ".NET Framework 4.7.1" + }, + { + "choice": "net47", + "description": ".NET Framework 4.7" + }, + { + "choice": "net462", + "description": ".NET Framework 4.6.2" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + }, + "UseMSTestSdk": { + "type": "parameter", + "datatype": "bool", + "description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", + "displayName": "Use MSTest.Sdk", + "defaultValue": "False" + }, + "TestRunner": { + "type": "parameter", + "datatype": "choice", + "enableQuotelessLiterals": true, + "description": "Select the runner/platform. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Test runner", + "defaultValue": "VSTest", + "choices": [ + { + "choice": "MSTest", + "description": "Use MSTest Runner (Microsoft.Testing.Platform)" + }, + { + "choice": "VSTest", + "description": "Use VSTest platform" + } + ] + }, + "CoverageTool": { + "type": "parameter", + "datatype": "choice", + "description": "The coverage tool to use for the project.", + "displayName": "Coverage tool", + "defaultValue": "Microsoft.CodeCoverage", + "choices": [ + { + "choice": "Microsoft.CodeCoverage", + "description": "Microsoft Code Coverage" + }, + { + "choice": "coverlet", + "description": "coverlet" + } + ] + }, + "ExtensionsProfile": { + "type": "parameter", + "datatype": "choice", + "description": "Select the SDK extensions profile when using MSTest Runner. More information at https://aka.ms/mstest/sdk/extensions-profile", + "displayName": "Testing extensions profile", + "isEnabled": "UseMSTestSdk && (TestRunner == MSTest)", + "defaultValue": "Default", + "replaces": "$(ExtensionsProfile)", + "choices": [ + { + "choice": "Default", + "description": "Default extensions profile (recommended)", + "displayName": "Default" + }, + { + "choice": "None", + "description": "No extensions are enabled", + "displayName": "None" + }, + { + "choice": "AllMicrosoft", + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + } + ] + }, + "Fixture": { + "type": "parameter", + "datatype": "choice", + "description": "Select the fixture kinds to include in the project.", + "allowMultipleValues": true, + "enableQuotelessLiterals": true, + "defaultValue": "None", + "choices": [ + { + "choice": "None", + "description": "No fixture methods", + "displayName": "None" + }, + { + "choice": "AssemblyInitialize", + "description": "AssemblyInitialize fixture method" + }, + { + "choice": "AssemblyCleanup", + "description": "AssemblyCleanup fixture method" + }, + { + "choice": "ClassInitialize", + "description": "ClassInitialize fixture method" + }, + { + "choice": "ClassCleanup", + "description": "ClassCleanup fixture method" + }, + { + "choice": "TestInitialize", + "description": "TestInitialize fixture method" + }, + { + "choice": "TestCleanup", + "description": "TestCleanup fixture method" + } + ] + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "MSTestSettings.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Test1.cs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Test1.cs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj new file mode 100644 index 000000000000..3200841aa38d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj @@ -0,0 +1,77 @@ + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + true + + true + + + + + + + + + + true + $(ExtensionsProfile) + + + + + + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + + true + Exe + true + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs new file mode 100644 index 000000000000..aaf278c844f0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs @@ -0,0 +1 @@ +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs new file mode 100644 index 000000000000..b3e8e48318c0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs @@ -0,0 +1,74 @@ +namespace Company.TestProject1; + +[TestClass] +public class Test1 : PageTest +{ +#if (Fixture == AssemblyInitialize) + [AssemblyInitialize] + public static void AssemblyInit(TestContext context) + { + // This method is called once for the test assembly, before any tests are run. + } + +#endif +#if (Fixture == AssemblyCleanup) + [AssemblyCleanup] + public static void AssemblyCleanup() + { + // This method is called once for the test assembly, after all tests are run. + } + +#endif +#if (Fixture == ClassInitialize) + [ClassInitialize] + public static void ClassInit(TestContext context) + { + // This method is called once for the test class, before any tests of the class are run. + } + +#endif +#if (Fixture == ClassCleanup) + [ClassCleanup] + public static void ClassCleanup() + { + // This method is called once for the test class, after all tests of the class are run. + } + +#endif +#if (Fixture == TestInitialize) + [TestInitialize] + public void TestInit() + { + // This method is called before each test method. + } + +#endif +#if (Fixture == TestCleanup) + [TestCleanup] + public void TestCleanup() + { + // This method is called after each test method. + } + +#endif + [TestMethod] + public async Task HomepageHasPlaywrightInTitleAndGetStartedLinkLinkingToTheIntroPage() + { + await Page.GotoAsync("https://playwright.dev"); + + // Expect a title "to contain" a substring. + await Expect(Page).ToHaveTitleAsync(new Regex("Playwright")); + + // create a locator + var getStarted = Page.Locator("text=Get Started"); + + // Expect an attribute "to be strictly equal" to the value. + await Expect(getStarted).ToHaveAttributeAsync("href", "/docs/intro"); + + // Click the get started link. + await getStarted.ClickAsync(); + + // Expects the URL to contain intro. + await Expect(Page).ToHaveURLAsync(new Regex(".*intro")); + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..40382f8898eb327d5c68b1d76423d5b1034fdfdd GIT binary patch literal 47213 zcmeHw30zF;|Nk@7w693fV(Qwi+~QtBsK%O05lV|TM7D%Ni<+@7UE&KUqmKop>b1Vn&{Gyo@I zeeBrQcAyjhzOYY4rL8Rj!0aIa$jG#|R|^90c?6P1Z51#P@-F!e02-~e{p)l94o$)I zser)Y0NixP^uadNW9g6SQvs_f00>3`aKLcBo}`$97*s3y=bV{~kT$kOAy`;!4qSy= zj*IlBgV1M6#jruKn`ST#fa_l3&C4JrAi8mmnIiyF_s~juI)e<94j&pc(6U9|`?&V$)fJ*nLex2{ zmStUA`a5$?LBjoqx+^FdtCJ2cSvJ5!`U>rd{_LQ;r@`;c%hKC_DRkQwy2jL=UgxV@ z=j-@3>{7l@e-YBNq9*M+UpKn?iWMuw0zD5OKK#N}L|oy}Y|kOjR{Jvh1twL#f4bo5 zKXzZ5^nl+V4gatjOT%im|x2&Ld6+RQwXw=z8$13dmD3PKb||6tTNh z5>ZilND9mkufInFiIe5%lSF{&g92%B5?E*2oUaOO1U+^2Dd3vTmwgAa8Dl>bGE$Cu zc?AkkH!;j`Yn9Hcz=jvy8FXG{Gu1?~g6-_m~u)*Q|SCpIMTY^ftQ4 zUi<8s;;>sg0Hfb2PiwiRT7j@Yx>An+eD^JL>6uBli+tQhP)-Iti<+PAl6G?~v$>(s z?x3eCct!RbpH)|S!8j~|b=JIT`GVS-#suq#sQNw4R{eins@GJr?fGorH$JdW5jmmWsZr<9bO#y0}nwlqWHr~kGN2dU>2;-K^ z$*lB>WUJTiNq+&FYLrIvlZy!~{ihC9Wa`1f2`XaO7q*n%s5fwUVVwNXe)?qKJlu_$ z>!qXrK1`Gh3?de`+={IUPuFG@2zsU)%WFK14_$hr();>$s^bcA#+5Td45h@Z>JkCh zC5L_9-T7R3A~>S#?3Kec|7PtRN@b0lV(7HBB3w`fqz-!#&~mBf)M)0)rF66UiB>KV zF~tWpFH2V_u_~ioL%-h?rtrwiKYJUDqcT4GulF-9<4$UvW>6;lm z;o8T=_qN6P*vtD(0oegDjN(g`TXk>EPC0mVkD6zcm=jCf z{03H4RKhcTYLRA3&4g4^V$hA0O5N(JeKjH){lLbx(g?uMQbWA_>g81vU!d~Y9wADgC4sp%ftGl%2lg?rb0WkM(J;p*fmOj5ap0u{g z5lj#PFK1^>6uK}qlw`9+CyexXRAO=_Yko>eO0|o}3u^}fW#BW))tbIjow1DqRt(vBCQ_op9Pq#^{6Hb&MG0fbVSw*f!7H5vRZ`Y5u zhLT%8-CF@W($pD8>>1n7O2deZy?Siqf|7-sHV20#3Fs`{RyEzwS_CAmEqJ_p$O*@l z2ke?Jiy!f-*y-jYkm#fTj2z2ku3KBWI>C2f#D%M4np6yT8o+QWE}@S9#m?(ekFp zqqwzYp4w)5sYwT>HCT|%s=ck;X)Oh3PW;w9cw;{qgW|F>P(3oDH0etjMCWH`0{hk zotkY0N5(Wy`5dcVx^=o9NF1CcBq1STyG>+zZvXpH6^?LQ$xfgrloS_Vuhk%(9~QlL z@7{|`>$S+h>YezXJ8jB+;~MYO45z=%&(F8nb=8alV*g&C`1Zz@c~Rjd&h9D>HSbeK zl4Ke)R%%QYXUu&PL9w*7T>IeQz~GP&1A68dvucNOm(gxDw=H5N_8hV!!42}^KYPT} z(@m^HPFlpzRB!t7hh562dB&%f9&f5GTP!TCB(XMafgVs^^(?wBfO1$FimhQNWS0LxhEFb_39VHat>atyZ9AX-mlL3eJ$u z1i)4Vs4PP~WH4tC2@LzIjcq7k?Cu9>|Fn_A^Ue$AouiB^)beaBGy~woFCFRM5JzOw zmsH7&7cW*+n^kyIUtiO!Rc@*{t)QUrJfgt)&BX0noRub(fLGC*{1vFw%!mSJjQhSJ zS=;I>qF-0%jnE!_7>H2I1%Tlw-az>P^3_esT4!fdFGeMDGEFG)<;&w|eSBU<)GJMO zHiX?5B^l?YY+I!&GrA#m*NlBq#e)s!A1A4ZTa#6`j)|?k-A z7`(d147~*k4vv0ZOg0P(B&%F1Iqxq{J8@Bzks3@ttO1M**I5M+e9 zE!GWIR9vjAtQ=4id&KzalH!G%T3TAx7C*o2nxWJ%R^o;9{Udu=aC0^nWhAVp&+>Y6 z22RMPx^ftaf1BO!sUNEuI(zo)>cG>p{nIY)OQ$f5ZmKVh`e^2Osj;rQdeALaPEJnA z6-9@Ph|0Iyt0Xm}?F~~(!jf{e-UQD8MmGeb%c8QY16{UcHzib8&U2L&3Kg^&@m7GQ zwlHl;v}>sv*FLRgx;0x86#CQDUtf1N4hDK_D~TUp&$2Eg5!E zok)*e#6d9KJylSpXgH+R%#a89?UkvhXO=uDBGGEX#>9Y0l90D0P4H6k8erH`>ZPG# z{|xG(O2sgow2+=jAIZ<(4}((q7sTfrI|lq3_wCbAG01@SsTwhiYEx;*6b+eHARzhv z;&VLH5fjv;o`Ez;Lrtbg(^SZ`3<3E9HSIb9nI1t+k`EygFL_H^^Iu5im>5R=U_p?s z>)}M&G)@ePHGd=*tdfO(k53i6|Fm9#*3XDFHVsynLcsTC%gc;(fEuI~EonZn6euX= zMEdfjKjfbT`5(DJro!p+GV;h_FL6tng^v(qnh%*aDj+7P>7E&4f|`Ww5EIm-}D1}T5pr%*XkR}7jbOUJ`pC-8bsX1bTnntWcOio{;7G?SV&*t<0@` zP!J{;La+CsFp@(+$$<=Asrh8utJu+u#{6Kql8+!G{PsYadurpOduu@W!2Qx8bU4-w zo6$1z=B(&R(%|kA6{$$(mra|cY(`X`_X`VKkRqcXT5>19ihliIzJmj>naFjdhkpN`8xEZh{*kWEix%rO@P0Xe?0IoHgF4 zKkAE1YYe!Xtpz}h;S=`X#S0&uPyh)qvQ(fdb!?OZ@nyL*QZaP4h#$o zfSH*Y*sx&(aB*<~;}1>(w4*bD{%J#C>T3a3US170U2_EP5p=M7*De509l+6}N5R=M zXMm574>)k!69fbVfUwXo5D^gpP9&ZJ7asY8kY{1w_RBlq!Tkr|$&)AGVfG{N^5sjA zo%I?#FL(~#7QY2~d3oT&yZ4~9v=o$-mw+$j6`-=>3#hKDf@?LXt*HeK4GpchfByd& zfu9lRl?bp{EViCe92c%8IC75~rN&W!3p4L-3aQhg$U|a4CvJFGVJKGtRWgYrD?^l# zhWtdkttw!z>~JL1ae;_bJNA%T`61_!;ln!_kmAMD9*2h{*y@1-FZFnSG%;X^WDq}` zt(?$zz=QZledXtb{=4(TsJAZ=5Ia^K{y{1Nih!d^J9BHZ11r1HLw>fYum8TO|0^rI z*1Pn|s- zLX_ahk9KboLTHiWiyx|&6A}^@mk>exLPF@TZQ-P!3~9nb!cljZS{G*0S2tx^ZsP!v;uKdsdr-eH|CjlPZh}6jd02Kh}qSK%}0H|%J zL*G#Hlgv*9;JGCO@!`tEwssy6VE5Of5?!aNz?BBq_Ulv%Y+wtA>r_)yQ($Xr%f421 zb#-N5tD@^vbd8FxPx05K_-oSm_;~hpDRwQInv%l44#i)8vadbARI;xDcN8e!~An8D3H##yX5AJXYN0wK{)1iP+#{;(@L18}+m zx}b6g1z*M6=%fw`aN-!fg94m5Mu#X60=Nty;l*)uHUb3&K@wiPovzTPU|>gaJY9k$ zfz-p;BRg$NtN$btlp>;D!VH{uvLShnNC^`UAj_g8xRaI-6v!L4-EK(&rk z5}co+!otF>JRIoakSy9?lq+3USy+Tk6jp9kLeLNCY+-1l)k*Na#ETrkt_QRoc%} z(76e=a5zuF&P`}XX0p#s9D+Bq?~$W>3~r7>%#7rpkRvxn<9!eDWU>!4=gJ!*w!H^)vsSalB}$F zTU%VVwJjnf1}kDhsEO!gNkN%@GJ=w*iP|JtQQ>~VqHHp|-A|U%kJ8#~rL)^#>9TAC zxOOYz*24kR*J0`0{^}pQ#y(Y}b_hY28hw+$n}p@>F4#|f5A%2b9P`f@wIS2DdY-aX zyzqchvxqYBvc25QoCzlu4RyO7dVgNF=9m6a52Bbs^X6VH4t<`n$DnLkkeuT3QwNU( zzLX6)HE4ODVNT62w!2a>y;Go>=6&Xbx5Q-aPNm)>sN z@Te*!6Sh5T$a&%)6j$$7^I&TEP<@khC737sfz|pt6?N~e73w3Kl<&%dw`W}9gLMWb zEYl~Y25+xexAOef1pkj9&p@Z1?n_^@hpIdaB#K9*KC(zCgc+HS@}z}HAYf4QGF6Z# zu}gQVg&<=*0q_R0J>`i*)kX2ts2 zRUWavcSj3H+#MZ%+I`K7r~>EgE9-8QhHl;FpFi<@{aG#ZoO!yIW_88kb=9<|0*!nPeA4!k2+{-jA=k@uA%#yFn%8-Uc;Zf+R+ak4B?*Ly3MA>+wu$N4Mx1!0$$EH4o~*(+gf`w#KcYfZ9`t} zgS{8$?bS^86%&#m#M~CvWc4NJ&W@r_dUg>3xsxn*?~nm- z^mVo0L`;y3joD>g*1UMzvz6Q2Yc^cXaoc4gu}XNW!K$il+DrB2Z6-6O=IE+F1JXt= zk9_0r`561}2%eTLG#MoBxbZ$TIQi~*F_`aMSC+MO^exuP?A(=6x2j$p zpvIIfbflaY0nS^N7w^_8IWN}~X(P;n?aNYr2P-#I&%(@eMf=#G*Ua4Uwsog9jAp>L z_Wg+9{E&MeL=0d8adMV)%2|JAkO0jQidAiR;O*fwK>F+h9pLOA$1;uq>dY3KBCjN~ zrdOgOrh$_MZN7xLP{8C}ZuQ>RWdf&BGpn~ z_F{f+j-96_@Eegs{_FElkT>gGT(hf_{MlJhuteu~k(%p53{B13LVlJE>D)$f#|-zV zx~l9}{|wSg8_WL?T&+Z6Xr9xhzg056W&c9+L!j>KN%squMTmfFYc_34Q!<{oab?Y( z#NZTZhB6tznGb@?KNV``C;tM%M|ey5mB`Y@OQvRTPnCew$=g2rXa&!|(^&E*&#_{X zG{s&FYR_^4n=KEyHKz-HG?-rD}X?q!@1wD%@+g`W9FaN zu|FLA0))DqPuMwwR3LCiYK#g9*YE~1-jBAArdU`HHVk~zloYKsPm#pf631*T{SY|B z+r;(hv9M>hb=2D_B_#~Cc%k?qi?0|4HAY@Eg&~MfN={zsJ<(x;UHY1ZDG&bft(E(D z`9h3?P23cz8Y{B>7@h0R%hM%i8+^K1KA8;Mv+itjh;pmj;JD6Ls&QS8LTT-}D-3v_o;J}&su?3<)YE? zi@jQeNDMJwI@86`=)4?7bD!QsNY1{#;?cDYQfkVtH2)Nd49qOG|5Xh3i-eTgz|9uF<y$ z2=A!R`mV1pJkWKV1N`EzU%y^Zca`tl(G{r z9L)!u_VJ1I@SvS4_Siot22MMxSDT)RU5@eNug67zJg zl3R`I-@kufuzk&%ph<^GFjqHe7T7pgraf&pqeOw0qXjd2qaI4H13>KCS-tGE+=@DK zh5pX;P3LFTZ5jg@OK@4gd?wTWR${U%$1z2FN%>BC{e^wWN8MZ(w7kjJa$KT(t7&hT z_$>iFWq`7gi(dpJn{A=HeBQ6MxjgC2tsBA~jSQ`;D78050Hmt*YHF{C$6F;*4e|!& z@m3Y3*m-(-e)vsig4Yz`xiHxmzO>*ev;PE{A;SpyRe&a7O_G_CL9!YBFW9)SW#Wc6 zs}DDS)T(cS3B99Zz((U1J-vjLhnru;tXvn>^1AH9HJupnYQF}sFlMD?e|npp;ic_X zd)mJd=J^f{1{=*<+!v7Ey^a;|6Q_A!6k{9-rXSD%_9&0{Dsy-Yh#Ykmh+Jqy}%9!WXAOfX_=i?>gu z!&5FD^=E1d$|2UX0hFq895E4BV!VRVM|&}EJ~?Wav~L1qI}kh zRKZJ6=D}3edo$#Zj6j*O(l7zn)khdISwN;uD4(?gCIvr0Nx}D^COLLyEYvjF2Wc7t znKmL#^-$B@KOs{g)Ff1ja(X>AR6H_J9xcl0y@oP?bz>OOW>`*d#Agr;(}NFas90sJ z1IAGOOnI5Ghlp=N3}cd}9Ml>PlX8QOB4s-?RCErtXZ0eFqhVI>12<$5W%Y(3Ljx>n zQ<3xRtlkQwAQ~#Ti}HinS-oRWF0Ozjt)879%+BgXnj&FVZ!*dcW@q&VASS3O+6T+( z-HbFv!mQpWC_k8;)jJY0?So>Ekjttt^Y^+G2-ekr3BPisXk%MhdQ$zvW2y86ODEE@ zEI-z@YuC1$`=pQk{r98l8X9LK8Yeis^=WA|@iN;&3TBR5kaT)nuh*rkuHE8hzqq`7ff=>^t)G-nKNkcikh>b#VkLJqT-WL25v>_7AT3gBpkL!H zuMA!I-V*KgX_&p6tyfCb2q2|CG=dXW!<-dvRxV(g{OQxR2-{qbvaOEQE{(&@T^*kI zT##J6c=65Pgr~Vjjc&gZ&KnNKkG(l<|82`RFB>zngfC{$H*bFKb0Kv8dW!j>r$HbF zW%XK-X%YZ;( zL@Q{t>^30jXlq+uZS-FnYb|6Uxp+r-x_wKU{UJfd*nuL8b26wonXBPGP-W^Cla_va zXA96yi|yW%p}XObFk%o0p*Ne0f-B@4z0&i0myjXVNil@3ppY#L{1nZz;D0yth6V0; z^eG~pb_(ukszb|7U~_?l*Mt zCcjhlE7FbIoG;POHI<@G{;*QaaJia{x;bl(vn9n=O=h?`Yrk_DnCmif<0RIiiHr*E zbHYv3q~C#xzFDnqiOXJrH3}nR(RDRG-IoU247j4#Y1s>Wg_fTM-eMdJSJn?&QI_%# zU7+77Kgf3!^OPUyJhadFfxcsNj`1U60R8ST?_t^i3#P(QJuqf@Ll7eA=)g0LNYSO1Cg9;Q~Y;Hx<8{=?UF`rLnn;d{<^ye*>t__6<9bKpn% z4`0>lFuw3LunyyoV$j!f0Aaw!gwys&+-LCH#&mwGB+dc&N?ZH<@9Q~09D4@`hYsVx zudkf=zU4PY|B-W`uf`t51M`oc@<+^pz8w3m`u`*50DkOis%tuJbJ(`WZ%Nz+_!)OR z&-a`I#IdjZQu)LE|DJQ8x5pmMk)Dn}nhW1!4)n#?_r!nv`RDhT1AQ^}J@FqMbHCSq zps&WhC;p@D=6lV7z8d?U`u{!VKwpl1PyPQMbD%HBzBl~u&Ky8?Ij!g#0)IT}>#^?* z|GP5>IQfq5AE4_T1E{+`!(YWEqk<NFQ+yaN@!2;!7eQ z-fnMP%45^aS-c7IZQ8}j~frhiTeq8x?~&&Q1i(^n-g+jtzrIzMtm9&SDm`G~eqo11J;`}wiW2@gMVL>_KfiF};wag*(7KR>oP z;o(P)$iodQk&lx-Zn8b?=f^fDJiO$HwC=X?c6;h4H+dp9yiHzpUUEcQciVXT-0=6b zpNI`_lUJRW9Ff-DHr{?u{p2Q3#D=%YtIkV~Nb7DJZ=W0fp7s;5;cfD&cUO*=PF}R0 z`pHecyMA<6j+c+TXx#Akw7(M$G3D~bfVn%Y@_=H@N>Xj z@*TsCN?us;e7x$sbo4cioA2iFu!BeiMB~ z;|)LO#$Hh!(R;&Rq7H5t`?4SZycOX=e&YRypHA=OE7~@Q*n6Yhmws~7O~eg9HQ(+( z{EQ#pequ4h^by-wKd+J-#=h();=ypE5`HfK|Fr-7%yWFac-4t<=G5-XaptC*hy(A# z|3&}t+drp$A2D878;cvaHrD@NFX2yXwD12=Ea1;z@U;*4|HXea=P_SUiOvD>+W|U1 zfS*lkj|rZaSN*>}?s$B}a{x|$Vf>tEocb{S|CRDvF(CSZ`Hb}w+gShqQi9XY`=^)ZDIzyV_5@f7aLWfGyzIOAj5l{&xpdwUG<`v}V_|wikihWn` z^E(E3?5K|a{!gcO__*XD5q0ot^BaF&W8mWK%rTBUV-NF(c;Vug))oBl=TO@B*~IMt z{v=x`JUnCH3*SpXK6V8^;>Eugh2IyUb2(znHrQ`y*N>m~z45IJ%vM+N6Z6b4`ETLJ zA8UJZyuxr}C1xL$cpLaSFCL8675qpyX1}K;X8->pe!TDe)bV55)3{^uc)NK0_&PTp zd_O;RyiUx1PfNUAyncM08xOvppE_P=PjO@Nc)NK0_&Ps4cz%BBnEjrX{9xmUhab#% zo}S{y3yf!(-zIKc2rg>gc`<{@jQY26XL#zX!<8E+<*k$BnSn^-yNg4j`BLN4A1G!EFl6pJY_7aHqFa`-x?2P-+*?Cm~iYb;#*B)6isv2xSb z=0p29VDam2$<0n*_d~pBdr0Acn^Pax{Vawv55V8sh6zK7Z6((Kv+P*}U^*6C0j^}A z4%kiv0_?H^l_*b31+Fx>V!!9Z;E^d+S68P3$G#`qVmZeJ2q8egt+;qO18W=y?j#+udt@^n4D*wL3XNC~j!}pl8FxvEkGv`j6T@ zi2>$2x`%_sk5h?ZA=<~DX?G_EnD21z^R$idaI=ri-|obKU*CDzN4UBZgRc1gE&JVx zL05eLmVFch?D-^d9w1q4MbBChZ&!Wi$3FJmL{9SnvyVL&?W*tm*hf6PVvw4W(rw@Q zwO`ft{ZQl|iZlM%Bo=#Yu5|TTD$<8m;`WdABa9f0ANz|?%T zxHy&A81U;m;=}Y{eq$xpkNN+j?PIw3DSO-huIMB3qU`}~zt~z;+3^_$7H6VgSbuj* zTU%S6`Pf9gy=foqhq3cdbPox;u16)&4!1TDUsu{#9yewimFT_+ulrd<99^+TwuJl$zy_W`l-M{T5s=sUMD=#EXI z42A)-iP15eSc&y_kLm16$xCNfY4G~nrmCtcmtXrxereF}72LItkaeF_={HhOvCHztS=#*s!``T4dInp@nSLExX!VRMsH ziTH^30T3p1Kb?4Qmne_uIYl`g&c)Dv4D%h`3nt3o+lWs5#yDOcUEiZ^+xMPd2OFr3 z`Z=A8;^onCDlPvxi*{rt>wR(SZ$zRJwNXFuSdQ9wc~nQ|#wbP(!JFCqs6=hl&yPIf zLGeI-qdF>4o0BZ+BihGeNtEZNgOfZy=2*Qe@)!nUiEMFNF+NT-e)@V#9@EpEvhB8K IxAzMF52~oniU0rr literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..68cd4614ff28 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Testovací projekt NUnit Playwright", + "description": "Projekt, který obsahuje testy Playwright pomocí testovací architektury NUnit, který se dá spustit v .NET ve Windows, Linuxu a MacOS.", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", + "symbols/langVersion/displayName": "Verze jazyka", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Class1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..5912d45665aa --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright-Testprojekt", + "description": "Ein Projekt, das Playwright-Tests mit NUnit-Testframework enthält, das unter .NET unter Windows, Linux und MacOS ausgeführt werden kann.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", + "symbols/langVersion/displayName": "Sprachversion", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Class1.cs“ im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..d661c9314654 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright Test Project", + "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/langVersion/description": "Sets the LangVersion property in the created project file", + "symbols/langVersion/displayName": "Language version", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Class1.cs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..7f1e19741bca --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de NUnit Playwright", + "description": "Proyecto que contiene pruebas de Playwright mediante el marco de pruebas NUnit, que se puede ejecutar en .NET en Windows, Linux y MacOS.", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", + "symbols/langVersion/displayName": "Versión de lenguaje", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Class1.cs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..81d83f7abe00 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Projet de test NUnit Playwright", + "description": "Un projet qui contient des tests Playwright utilisant le framework de test NUnit, qui peut fonctionner sur .NET sous Windows, Linux et MacOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", + "symbols/langVersion/displayName": "Version du langage", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Class1.cs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..b8a9cd7a2617 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Progetto di test playwright NUnit", + "description": "Progetto che contiene test Playwright che usano il framework di test NUnit, eseguibile in .NET in Windows, Linux e MacOS.", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", + "symbols/langVersion/displayName": "Versione del linguaggio", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Class1.cs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..34833e9df6df --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright テスト プロジェクト", + "description": "Windows、Linux、MacOS 上の .NET で実行できる、NUnit テスト フレームワークを使用した Playwright テストを含むプロジェクト。", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", + "symbols/langVersion/displayName": "言語バージョン", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Class1.cs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..4ca3cd026d7c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright 테스트 프로젝트", + "description": "Windows, Linux 및 MacOS의 .NET에서 실행할 수 있는 NUnit 테스트 프레임워크를 사용하는 Playwright 테스트를 포함하는 프로젝트입니다.", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", + "symbols/langVersion/displayName": "언어 버전", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Class1.cs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..af5007d4a8e3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Projekt testowy NUnit Playwright", + "description": "Projekt, który zawiera testy Playwright wykorzystujące strukturę testową NUnit, który można uruchomić na platformie .NET w systemach Windows, Linux i MacOS.", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", + "symbols/langVersion/displayName": "Wersja języka", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Class1.cs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..fe67734cf73f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste NUnit do Playwright", + "description": "Um projeto que contém testes do Playwright usando a estrutura de teste NUnit, que pode ser executada no .NET no Windows, Linux e macOS.", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", + "symbols/langVersion/displayName": "Versão do idioma", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Class1.cs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..9cb19ca05c98 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,15 @@ +{ + "author": "Майкрософт", + "name": "Проект тестирования NUnit Playwright", + "description": "Проект, содержащий тесты Playwright с использованием инфраструктуры тестирования NUnit, которая может работать на .NET в Windows, Linux и MacOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", + "symbols/langVersion/displayName": "Версия языка", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает файл Class1.cs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..bc03a26cc9d8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen ve NUnit test çerçevesini kullanan Playwright testlerini içeren bir proje.", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", + "symbols/langVersion/displayName": "Dil sürümü", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Düzenleyicide Class1.cs dosyasını açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..f5645b2d4652 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright 测试项目", + "description": "一个包含使用 NUnit 测试框架的 Playwright 测试的项目，这些测试可在 Windows、Linux 和 MacOS 上的 .NET 上运行。", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", + "symbols/langVersion/displayName": "语言版本", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Class1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..95c7c1521a74 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,15 @@ +{ + "author": "Microsoft", + "name": "NUnit Playwright 測試專案", + "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行、使用 NUnit 測試架構的 Playwright 測試的專案。", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", + "symbols/langVersion/displayName": "語言版本", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Class1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json new file mode 100644 index 000000000000..d10f570b1542 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json @@ -0,0 +1,97 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": [ "Test", "NUnit", "Playwright" ], + "name": "NUnit Playwright Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", + "groupIdentity": "Microsoft.Test.Playwright.NUnit", + "precedence": "11000", + "identity": "Microsoft.Test.Playwright.NUnit.CSharp.9.0", + "shortName": "nunit-playwright", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": "Target net9.0" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "EnablePack": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets the LangVersion property in the created project file", + "defaultValue": "latest", + "replaces": "$(ProjectLanguageVersion)", + "displayName": "Language version" + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UnitTest1.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "GlobalUsings.cs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ { "text": "Run 'dotnet restore'" } ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Class1.cs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj new file mode 100644 index 000000000000..9a4e39bbdc87 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj @@ -0,0 +1,30 @@ + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + $(ProjectLanguageVersion) + enable + enable + true + false + + + + + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs new file mode 100644 index 000000000000..6f683a9651c3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs @@ -0,0 +1,27 @@ +namespace Company.TestProject1; + +[Parallelizable(ParallelScope.Self)] +[TestFixture] +public class Tests : PageTest +{ + [Test] + public async Task HomepageHasPlaywrightInTitleAndGetStartedLinkLinkingtoTheIntroPage() + { + await Page.GotoAsync("https://playwright.dev"); + + // Expect a title "to contain" a substring. + await Expect(Page).ToHaveTitleAsync(new Regex("Playwright")); + + // create a locator + var getStarted = Page.Locator("text=Get Started"); + + // Expect an attribute "to be strictly equal" to the value. + await Expect(getStarted).ToHaveAttributeAsync("href", "/docs/intro"); + + // Click the get started link. + await getStarted.ClickAsync(); + + // Expects the URL to contain intro. + await Expect(Page).ToHaveURLAsync(new Regex(".*intro")); + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..40382f8898eb327d5c68b1d76423d5b1034fdfdd GIT binary patch literal 47213 zcmeHw30zF;|Nk@7w693fV(Qwi+~QtBsK%O05lV|TM7D%Ni<+@7UE&KUqmKop>b1Vn&{Gyo@I zeeBrQcAyjhzOYY4rL8Rj!0aIa$jG#|R|^90c?6P1Z51#P@-F!e02-~e{p)l94o$)I zser)Y0NixP^uadNW9g6SQvs_f00>3`aKLcBo}`$97*s3y=bV{~kT$kOAy`;!4qSy= zj*IlBgV1M6#jruKn`ST#fa_l3&C4JrAi8mmnIiyF_s~juI)e<94j&pc(6U9|`?&V$)fJ*nLex2{ zmStUA`a5$?LBjoqx+^FdtCJ2cSvJ5!`U>rd{_LQ;r@`;c%hKC_DRkQwy2jL=UgxV@ z=j-@3>{7l@e-YBNq9*M+UpKn?iWMuw0zD5OKK#N}L|oy}Y|kOjR{Jvh1twL#f4bo5 zKXzZ5^nl+V4gatjOT%im|x2&Ld6+RQwXw=z8$13dmD3PKb||6tTNh z5>ZilND9mkufInFiIe5%lSF{&g92%B5?E*2oUaOO1U+^2Dd3vTmwgAa8Dl>bGE$Cu zc?AkkH!;j`Yn9Hcz=jvy8FXG{Gu1?~g6-_m~u)*Q|SCpIMTY^ftQ4 zUi<8s;;>sg0Hfb2PiwiRT7j@Yx>An+eD^JL>6uBli+tQhP)-Iti<+PAl6G?~v$>(s z?x3eCct!RbpH)|S!8j~|b=JIT`GVS-#suq#sQNw4R{eins@GJr?fGorH$JdW5jmmWsZr<9bO#y0}nwlqWHr~kGN2dU>2;-K^ z$*lB>WUJTiNq+&FYLrIvlZy!~{ihC9Wa`1f2`XaO7q*n%s5fwUVVwNXe)?qKJlu_$ z>!qXrK1`Gh3?de`+={IUPuFG@2zsU)%WFK14_$hr();>$s^bcA#+5Td45h@Z>JkCh zC5L_9-T7R3A~>S#?3Kec|7PtRN@b0lV(7HBB3w`fqz-!#&~mBf)M)0)rF66UiB>KV zF~tWpFH2V_u_~ioL%-h?rtrwiKYJUDqcT4GulF-9<4$UvW>6;lm z;o8T=_qN6P*vtD(0oegDjN(g`TXk>EPC0mVkD6zcm=jCf z{03H4RKhcTYLRA3&4g4^V$hA0O5N(JeKjH){lLbx(g?uMQbWA_>g81vU!d~Y9wADgC4sp%ftGl%2lg?rb0WkM(J;p*fmOj5ap0u{g z5lj#PFK1^>6uK}qlw`9+CyexXRAO=_Yko>eO0|o}3u^}fW#BW))tbIjow1DqRt(vBCQ_op9Pq#^{6Hb&MG0fbVSw*f!7H5vRZ`Y5u zhLT%8-CF@W($pD8>>1n7O2deZy?Siqf|7-sHV20#3Fs`{RyEzwS_CAmEqJ_p$O*@l z2ke?Jiy!f-*y-jYkm#fTj2z2ku3KBWI>C2f#D%M4np6yT8o+QWE}@S9#m?(ekFp zqqwzYp4w)5sYwT>HCT|%s=ck;X)Oh3PW;w9cw;{qgW|F>P(3oDH0etjMCWH`0{hk zotkY0N5(Wy`5dcVx^=o9NF1CcBq1STyG>+zZvXpH6^?LQ$xfgrloS_Vuhk%(9~QlL z@7{|`>$S+h>YezXJ8jB+;~MYO45z=%&(F8nb=8alV*g&C`1Zz@c~Rjd&h9D>HSbeK zl4Ke)R%%QYXUu&PL9w*7T>IeQz~GP&1A68dvucNOm(gxDw=H5N_8hV!!42}^KYPT} z(@m^HPFlpzRB!t7hh562dB&%f9&f5GTP!TCB(XMafgVs^^(?wBfO1$FimhQNWS0LxhEFb_39VHat>atyZ9AX-mlL3eJ$u z1i)4Vs4PP~WH4tC2@LzIjcq7k?Cu9>|Fn_A^Ue$AouiB^)beaBGy~woFCFRM5JzOw zmsH7&7cW*+n^kyIUtiO!Rc@*{t)QUrJfgt)&BX0noRub(fLGC*{1vFw%!mSJjQhSJ zS=;I>qF-0%jnE!_7>H2I1%Tlw-az>P^3_esT4!fdFGeMDGEFG)<;&w|eSBU<)GJMO zHiX?5B^l?YY+I!&GrA#m*NlBq#e)s!A1A4ZTa#6`j)|?k-A z7`(d147~*k4vv0ZOg0P(B&%F1Iqxq{J8@Bzks3@ttO1M**I5M+e9 zE!GWIR9vjAtQ=4id&KzalH!G%T3TAx7C*o2nxWJ%R^o;9{Udu=aC0^nWhAVp&+>Y6 z22RMPx^ftaf1BO!sUNEuI(zo)>cG>p{nIY)OQ$f5ZmKVh`e^2Osj;rQdeALaPEJnA z6-9@Ph|0Iyt0Xm}?F~~(!jf{e-UQD8MmGeb%c8QY16{UcHzib8&U2L&3Kg^&@m7GQ zwlHl;v}>sv*FLRgx;0x86#CQDUtf1N4hDK_D~TUp&$2Eg5!E zok)*e#6d9KJylSpXgH+R%#a89?UkvhXO=uDBGGEX#>9Y0l90D0P4H6k8erH`>ZPG# z{|xG(O2sgow2+=jAIZ<(4}((q7sTfrI|lq3_wCbAG01@SsTwhiYEx;*6b+eHARzhv z;&VLH5fjv;o`Ez;Lrtbg(^SZ`3<3E9HSIb9nI1t+k`EygFL_H^^Iu5im>5R=U_p?s z>)}M&G)@ePHGd=*tdfO(k53i6|Fm9#*3XDFHVsynLcsTC%gc;(fEuI~EonZn6euX= zMEdfjKjfbT`5(DJro!p+GV;h_FL6tng^v(qnh%*aDj+7P>7E&4f|`Ww5EIm-}D1}T5pr%*XkR}7jbOUJ`pC-8bsX1bTnntWcOio{;7G?SV&*t<0@` zP!J{;La+CsFp@(+$$<=Asrh8utJu+u#{6Kql8+!G{PsYadurpOduu@W!2Qx8bU4-w zo6$1z=B(&R(%|kA6{$$(mra|cY(`X`_X`VKkRqcXT5>19ihliIzJmj>naFjdhkpN`8xEZh{*kWEix%rO@P0Xe?0IoHgF4 zKkAE1YYe!Xtpz}h;S=`X#S0&uPyh)qvQ(fdb!?OZ@nyL*QZaP4h#$o zfSH*Y*sx&(aB*<~;}1>(w4*bD{%J#C>T3a3US170U2_EP5p=M7*De509l+6}N5R=M zXMm574>)k!69fbVfUwXo5D^gpP9&ZJ7asY8kY{1w_RBlq!Tkr|$&)AGVfG{N^5sjA zo%I?#FL(~#7QY2~d3oT&yZ4~9v=o$-mw+$j6`-=>3#hKDf@?LXt*HeK4GpchfByd& zfu9lRl?bp{EViCe92c%8IC75~rN&W!3p4L-3aQhg$U|a4CvJFGVJKGtRWgYrD?^l# zhWtdkttw!z>~JL1ae;_bJNA%T`61_!;ln!_kmAMD9*2h{*y@1-FZFnSG%;X^WDq}` zt(?$zz=QZledXtb{=4(TsJAZ=5Ia^K{y{1Nih!d^J9BHZ11r1HLw>fYum8TO|0^rI z*1Pn|s- zLX_ahk9KboLTHiWiyx|&6A}^@mk>exLPF@TZQ-P!3~9nb!cljZS{G*0S2tx^ZsP!v;uKdsdr-eH|CjlPZh}6jd02Kh}qSK%}0H|%J zL*G#Hlgv*9;JGCO@!`tEwssy6VE5Of5?!aNz?BBq_Ulv%Y+wtA>r_)yQ($Xr%f421 zb#-N5tD@^vbd8FxPx05K_-oSm_;~hpDRwQInv%l44#i)8vadbARI;xDcN8e!~An8D3H##yX5AJXYN0wK{)1iP+#{;(@L18}+m zx}b6g1z*M6=%fw`aN-!fg94m5Mu#X60=Nty;l*)uHUb3&K@wiPovzTPU|>gaJY9k$ zfz-p;BRg$NtN$btlp>;D!VH{uvLShnNC^`UAj_g8xRaI-6v!L4-EK(&rk z5}co+!otF>JRIoakSy9?lq+3USy+Tk6jp9kLeLNCY+-1l)k*Na#ETrkt_QRoc%} z(76e=a5zuF&P`}XX0p#s9D+Bq?~$W>3~r7>%#7rpkRvxn<9!eDWU>!4=gJ!*w!H^)vsSalB}$F zTU%VVwJjnf1}kDhsEO!gNkN%@GJ=w*iP|JtQQ>~VqHHp|-A|U%kJ8#~rL)^#>9TAC zxOOYz*24kR*J0`0{^}pQ#y(Y}b_hY28hw+$n}p@>F4#|f5A%2b9P`f@wIS2DdY-aX zyzqchvxqYBvc25QoCzlu4RyO7dVgNF=9m6a52Bbs^X6VH4t<`n$DnLkkeuT3QwNU( zzLX6)HE4ODVNT62w!2a>y;Go>=6&Xbx5Q-aPNm)>sN z@Te*!6Sh5T$a&%)6j$$7^I&TEP<@khC737sfz|pt6?N~e73w3Kl<&%dw`W}9gLMWb zEYl~Y25+xexAOef1pkj9&p@Z1?n_^@hpIdaB#K9*KC(zCgc+HS@}z}HAYf4QGF6Z# zu}gQVg&<=*0q_R0J>`i*)kX2ts2 zRUWavcSj3H+#MZ%+I`K7r~>EgE9-8QhHl;FpFi<@{aG#ZoO!yIW_88kb=9<|0*!nPeA4!k2+{-jA=k@uA%#yFn%8-Uc;Zf+R+ak4B?*Ly3MA>+wu$N4Mx1!0$$EH4o~*(+gf`w#KcYfZ9`t} zgS{8$?bS^86%&#m#M~CvWc4NJ&W@r_dUg>3xsxn*?~nm- z^mVo0L`;y3joD>g*1UMzvz6Q2Yc^cXaoc4gu}XNW!K$il+DrB2Z6-6O=IE+F1JXt= zk9_0r`561}2%eTLG#MoBxbZ$TIQi~*F_`aMSC+MO^exuP?A(=6x2j$p zpvIIfbflaY0nS^N7w^_8IWN}~X(P;n?aNYr2P-#I&%(@eMf=#G*Ua4Uwsog9jAp>L z_Wg+9{E&MeL=0d8adMV)%2|JAkO0jQidAiR;O*fwK>F+h9pLOA$1;uq>dY3KBCjN~ zrdOgOrh$_MZN7xLP{8C}ZuQ>RWdf&BGpn~ z_F{f+j-96_@Eegs{_FElkT>gGT(hf_{MlJhuteu~k(%p53{B13LVlJE>D)$f#|-zV zx~l9}{|wSg8_WL?T&+Z6Xr9xhzg056W&c9+L!j>KN%squMTmfFYc_34Q!<{oab?Y( z#NZTZhB6tznGb@?KNV``C;tM%M|ey5mB`Y@OQvRTPnCew$=g2rXa&!|(^&E*&#_{X zG{s&FYR_^4n=KEyHKz-HG?-rD}X?q!@1wD%@+g`W9FaN zu|FLA0))DqPuMwwR3LCiYK#g9*YE~1-jBAArdU`HHVk~zloYKsPm#pf631*T{SY|B z+r;(hv9M>hb=2D_B_#~Cc%k?qi?0|4HAY@Eg&~MfN={zsJ<(x;UHY1ZDG&bft(E(D z`9h3?P23cz8Y{B>7@h0R%hM%i8+^K1KA8;Mv+itjh;pmj;JD6Ls&QS8LTT-}D-3v_o;J}&su?3<)YE? zi@jQeNDMJwI@86`=)4?7bD!QsNY1{#;?cDYQfkVtH2)Nd49qOG|5Xh3i-eTgz|9uF<y$ z2=A!R`mV1pJkWKV1N`EzU%y^Zca`tl(G{r z9L)!u_VJ1I@SvS4_Siot22MMxSDT)RU5@eNug67zJg zl3R`I-@kufuzk&%ph<^GFjqHe7T7pgraf&pqeOw0qXjd2qaI4H13>KCS-tGE+=@DK zh5pX;P3LFTZ5jg@OK@4gd?wTWR${U%$1z2FN%>BC{e^wWN8MZ(w7kjJa$KT(t7&hT z_$>iFWq`7gi(dpJn{A=HeBQ6MxjgC2tsBA~jSQ`;D78050Hmt*YHF{C$6F;*4e|!& z@m3Y3*m-(-e)vsig4Yz`xiHxmzO>*ev;PE{A;SpyRe&a7O_G_CL9!YBFW9)SW#Wc6 zs}DDS)T(cS3B99Zz((U1J-vjLhnru;tXvn>^1AH9HJupnYQF}sFlMD?e|npp;ic_X zd)mJd=J^f{1{=*<+!v7Ey^a;|6Q_A!6k{9-rXSD%_9&0{Dsy-Yh#Ykmh+Jqy}%9!WXAOfX_=i?>gu z!&5FD^=E1d$|2UX0hFq895E4BV!VRVM|&}EJ~?Wav~L1qI}kh zRKZJ6=D}3edo$#Zj6j*O(l7zn)khdISwN;uD4(?gCIvr0Nx}D^COLLyEYvjF2Wc7t znKmL#^-$B@KOs{g)Ff1ja(X>AR6H_J9xcl0y@oP?bz>OOW>`*d#Agr;(}NFas90sJ z1IAGOOnI5Ghlp=N3}cd}9Ml>PlX8QOB4s-?RCErtXZ0eFqhVI>12<$5W%Y(3Ljx>n zQ<3xRtlkQwAQ~#Ti}HinS-oRWF0Ozjt)879%+BgXnj&FVZ!*dcW@q&VASS3O+6T+( z-HbFv!mQpWC_k8;)jJY0?So>Ekjttt^Y^+G2-ekr3BPisXk%MhdQ$zvW2y86ODEE@ zEI-z@YuC1$`=pQk{r98l8X9LK8Yeis^=WA|@iN;&3TBR5kaT)nuh*rkuHE8hzqq`7ff=>^t)G-nKNkcikh>b#VkLJqT-WL25v>_7AT3gBpkL!H zuMA!I-V*KgX_&p6tyfCb2q2|CG=dXW!<-dvRxV(g{OQxR2-{qbvaOEQE{(&@T^*kI zT##J6c=65Pgr~Vjjc&gZ&KnNKkG(l<|82`RFB>zngfC{$H*bFKb0Kv8dW!j>r$HbF zW%XK-X%YZ;( zL@Q{t>^30jXlq+uZS-FnYb|6Uxp+r-x_wKU{UJfd*nuL8b26wonXBPGP-W^Cla_va zXA96yi|yW%p}XObFk%o0p*Ne0f-B@4z0&i0myjXVNil@3ppY#L{1nZz;D0yth6V0; z^eG~pb_(ukszb|7U~_?l*Mt zCcjhlE7FbIoG;POHI<@G{;*QaaJia{x;bl(vn9n=O=h?`Yrk_DnCmif<0RIiiHr*E zbHYv3q~C#xzFDnqiOXJrH3}nR(RDRG-IoU247j4#Y1s>Wg_fTM-eMdJSJn?&QI_%# zU7+77Kgf3!^OPUyJhadFfxcsNj`1U60R8ST?_t^i3#P(QJuqf@Ll7eA=)g0LNYSO1Cg9;Q~Y;Hx<8{=?UF`rLnn;d{<^ye*>t__6<9bKpn% z4`0>lFuw3LunyyoV$j!f0Aaw!gwys&+-LCH#&mwGB+dc&N?ZH<@9Q~09D4@`hYsVx zudkf=zU4PY|B-W`uf`t51M`oc@<+^pz8w3m`u`*50DkOis%tuJbJ(`WZ%Nz+_!)OR z&-a`I#IdjZQu)LE|DJQ8x5pmMk)Dn}nhW1!4)n#?_r!nv`RDhT1AQ^}J@FqMbHCSq zps&WhC;p@D=6lV7z8d?U`u{!VKwpl1PyPQMbD%HBzBl~u&Ky8?Ij!g#0)IT}>#^?* z|GP5>IQfq5AE4_T1E{+`!(YWEqk<NFQ+yaN@!2;!7eQ z-fnMP%45^aS-c7IZQ8}j~frhiTeq8x?~&&Q1i(^n-g+jtzrIzMtm9&SDm`G~eqo11J;`}wiW2@gMVL>_KfiF};wag*(7KR>oP z;o(P)$iodQk&lx-Zn8b?=f^fDJiO$HwC=X?c6;h4H+dp9yiHzpUUEcQciVXT-0=6b zpNI`_lUJRW9Ff-DHr{?u{p2Q3#D=%YtIkV~Nb7DJZ=W0fp7s;5;cfD&cUO*=PF}R0 z`pHecyMA<6j+c+TXx#Akw7(M$G3D~bfVn%Y@_=H@N>Xj z@*TsCN?us;e7x$sbo4cioA2iFu!BeiMB~ z;|)LO#$Hh!(R;&Rq7H5t`?4SZycOX=e&YRypHA=OE7~@Q*n6Yhmws~7O~eg9HQ(+( z{EQ#pequ4h^by-wKd+J-#=h();=ypE5`HfK|Fr-7%yWFac-4t<=G5-XaptC*hy(A# z|3&}t+drp$A2D878;cvaHrD@NFX2yXwD12=Ea1;z@U;*4|HXea=P_SUiOvD>+W|U1 zfS*lkj|rZaSN*>}?s$B}a{x|$Vf>tEocb{S|CRDvF(CSZ`Hb}w+gShqQi9XY`=^)ZDIzyV_5@f7aLWfGyzIOAj5l{&xpdwUG<`v}V_|wikihWn` z^E(E3?5K|a{!gcO__*XD5q0ot^BaF&W8mWK%rTBUV-NF(c;Vug))oBl=TO@B*~IMt z{v=x`JUnCH3*SpXK6V8^;>Eugh2IyUb2(znHrQ`y*N>m~z45IJ%vM+N6Z6b4`ETLJ zA8UJZyuxr}C1xL$cpLaSFCL8675qpyX1}K;X8->pe!TDe)bV55)3{^uc)NK0_&PTp zd_O;RyiUx1PfNUAyncM08xOvppE_P=PjO@Nc)NK0_&Ps4cz%BBnEjrX{9xmUhab#% zo}S{y3yf!(-zIKc2rg>gc`<{@jQY26XL#zX!<8E+<*k$BnSn^-yNg4j`BLN4A1G!EFl6pJY_7aHqFa`-x?2P-+*?Cm~iYb;#*B)6isv2xSb z=0p29VDam2$<0n*_d~pBdr0Acn^Pax{Vawv55V8sh6zK7Z6((Kv+P*}U^*6C0j^}A z4%kiv0_?H^l_*b31+Fx>V!!9Z;E^d+S68P3$G#`qVmZeJ2q8egt+;qO18W=y?j#+udt@^n4D*wL3XNC~j!}pl8FxvEkGv`j6T@ zi2>$2x`%_sk5h?ZA=<~DX?G_EnD21z^R$idaI=ri-|obKU*CDzN4UBZgRc1gE&JVx zL05eLmVFch?D-^d9w1q4MbBChZ&!Wi$3FJmL{9SnvyVL&?W*tm*hf6PVvw4W(rw@Q zwO`ft{ZQl|iZlM%Bo=#Yu5|TTD$<8m;`WdABa9f0ANz|?%T zxHy&A81U;m;=}Y{eq$xpkNN+j?PIw3DSO-huIMB3qU`}~zt~z;+3^_$7H6VgSbuj* zTU%S6`Pf9gy=foqhq3cdbPox;u16)&4!1TDUsu{#9yewimFT_+ulrd<99^+TwuJl$zy_W`l-M{T5s=sUMD=#EXI z42A)-iP15eSc&y_kLm16$xCNfY4G~nrmCtcmtXrxereF}72LItkaeF_={HhOvCHztS=#*s!``T4dInp@nSLExX!VRMsH ziTH^30T3p1Kb?4Qmne_uIYl`g&c)Dv4D%h`3nt3o+lWs5#yDOcUEiZ^+xMPd2OFr3 z`Z=A8;^onCDlPvxi*{rt>wR(SZ$zRJwNXFuSdQ9wc~nQ|#wbP(!JFCqs6=hl&yPIf zLGeI-qdF>4o0BZ+BihGeNtEZNgOfZy=2*Qe@)!nUiEMFNF+NT-e)@V#9@EpEvhB8K IxAzMF52~oniU0rr literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..a3118cb9c753 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projekt testů xUnit", + "description": "Projekt obsahující testy xUnit.net, které je možné spustit na .NET ve Windows, Linuxu a macOS", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Class1.cs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..f0bf858fe2b0 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit-Testprojekt", + "description": "Ein Projekt, das xUnit.net-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Class1.cs“ im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..4673e27ea263 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit Test Project", + "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Class1.cs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..692c13b22fb8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de xUnit", + "description": "Proyecto que contiene xUnit.net pruebas que se pueden ejecutar en .NET en Windows, Linux y macOS", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Class1.cs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..7630c01f8a00 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projet de test xUnit", + "description": "Un projet qui contient des tests xUnit.net qui peuvent être exécutés sur .NET sous Windows, Linux et macOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Class1.cs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..ea193c5eea7f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Progetto di test xUnit", + "description": "Progetto che contiene i test xUnit.net eseguibili in .NET in Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Class1.cs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..f01cbfce8fd9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit テスト プロジェクト", + "description": "Windows、Linux、macOS 上の .NET で実行できる xUnit.net テストを含むプロジェクト", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Class1.cs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..33b029f674c8 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 xUnit.net 테스트가 포함된 프로젝트입니다.", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Class1.cs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..f972ab63cc7c --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit — projekt testowy", + "description": "Projekt zawierający testy xUnit.net, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Class1.cs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..999d3e5b8f0f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste xUnit", + "description": "Um projeto que contém testes xUnit.net que podem ser executados no .NET no Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Class1.cs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..975926693559 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,13 @@ +{ + "author": "Майкрософт", + "name": "Тестовый проект xUnit", + "description": "Проект, содержащий тесты xUnit.net, которые могут работать на .NET в Windows, Linux и macOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает файл Class1.cs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..cb7c85c5af91 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen xUnit.net testlerini içeren bir proje", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Düzenleyicide Class1.cs dosyasını açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..c3495b51b76e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 测试项目", + "description": "一个包含 xUnit.net 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Class1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..296eea1d56be --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 測試專案", + "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 xUnit.net 測試的專案", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Class1.cs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json new file mode 100644 index 000000000000..66f60be8350d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json @@ -0,0 +1,89 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Test", "xUnit"], + "name": "xUnit Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", + "groupIdentity": "Microsoft.Test.xUnit", + "precedence": "11000", + "identity": "Microsoft.Test.xUnit.CSharp.9.0", + "shortName": "xunit", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": "Target net9.0" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "EnablePack": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UnitTest1.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "GlobalUsings.cs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Class1.cs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj new file mode 100644 index 000000000000..ef421fbd17d4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj @@ -0,0 +1,24 @@ + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + enable + enable + true + false + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs new file mode 100644 index 000000000000..7e243fefdc29 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs @@ -0,0 +1,10 @@ +namespace Company.TestProject1; + +public class UnitTest1 +{ + [Fact] + public void Test1() + { + + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..49fa37c2bf26 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..671271e7595d5a5b30325db0bdaad7d5469e58dd GIT binary patch literal 55748 zcmeHw2S8NE^Zy=Qu|Vt<)Wqo5N{m>7aEiv>1vM%VH8EDi#IA4}6{1GaXzYq6b`iT+ z!4@@9QITLl54(T`3q{)g=kt!eJkFzon*T2Yd++UgTV}S*&d$#6V@$zHGHYuKx*D;^ z28{j97_+d@`0FSbJ7&mO^>9eS+mWbFgElD#_H73y#KB;VS@Nxmeu%!Oc?w9qR8KxeMh(r45#!ce`|7-E#W~A2~m;sZdkV#_&Ow`0QHO+XSdCw<$O*EBYQc_Y91yOl< zYy2t-=f!#Aq(sSY=1u8R93N9nlJtrv(a)re1mNfNev)cZ98!cA?j!}_X=p|Xv@~*L^}_mdjW;k z&NFCFMEQDg?u}aW^5IF7=sIztZ_=di9Xli?`6fWm27CY)ZZ1Y+A#SY+9pH%+qExYtyC;YuBzF>(r?e>(;Fs>)Ep>>(i$X>)*dW z8#HJT`}*sz*|*<*%Z3jh&c=)x!^Vvp$A0+X2R3=~WHx>JbT+%y1m>-r#C%#$W^>z3 zWj}ZHWDB~e*rHyu+2THP*s=lh*s39ZY|YR`%>TQ^?6*-%*#`IJY|Df-Y{rZkZ0_8- zY{7yB?3Z7DVZZ+RD_gyKHQPC3Bil1)E8F9?A+!P?0mp!7IG|vT{&=`9Y21Y z{qe^i?Cc+B*`I&@$u3;Dz^)w+W7kh!Ww-yl!PMt(vdfn*v+(e6roI%(Zrr%RA|oT& zy|5_u@Y+50_{IYk9r=*mxpRj-eE5((y&KD(KX}Tbqodi=r%&07=s5QJ=}Y$F#S513 z;x&tpk7r5oNi6wIGD}TPVQDF;EImD)m2JdW%^p-=V;O7Z$5@x0jP(y?Y*-v4zGcbg zavQda_hdV`2Mgf~*%iKv-RGAjevDeIP4SgI82f50jU9e8KJ8>|3&lSX$Jk|xe~seb zrug?Lel*2@PVp0D@f+1jZHmjQvAjg-=5-krTCOq+;ECN*^=?OHjJW)K@t$)S_gKaF!rhGTI?MQFwJg3h#kZyS zT`2xwia&|sFQE9pQ~W&?{}{zTL-8rkg^?8h0mYBg#;?yBvCfpja7w|OQrJK#oT3!& zPzrIDoV~Q+>~&Ah59EcWt0@y#ecN}wFYuR`%_Q2g2yzdpscx8$s!4QC!bIh*f6 zX)WX|co%0kE^FeuX~A6rtrs_VlJP)xqY0S1U!*}!B$i_&gdgN++cZn)k~s+q?_8&t zan|sOOQr}EzNtypp^eRy64BZ?6u!ABg*P$B@7wV4Ky6Uz2KbaVHa4r%+4Akc^t?^x z;8NMxni!XMc5kUKgR+htJBYsyPMWfGcPedc>fql0qqj3C-n@h)D`|e3P+o+OyBlTj zk-iK}YIi9vOXRbR^j)1x8Jjk9@BbDB=AE6&lANr8(x#tj(s%1HfHJUnI|Gxtu5JSd z4#<|2IEHbjBR+ZmMTnSn4a?!82K_u3!#M-e&c6p=}jOjYG1!n@Trb3g`7+%i*8 zsu!jE56HqBmvN>>QLYQ(jkO-l4e+a7vIA9<9&px%AJn$Tz;-<- ziWJ_2YDv#uu~t^B(Le%smmU=x(f>dV{nVZGf=LT2R-sz8YBl@XRW+zk)v!X%zEb+1 zmC_5POSiUS3PVG~N`36Dj4D+(s{FrxQuqNRhwFu}tXM6Q+rJ#-(yc=MPURa6(BP9X zg1>zkWW^eMMc_vGl&@ltfsam!$-ET4T-7R7t^3+r8&#%%4L-5}I=6#r7y&BxaqC^# zhW@FI%WE7hEEBkOZx84?$bC@PKJ-s7vkjjqvc~f^kvTlk%!2;=eP1Pjd8#!zB{}Up zmF5Ck$e5>2Z7@=rm$q%&mUZaRL7JEL>eY)mIXS&GFa7Sj@7UF&8SH>G*0G$&oLUz(F{+_;f# z+qR7b1_rX-yLYn#2M(~Hpdfba*fDl|RS-M1?kGFI;}2;*8g}p^J9+XXJAL{zJ9q9J zJAeMXG#9=3M+Ccd?mD}4>5?=Ty?*^VyLIapdk}s{nuEsNe$4LOyC=;-W22(klRGi& z+5IQldFacSxQsbyJWEJOU`ekN$tAHjZ{A4r(A121Xe*j04xoABWSS=~qj};!nkQbB z%@hBdr~WrjeP8ob*9_>V0aw?In|}Q=?&v)pX_F4*)H0s8f8ZK8M! zK9;?2W2`VNX_P65X8~%ncWrG{yelR0512JD#_(uN z&+)#OwLt?XSpo(PTbcuk7c-;xu6WeoYGZ9s8wqGa z7&aEjbu1~xFI~&d$h2)6L1u|=|GY?Z4r3Si6@trMfdbBb! zY2#S3c=6&!ic&qqYuAoa{!UhQuDz@bY7$bt9L)?{YG2cP(C2K`%GH$;aCCKb{=~qd zm;AkyKi>B$t!U!v>S$tQ_s?s2eAgOyZ)a%QG1Gf(eAgNVpHVJ`rd>0=*XB>}ZJeCG zkiYMz#lMwnzYe7gikB*7ZeY?%Tl21({9S>+vvo%48&H*HK&JSg*VHtznvHrA$xS+KXi1H))GeNuNeI$R6hCL`DXDd4z>tx_uuY4DJ->-My-sl5PrOh*o zk+tfUYuB@9-%iz))!S3Ya4Jorq#R0o$|_W<+OC>qCCh5vDS)G0W@z(2%R2RJySJ!V zzhVogOdSik64Wcx%wE|=#LtAf8J5*^_#lbm))J%c8LsoTm?$oD~vy>jv z%o4QnzA8iD8?wZWQ{gP~Yy?wZyvZUWBG~QQw^{V9M=UBT ziamPth(T_6{P;0@^5hANd-RNS*U#B2(p~?fzmCt)UnjCRq{EhEhYY!47k@x{=702| ztPv@0d(Z;rSW*i6)hC6nEh%)Bq|oieEcpOtL-IvW?#(>-YPOK?X1n+~ivN#3)`0Zc zMm-oa8OxZNA7jOLGG{4-5{`@2MpPXXzpFX|khpA7uYuPLVnoI1ov8Ab*=C5o^ zQsvn-GA^x|-6+b{uV25Z-4|8LRFPPRNtt41rd92l)iC>*ObVERb<@U;>sr}0EmPJK z0g5%H*bS`hnpXLrX^raT3_m8XX;~TGjQ7<|tDBbn!cO>G zmNhjqvuvvMJG5-xym?CpTN?+5#-G?VEo)^>U}asc(&wMmuJc8+%9a`^Z(gycc_~}% z81ZR|O0`N>_{ZP8Uc(kmZ0$5$F#o?l_2|~VWbw*asVv#CL)%^&#!4KQ)`r-?ahty- zHvCP;wypb2y7BbZxxjKx)k9vKoZoz1^D}iTdprMR=CQ`I$LDqGG_M`AyNqL(GvAFe z{pgGT{ZXuJ(`pmv%yyhKx#EK0AiLSJpLC8YUR@Ffh2JV*W-( z{t7EYcxE1D_ZP6e*6eIG#dpWg!1IG!Bi5o8t45J7nyC~C29e1r>hwxeJ}UL{IUkeI z(qWLVdrG3MnQGl-vz_ykYq2r>wuwU3+#o99`DhE~lluojR}Cy~zFzP}+GsO&>h%6L zmdt>)-WAZpNX3+wg6b^}4Gpp1*tfDm*~?5dpr^6h*o)J`oPIbsx7CVuF1~jje3s;H z5cO*Z)@i`HJKmn|mh8Y0Q`Hiy9TqInj4fI?m>v4zLg=r2)QGe+hhNj{T}v&)d^*Ng zR4#pD*f_~sRnnk`FY`Au@~^H?Cd^UyHi~jHV%PT+Q@I}tG&x_BZ7gjvzw&ekOVy9x zlu=a~6LkFMteRcdPEWYLcP%}$WJBwDvs1Q5?{)L4V!#5;lu6OdKf1gR-wqTPNP08kqd-@be>G>tAuC)$`(C>i)~q$Jy5EV5%5PHFL^f zY^2ATEfdw#BW}*Ou6EGa`Wqv5*Gy?grEIC1BvsK1Yi7}&-EGaR7qC-5GG$eTk16WV zqO<|?FtV<$FM`r-P~w&Chu2>zXTXfUWU85#%%6&^-6eP1-qY1T)~(6T{@uLZ^j{)} zD4Aci3iUi!SC#Hu6_;XeudVBKgj(6$&?V}96$ev*y^EcbY}ZM50}cFV`!I#_%DCbo zs-b37dA|-}pKmd{X5_{XZTt4(s_Q8Si?QtwDzmON4UAaFzgn;r&&@2@#|;wMclNcE z%r5q;kPVNgHr_JjmnUA`7w=qu;6*uwK~%+hN0xic^b7k_9iKjCWnU{xzfvKOQ@<(0 zoKro!w2AtH*{oVP?6Y7a|90CI{SHqExN-3NO%ab4+&VNq_UirnL!UlxV`9C(oO-C| zpzci+V~0*^y~8!w<>|FuCu3i2h?!wpy~pz-uP)Bu&xQu9H^;n6NNQnjsan?8Gi-8gR;!Ik)TXtby+;1M z{RO?K#nK)wXY;Mu@S2*ts9MSuW=cMJf{m3?$P6pbq;-{J|471<+RU+yiCgHJRwGW% zDS5lP!!RR%ZdXQCW1Y9cv|_2xhfHa}6mefzU72X~r#&;gxqo!;J>OpFRi;dt^`TX^ zr92M~ZfQPtpi#*4X%?*YC(o)~J2t~irG8`0W}1a0>AMRmAM)Ie!tPf*o??^m?AFa# zkNB|{XBwNAO6ASe(|)rZ6Zv@PnqsP8U`7Zo*)V4L;Tr>LuymrRL=EQAb=$V#wVCIp zwako&TRg$qkG)p1yDOZRh7J6RbQY@;eG66esG5GA*tBk+DlFQv)UlIGwjFM!vNlj%BLa=st{PMdY_KCU zvSg>`09~Jw2xw8oz}kmd+Zrh?6v|OSHGFc2(PuFGeN&ZtBDGo5UYxEF6TNBe{weeO z7+SY_+PFQN71VFt?|o|~7`$xHj7Htu-}Pza!LVeHHrw0os2O){i0_sv?nin~OTN5- znRR&MbLfUqlTb(JCvCM8_y+-OU8hqSBbhRnY4^MrCUK3zMlR|D5$c4zH~p~cnr z4!!)um_~s~uhUbWZ#$s&yh#D=eIEYLV2bZ|(N{LKeq`L+Ox3={sI=+lLq`T4-PkZF zYUZUqhV9sqH*qIRhsOp6KfAwcaKATA`zj_STpt$xV5w{MDHHt7RLu^KP8$>&v9asQ ztNS8cs!W+Mw>`7#khUk-b76YYz0ysmCOo;J-ekA^C*qN%$6ZT4P;E(KtNLesRI6$l zjD51}%vNG;p|^UC+%+%<0-I0XzU+YCu|xwO)qDzZ%Ci0DbLTov>>SXp)Bvw@ zZ?5hdxO-^F$JgsRTPl_{8Ma{0o)N^Qxs*Rcc!Q$X@TAnm8u@gn1((en;rhuI&eWKj_WA3a-<7HW;wK{_CMb zec9{#gy4jP)xN`hET<~cEmhU+lONaGH$K++Q{V8!%@d#13r;xSBy{t(9fwBT2(4r} zc9RbaI##*yoEm{28Ti}Of85tnajCE2njfxo9C7hUi!iT)Jo@#ck!dOWMn-HoJ@2Nw zbET6(UUlmQ|NR3GS=RmMZXFX8m)t)}`*!%$NXOEx`V8_oT`t9Nr}OIXFSc+tKfn0G z%m#H?Wx`~rm8xN~@@CyltJXgw{&(^DjxeiQwD=yaR0pl+pr_`#&5p%TgM!V-gxPk zg{#*a`nNZI-SqK+$Z_*pzB=C|p#0)38;wWoZrr()>JJyy)YB$P_q6yz|I&TyP3MD`ez@Z6;{64hRriO=~ z>>lp$=!nX5uDQx{+R+n%E=Ru#7?t9s7x!tmXZM)TGzgwj|{>|5!#)T~l($`LVdCuAVOxb(s&unT& zec4m7teN|omOS-U_@IfmHe9q%c@m@azi`4Pyy-L7yYcA_EfiBv8z~*0*_^4`d-e0c z(A2Oqit_dQU7C7)Sxn``VXH6*u&7ZuB)GJ3VjoCk9%8r28GW=3ZcWizGxfL zjT%qAmFaWiZn_5#8Z`OAl9*Fvy6^p}&c=#~iO-1@I9C|-!{xnezgJ%BVyS3;-_LRD zfUfS>cD7#anH=5vKzi+dZ_b=_QF>iBrQ+}2{EpE+&$Q$iqeb_89d3`9v21Xp>&1r` zR)&AFbl_)CA3ZVt;V*lZtX%8)J;^QAVy^b?9?+2Q>u*h&Ej{g`bm(uYEWIas!1QQC zFX|#53sbMU8+KcDpMlm^vMVp zReHsUzMGS-jhVE_Ty^Zaw@Y-_G4bE*W?in28gHhWYM)^6rTR$SI{#y8FMhP;%d@pg zN5*ts8y|7{(cf!5_}FPrj4jwy7sH*yLaW~+D$XC-a_qpH2`x%4yO_ALnel0(DC!x# zgHvD5JM`w^%J8}6>TTVVeyBsWH^XAB=G^yDZuh8Do0Yata*Lnr>Xi_2AoYrs@u+Vj z``j`}etJN?HGoRvj^&IAQ-)lxy_}7T4BB<*%v$?udt;qlE8k21#+p6dT}*YX;Xw5x z_v^dASDbRdS;>+jlb_!@eBefM zEbGw4FuBQf^QiGF+ORLnf4TY&D$BddAj_zID;Bk5zaP8rIJmN#FI!fNIhxnJ|LSDG z{)k^9Ms|9s@T;8gs#VFc^VqT)Y_10%*!1X*Bj5I3R7&~yYlpsJ%)w0A%phcX`X1-R zs7yGvgN(Q-uZu9}5e#e;FF& zb=xQ8htsA}R512q4>r1&KDibP`^1u|C#HNI8CiK5Fl++hz+6{9XJh%-QTk>-nJUg|bwz@vFbpN&?4K^vv4#rP^b)i`}jSgj>ys7ac z3wltWJ(=QI+;XfpvuPT#mMUeZ=3oZAi&a6>hPmhubE4hb;b^?M(4q zwyOeFl68Mu*OK1BpPN`Ox#O@nprJu+*HZI>n-^1kX=Ksn=IZr_k5#W;QsMK|z}mm$ zR7F|~bG#^SYLv3PylVRB166F4MivH&$7d$9&ugkId_t0r7`dq|lpiT7t_>T)#{003 zcfL%l^)lQoxuf&;ewI^Q7TOqG^1XJzaO9JcA*Rmh>1_=g`**+6Z{G-~$CKONeSK?_ z^NxX)rhK-j{Kt&lRno*JzPRe-!V`5YS}fk0SY6rB((OU}bE~Eqb!cj`J@rj=O1b_U z#(9=-TUBvZ@}%P{4U;-AHdRdjQnkckbYx;^Kpn$Nwlk*BT4QSMeA(20^x&JPKEI{h zzKHY*2h3QH#s;kHe8!AxG39Z|>t-F^d-V(tOOk2X25Z*TjCE?wMp&@LcfE#82yI~G zvbZ!O=-94X+Z}D(Wt6Bh-wyid2Th5IiJUAqIPEm}U>xmk;Iu2DP>US&Q@yH1 zqNrn9W#Y7}gOkM$rS!$00--2Fs=|>q488U=BIy!P%9sHo&mtTI# z$wCQzwxDEd@Kax#OPUf_mEmIwX?`+w!g+F`tjHjlia$3#jWZC%6%Aly~9`x$c zk7s}X{Wqr_gj)K@Zi$D5g=yO!Sub)I7Z>gO!mexG^k~N-KYR9UfyQC*b!=J2_$CK^ z^y{_(^n0`kJV$(r^Um5pmo8m6?edoTUO~oUvgP4qF_J6#^|b-ChpShwYU97FHUOUU z{P}ZE8*dBL-pFvCljV#Sf6)f?)j!_pYXf8jB*|azstwR?UVi4x8BW$a@05PX0iaQr z51=j54qR;+7G)bipZn>jpQJtud}vp(R0e1Vd2w_sfi!04rT#%Tc)e~L0AE6TgbZHP zZ2VzPo^2aI`b9AokXa?acI_IHFEHene%f%w(GDQ*=(Yj8qn-Li z!UrH%K?X;@g#r1cA8nAVK>7Xq_w}{`xjb5!ZGcW}kmlcoK|9hY2>p;ZHf`D@@gDG^ z-o1Nk$6#HVv@pg3vM}bq{q~#Gr#=Mw!SBf$SgH^3+BtLPWSSQgb{iNrY?#Dz3XArF z)<5bPvOjb#=#QbHp`1<^DUvn--3D1lYk5jxl|ez;KXhQ1LN9T(S}nCneQkhFRgwA_ z@GS@*K;6g0#1t0U+H?v+Kjyi*K)c#9wE^&JgahpW@XH^6{4q-zjdu8PXJ=<^8$utW zlWRCx!xwtp1E0dCA8o+f+dC5u_=Wvb z5c=1zU#}OPD_5>ax?wR-*KGrOBV|0ic=2K;-2!9@I@u??CQ>JejuC*%gBALHQPGd}A=>?ui4RPo6WP$;^#R5ZU7Z=?qb(IB6czoz`NWA695RBaPt41+ zq91Z3+Pesgeh*zjQA1JEkF`O0d(Mu2jFEzNTrnr7Q^<;%{37fBK)fLIXEh%$>;m~v z>;FIcHTqb6^{uPl(HADS&;D)ouS+}pxdnY;|4sB4gm#qC`=%ed8#-Zx)9IFc?b@}O z936O*iT~^C{{^969#`I8ilY9p9)mS0Iun&cXCoiia(j=p4anCwZ{F1E`s6f-dpRxH z-HY(J%AqLehdx9;?&p?f-EfeZ>10;zykAa(xR=wC-Mt9^F6c-52JX7_QCe}i2LklmcPp?d{NYYP*4!3gQ_^}0?-cf<6uVuJ;=0a)1R!ar zeP0yxL%#vp6?4FX*vG-Xj!xTsi*E~B@_N;!9sZo?r##d&H&x5yV*LkgGpqT(JZw?i z=ap`R&kFvH^n;eH${;H`vwHq-rC*dm%9|9Pl9bGG&90uaq8~ONu>F9;y)ICiA6)wv zIKF!Ff^VI)mea}O(iQ%^0`x1e{So#*y750``sq|S{*&VrPN%+0SNIDX{(qw%eMIUr z8U01quUmfE(N8D;NNXF=-Mnje`0!yKdnY>2^)LDi`VH=N{kfqZwYJ> zsdNt~{CI~j2rEDz{aE9~9Or#H-TqHs{owSK4yiwYX5r}T9Gp%7AeW|!yFd$C&nC)&BFH{Gk?^VSOy#DDlU`}6@;dEMWCPydo^2C=3diy{6yPO~7w*S8`dUf-a)31;B$>qYg z`@g2Y|HBV*?*F>^zi+>mr&If-uN~=iy8K+k5zlq~x-?P$du#rq8z#4Y^yR_?QK$5U zBc7Gh<>w-fc&_W$#qUF=Ul-S+@D~>SgJ#$l0JX~kpA+$p+qS$fNx19d0sn?)qTB?oCSKzxe9L^P;_vuzAcc$nnQMZrII> zJWw`ta=Ntl9D9Am^TN6!eXLU!1myUm4zV{1dlrBreZfZBn~vv4j~d!nKlan04zTY7>7n0>^BoGS4q#&n z`x>nK!Oj3SNc08ZY#sU~>>0AdA9P_o4SN~nb%66Z(6Sq&(qcc ztK`sCJdKwbx#0+9#f5zeO&?FZxQ>({S! zgXP&@Q2bE`*lQ#D0c?^%lN=BxI5=36#n5grk1MQwSOvu&cw#RlWEbEDx$DlIJ96}; zu^;lDX!kgi1F}J3Kw;ny83^{FS>ca9Bji4WfvtF9!TZ2pS5_$qEguU0=p(}Ag`N)q ze}T8SzEAwIM-+S==gPs}7Y=$ajNPLD>b4(&x4349ziya^7jQPf20Guc*tdW(dp8chNZKff|kE-dIj;zY2a_8syFEm3IDW|RDN#r3CV5-_5-;A$gntz17|+T zfyzP+hi51k%-{9N&v;*002@!(Il|5bc0UCHefSR^Jeb4Q4`WkdJLuh>KY5lb{NE(J z;n$9b@#x5hTz)U7S0Dc1dl-wvxKx-|oc$bfEJTa{LEk{06i;W)WjNr8c95E!!lQ3K zF!Fm5Mj!r=Ss=p~m4hDk>>p>f_{08FZUZIko9L^teC@Zta8H}j{O3+yeAN&? zKAr9tbW!o0Gd6PiBCOPmbju&}CFlx@(j~l#*W$lr!kSDrOu{}1ef;6Id)%k>WWL8| zD_38Nli$B_4QM=^CH(LA;%-_Ki;$CYVYz~2&y#2sNby4rx z+P0Kc`;jW-9sJ1o=j>J!_@Z93wa)*$#r#Ed9GABrv>DNsvTHx@0Cgz~;Q!mGrQGYY zF>g6v!WFiCsDr0>W2N?fZ0WvC_pl2VAa6h7S#GXqWBCQ(_V~sFu0DVBEq5<0O4_G_ zv|*DB|MQ1WGu_MceINMC^DpQ<@Td97DY{1G#ZjC*h0jacc?^3>#~kQC?>jC5*lEG_ zASdj!l$GB`g6j1{w$u8c?Xalq)NrD|L(h#lEzb2TY=`-}(3yz*a=Oa#yM6n%^t}q` zit){Y!gg2($m==00za%Pj2}NZC!y1&_u1}61kj6R>$`EUtd-m*+ zXocMa=8bv9ON57A1nLHOif36}k?*;4=k%5z${lMV=qHGeI>uU6LCO&8ywEqJ-{K5! z)C=?!`W(()L0ifSKj?C>hAheubIPq-w`$8UKkX2 z^$Q&h)`;;<98rc?KhAF%LVqC73zdep52p`MK3M0H$C2ZQGo!Koh<=MQM0-IQ!nO$X zBVJz05a%!F<-Ek);D>&Ia~Q!#g}o1WAkNLtOFM*}8@`c}7sxGsI3ox4R@f7YGK9V! z=S-phpbT^B%UHwk^YhEI?QCxFLs_A}!3GAp1P>1nsV`$p246xMf`37uBzN+9$GDAk zp}azF@WVQjeEnFIA_YV!-0>352F3a%TJD5cKFHPRy7jxl4`T%6O4zpLG~dJ+h`9jf1@8(! z@ZY$&I1av+(|jHCddQygHl>TFu3z3q^3(q0@$++^9X`70y$}4bPK>p@F34XA-k{_ z&R@t8ziS~^_#eLq^H;GiXkB=(v~DVJl;el*)nPuE9S_OtJ6~G&-Zt5vPi-)Q@1GyQ zLwBE(T=4V-88Zj(0qeI;73=<#uc(D z=D>yJo{-K3?QaU<*o{0*&r;|vn4^QoGS<-Xl!O8p4yu77Pm zC84B?pTM)QuA=`=symF&Xy(DOt_Qc+$y+)TCnER?$J*Y4&MJQRm)(38)%C6)H%aSD zz@fZc`SFzprMlifH-JB)^C1wOXy!rHK526V8DK%|iDKxkmo2z}%Dp^xV)3!(KcqJ2vR+#d?=K zf9M!d2AH?PE(>Lnmoh*+>~}nQ@}#sUTAxi9Yz2WM<`e*tKWui<{{Q;xF9~mifjpm= zGC;Y3F6gPUvd4lwA@=X;=8rfF7cP{(&5SY-x?!x_=B5mw@tc&DS2GCK;zhj!;{5?HA zIrtXl(r5?J$Ac%KFNt+1(WbD*1)U4}1ayF?@7zFk^h3uW)?h$0_9K9oq5jbqfEVVP zaL^}1XAB(B-g67t<&QGQK1>0k48Q~A>*wezSl2`w73*LkPEOanQ1y*{ zXcyoE_}-_WUC^nEgLs}>`XT!rJ9bR6&(BI0!#EGU6V{>S`OEKh@yKodBAz@gefJ`q zxaJflulb8~b9;U8_g#$+g68=806JCdtHl*S_^RPh-{61XC!(F_^@=pGzhQ3MsnQ%? zoFAMv4oc{`XHT2KYOTRqLg4`cp6~t#YA1CROptD@!?8Bk+y7@;0U*Wny zvUA53e(d?srN1C~BQDDNLHHf5gWWXpfs2ibraq7)UEv30(yRbDliaArci}P5hAmrO9QN@- zN01dDeUbyz%a$#Z9vv7UhRA!kF*&`neL@ebdy{{8pgIcSzU%wb`d0NyUrhyEYu z#9+;HIju3|L<3}h%*P;$WBpU^&`vNnk*5#Y5Z_&Zof77cm^)=f18_%~fM$IFSpnxG z$@K%i%CaL;hU3a%HwU zrmWJ(920=@L%W82hkge+7Pf@Y{|Nm;OOfd( zr}PmH`WBS4u)l#k3jLYf7E`3Bdo4)%n41EqT}w_kZTNFaA7zd9gSAD-(y)Po-VZj< z*gGqqSIE;xp1DaMa}(4r%0t)T{5EmMnn+LNA^bVv4}AdIChS0T9p=axd_`MEx@DD9 z`U0PvuGqhI_p(~M)*`}#SLpIL^e?nMtVia?!S>K(p*#IJn)=%xJE{y*`k3z6FNMcL)$`scP& z+_%dN$yNbtuu&Hy`LF$clG4VSCf2kC{&`7PgjExMfvOEW&}#!f=(kHM_wXa3v=20# zpWks>T2IYLKhOKZD4w)0jO70)I9jL6yiY7myU(o1*TW!(l_iI(ki+~;^vYq7S8o@R zJ5GEi3i1>B#acQ;C^t^#XqmV*BZ2l)wdgh&tPN(KZ3a96Ua!*~jrKo>{I zb#i^Fy!;SXo*rZ^oC^wlHs;BwZ^$v=QQ%id8*&`v0DYjF9>!gaxhO}}3*KXl2Tz5~ zGsa}hhqD6R^iamoWn#=jIpX|Y$b7<%8RtY~C8r^etkT0flppqQp#H(nfg8rx>>#`J zAU{D54_Q{M8w&j})t}yEvq}%PoRcR{mUJGFxuMg=S_*W38SOPwdLsR-(nEP+T!1Z= z++iFEcHa)=)(9g1Ss%c()aep8F+vsIHXh9&qej<#%fA+Jai#W07F!W)! z3CAeN3K&~+bn3f&)nGqK&vqr~0>5?cI$u6;zVuDClm17v>B-9?yL+5%fw67<$Y1%+ znVa~1(p3RZjB^;@s0@JLY2cVEN8=UgIHKZT#78B*N{piTQKV;*TpICFN~6%nF^pF* zYp^CK#x120d2|4I(_BhTa&NYd+Nqkt>bjGp=T>8%8hCMb4s&B&K8Ey&U#X$T$GR5e zE-_xnujqT|H|X22p@)O67V(KUsloRkv*Rl4o8|GrQ!!@*|AK>@jlPBWp!>*?Bhnaw zaS3CIJg!(r#P}fWyfJ?TuR?snLyf#aALdmUGvqknEJIx#2xM&VCJ`UHXYg!{&(QCK zmtm{{-$9?%1>N}AiwPc${*3u4^rqk~SUbczfG+5ZPq;|meaBoDJRNf%$Q=4WUwq^b zyus7K+fl|S6EWYAr=u@E_#nnXv?0v5a0L$Foxn{F`r;!DbOK06IJ7rBhkYTwqbC64 zJLaPFPO3lPiTZ?mqR$=PxStjd?~>-W`k29f&B>m>Ed*ca-IybH{C{vX07a_Rs8 literal 0 HcmV?d00001 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..a2bc289c0be3 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projekt testů xUnit", + "description": "Projekt obsahující testy xUnit.net, které je možné spustit na .NET ve Windows, Linuxu a macOS", + "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", + "postActions/openInEditor/description": "Otevře Tests.fs v editoru." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..3941f023ac01 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit-Testprojekt", + "description": "Ein Projekt, das xUnit.net-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", + "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", + "postActions/openInEditor/description": "Öffnet Tests.fs im Editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..8cf274358b74 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit Test Project", + "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", + "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", + "postActions/openInEditor/description": "Opens Tests.fs in the editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..e8b76235f5ee --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Proyecto de prueba de xUnit", + "description": "Proyecto que contiene xUnit.net pruebas que se pueden ejecutar en .NET en Windows, Linux y macOS", + "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", + "postActions/openInEditor/description": "Abrir Tests.fs en el editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..0507c79eb9ca --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projet de test xUnit", + "description": "Un projet qui contient des tests xUnit.net qui peuvent être exécutés sur .NET sous Windows, Linux et macOS.", + "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", + "postActions/openInEditor/description": "Ouvre Tests.fs dans l’éditeur" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..42d46af8631f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Progetto di test xUnit", + "description": "Progetto che contiene i test xUnit.net eseguibili in .NET in Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", + "postActions/openInEditor/description": "Apre Tests.fs nell'editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..f6ea166082e4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit テスト プロジェクト", + "description": "Windows、Linux、macOS 上の .NET で実行できる xUnit.net テストを含むプロジェクト", + "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", + "postActions/openInEditor/description": "エディターで Tests.fs を開きます" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..5502dfa0fa17 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 테스트 프로젝트", + "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 xUnit.net 테스트가 포함된 프로젝트입니다.", + "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", + "postActions/openInEditor/description": "편집기에서 Tests.fs 열기" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..13a871eeea4f --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit — projekt testowy", + "description": "Projekt zawierający testy xUnit.net, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", + "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", + "postActions/openInEditor/description": "Otwiera plik Tests.fs w edytorze" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..c58ebb507f80 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "Projeto de Teste xUnit", + "description": "Um projeto que contém testes xUnit.net que podem ser executados no .NET no Windows, Linux e macOS", + "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", + "postActions/openInEditor/description": "Abre o Tests.fs no editor" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..4d8eae9097b9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,13 @@ +{ + "author": "Майкрософт", + "name": "Тестовый проект xUnit", + "description": "Проект, содержащий тесты xUnit.net, которые могут работать на .NET в Windows, Linux и macOS.", + "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", + "postActions/openInEditor/description": "Открывает Tests.fs в редакторе" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..1184dac519e4 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit Test Projesi", + "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen xUnit.net testlerini içeren bir proje", + "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", + "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", + "postActions/openInEditor/description": "Tests.fs'yi düzenleyicide açar" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..41d865c026e9 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 测试项目", + "description": "一个包含 xUnit.net 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", + "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", + "postActions/openInEditor/description": "在编辑器中打开 Tests.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..754828f138bd --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,13 @@ +{ + "author": "Microsoft", + "name": "xUnit 測試專案", + "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 xUnit.net 測試的專案", + "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", + "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", + "postActions/openInEditor/description": "在編輯器中開啟 Tests.fs" +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json new file mode 100644 index 000000000000..a0207bf7fa86 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json @@ -0,0 +1,85 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Test", "xUnit"], + "name": "xUnit Test Project", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", + "groupIdentity": "Microsoft.Test.xUnit", + "precedence": "11000", + "identity": "Microsoft.Test.xUnit.FSharp.9.0", + "shortName": "xunit", + "tags": { + "language": "F#", + "type": "project" + }, + "sourceName": "Company.TestProject1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "net9.0", + "description": "Target net9.0" + } + ], + "replaces": "net9.0", + "defaultValue": "net9.0" + }, + "EnablePack": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + }, + "HostIdentifier": { + "type": "bind", + "binding": "host:HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.TestProject1.fsproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Tests.fs" + } + ], + "defaultName": "TestProject1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [{ "text": "Run 'dotnet restore'" }], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "id": "restoreNugetPackages", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Tests.fs in the editor", + "manualInstructions": [], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "id": "openInEditor", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj new file mode 100644 index 000000000000..e79a1fa36206 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj @@ -0,0 +1,24 @@ + + + + net9.0 + TargetFrameworkOverride + Company.TestProject1 + true + false + false + + + + + + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs new file mode 100644 index 000000000000..31dc4f7357bb --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs @@ -0,0 +1,4 @@ +module Program + +[] +let main _ = 0 diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs new file mode 100644 index 000000000000..7f70fae192b2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs @@ -0,0 +1,8 @@ +module Tests + +open System +open Xunit + +[] +let ``My test`` () = + Assert.True(true) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..6f20dff748c1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,25 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "EnablePack": { + "shortName": "p", + "longName": "enable-pack" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json new file mode 100644 index 000000000000..ef689320bee2 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json.schemastore.org/ide.host", + "icon": "ide/icon.ico", + "tags": [ + { + "type": "platform", + "add": [ "Linux", "macOS", "Windows" ] + } + ] +} diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..14998ba8c0230ce9432f58149ae3874979717331 GIT binary patch literal 48778 zcmeHQ3tWuZ`#oTKU*UxG#f6I!H%Ua};JIyRsYel(c*;QFq z3a#5(q1v_Xm#|_LYFBQFR7yq7|9NKSOlMv*-Ag{7-jCxsm*+gs_j%59&b;sG%sYf| z#FXI05fO2!OUNe3J3Fh(p%#Sv1$7dMrYs_4sy!iAR_gL(At5#&U~eo-RQ(sXB}67u zms`3J64r~#laSEngj`!ja=C}+~l+k(Ft+?o|zuLZ;a2;1#_YX`b6Gr{H?t_ z;&p09Y=YPCQaS@~E&ntKtGWLsL+XOCWXlK6`Uh!Wa$v<`cK^9}2K_m%&G36n0wZ;ZRVsKur5Q!ew!z@ze$N5cC(JH9XS#ky4& zqi43aOYtV6KaXsQN{>nyu-JRw_mLToN4hMUnf2z%zEO9Rd$w4ye52Q*JGD%^m~wkhfY&@cjc4@O zJu2*ItYF5|!->xQ($^+tNnGekgo<*w$$TYsK-cX66u*8{ehucdx%K3?K; zw-KiZUi@jBgg(Jf1a1vBWwhvcEV289HMc?6`APdHw*UK88{#@lIe4yD)7*YevkN9( zSUo#h{POC(L1!-flrJL2&AXACosSM8IUkbf32WjVUUoTqIDdH4(Nb|Or(<j$qU*zrn-Kkkm$L!nOzn{mG z+bzaycIcMXVF>-x_&ZmVQUykxR zGSOHTKFaIRS9Qt0*}ulF{-oXW+&w}EGP3!`8*~2du`lu%^bao(`@9%4`})O8H*?b3 zipZhUbN=l#-TF}^d6B!vMf97cTW;>&o0}cxb+?SUdj0x_t{+@j)1+J2xpP;8ei(D! z+-qCdvpK)}y7x3uo^5jThvBQvEo(n@9yze#(2|sZr30p zZ<86hDfFnF8NK}Gy|&p+m2n;Z^7KEDX4`quhizX4nf)b73cYSE>z@DO@3`|DTVHD3 zEn`LCq`SBBUW$FXzZeveAAMwlli2kA|Wd|SXDrRjTDFPoq0O=_bpHUn|8g~ zl?mLVg?+XU%vkXKNq>KzaWg;9ZxJma9#50Lz7#lY*{FyU{*ew>?pwrcXj))Detnx) z$*!*Z=6#<1Ug}~~@5Mo7U z%*y%omBa2sf|v>LweR6zjHLNr0S!m-GL~+pRC2=y3`6oK( zUFYW}C@V;lr#6>$p27VNKtoy%@^6m%z;Lxpm-95tQ-Fr?w71ug! z(zYe1j~{rL;hFe;a_isSqh@<;4j3$Kkdf&%|G$90-PimkAHJGQ{$?UcRc5Yw(9&sM z!J{=(5~G&H9hfk^bHZ8QFOv)APRo$h+54WtMcUwX;G(;8KF*!sJ1b{@!o}9z{D|A% z*}lt8&&)mE>&qSS7Y4L7AGF|uUl(7zc|X~3i-(-oS*k%=^I|1tcuq zr~lcOU1OCW-A%ncMVYGbS=`Ne=~u7p?U(KN`1Hcu*ud9Q)1+Ch5vRsT1tbNzgBvHv zO*`cNA~~A;@YSow{fNvx0b+5(`IFL3%~~8E)nMcL(M@gNpVuL8>g!kOSxK{hx9%T! zTXfy)%$g=~$vc$m%p!BfG~)&^2~Q+SreY@$Bb^mpu^eZ$_;AZr5)qwsPsb#rs!SEHiRvSl#Z}#NCt_ z&q+S}+3e-N{gb*E*69100apKfbuGgZdTdA~zc;qqbYbNf2V!+Q#MSqr^`WENa=-z9 zddYv&a(<}Ac?lWigG9fm8gqZaueper?UlzPdnReQNY>IhLbQF|+ z7$lTzu_uCiA$HRbHEq?`_DBbThwV z#*hCt`~0-xlt@8bhACS|ym)o(VnC-mhtD;BJl@vIf(vfrnPs_PUGBOWBab|5kok%D zn8H~^9I|goUzq;#jgzE@amn*UMX>=^0cN6bPCR?X}q zsbj2Y5vH8s&3)Cf6WN@9(mXdY;+Am3p0mUw+w07VI*FFq_Vyw5qni73exzw=!NB!F zJN`_j(BlZ_>Ti=v_0?1<}F)3>Noa^@Sk%%0rkCR((u<8LnedHvmax5 z!+EFRuVe+m}Y9cO!`G3Q(>ZcLEzn6s9qrgOPVp6`*11?ge1MA=?B z(Z&dL`h-Xw9Ulo!k2n585GUQUTfF>)W9Thma>~+(2b=Fro$O6APA_;A;(M{RyX9@A ztTi_yBY9=Y)iKg3qc;wiF7?Sc*WyxZX}x;&9<&tSngi0!v-4*Lb^XBhm}2LI`dHqP z=bP7X$Vn%U4s(fXvRnSVr|}ck$ZVY(an2Io6lLBMdHARD8S%%L2AkVCZG}-76O$Uf zd7^E=`ZnMc`8PwA?I&H{Jp9qF`p>$qhA~+ZTCiZe?XPy6hg<%I7^kGg=V0KK0vH!> z?%_c6hOJxv)}PJ4h!Hvari^KD$w@Njl!+`QPPu(m+Z}n`u9)RtKcnyjh1x;QMl z$6T(*fLbsX{zH|I9}nMMu;w43O-}(JwQM~9-0`I!Mk zu&c*Vd6O;fvhUZKk%`KtVbM-|#|8Xn=awvzW%Y|*H;;qJh!daO5NY23eSowmv|#Lp zc%h>;^gMCCZD_&28$e4(!H!Y+_Y=H(_MEpVMH~P&e?Lwj$+|Tr^=>|lhV$NLYtP$R zErCFOc{a7JIIq_iJD&=+TYy60;-pg*moX zeE?|N;Jh=f&$!F}&jA$J-~UJGS&s~rAF@B<6r8CBwyPHa>$OV_EXZQ-xOyk;0#2dZ zw!%c&=PJo1!FfNMA59f}Y>uuyni!N4v~5(R;!_L7y+)tejOPr443=Ux|I+i^?i z-TW4Gai}%2PiT0%;4HP8hxS?SvT%(S{|)oF0c!xrUyk>kBuA0E@9w$WUYxC#anivs zkXuKZqF;w97k^cMSEnDN9=LM9`FB%{!4;FXxGOeI768(^lk0cgyDy;|85fj)Dr{KzrO&zym3OdC zaEfV7Is{tp8XVNAU*5L-{Pqu8)((?SJ^QM8gR6cd;kRk+`{g;#8RK(5;=#tKhuab- ztWoUTJNiWA$Y`Gv3*vf25O`j7?pN@Bix%M>zrL|~cwY9iJMTFz7`(0fXO}Ks+&nyH z@`X(whX3Z3IDPaf`z;o-vu*qN46r}DB-g$#H&Nc<@Pf<-xvhtc>|plmJOa*~m9eXX zS^q4{Irjw%*4~icJH7hBu>HLB}j|c8Lu{;L0zK6f9fn zO}hFEhRXfwZO^j&EdLZdiMKlw))~E%SUyccYa2mZ~XIy-0k{suGY85KOi}ujD;2m8M9#H-Ba^T4qxM(%_NgrP0KfF z-cfMfPH45>=1b+sueq3(ipD#C%MxFoVglJ8mru@5*pw`C8*d{E95Oxs>%AuAXEG}w z1w^-K0@)!Awr8bn&s(*lpQ6#vBz}YIlQB=)5IbSO_UmB5$4@c4&T6mx<^elyil0E# zYS)eE8w&u2M0gZn^tp;KCfbiw+J!}*onjo?&P?|Cn!WN5w-65-ncu90Jj?IHj3E0z zmqP{n&&@Ipy|spY_Jrk$-CwSW9Z_fbVA$g!1Nwa0d!LKP(w2~i4J+aS z33stnmwHo6omX!jsq!u^E@aT4LF9`sz962So@Dy;>15%;h2+Q23EA#$Np?*VlfAQ? z$ic-u$?q!$k*I)CBoX@}$iagLNmNu6iH-Q4TtB*n z#Gl+vk}e%3r~W!c&Ye3)u3x`S5^lwl`!~;$C;#0f50dYbCr_S`=cx}#dfIc6ot;f` za&pudYyPkCK#d0~%>zoMlFD{0`l4)Pw`t8p#bq~N1y}>81aM@uRupU!Eh+r0v++iE8vMQRsm0Z zaSGlLUyOn`#22kVkN6@L=n-F(0=?pkP@q>lPXR^}To`-?#PbxW*qdO~8W68ffn`zR z-&9bv_%{_4Bfe093cN#c;?)Y!L^Xe-qS51QgL$CKFD#t3+S$ltc>Il_taCA}sw^}z z@&!7)s)Ek4uBu`9E#Ktluev(&Z5$oVO-w}C3n*OXVrEfMS*ycu@7N5v8fy7X%ygD@ zs7EyPGIn&dLw*Z2f5T>=q$vxC$8YWESO@t*DB@}8Xo3GR7W4Sub96KX%qAv)8vd^X z?4o9d`N5k_fgQMPsl8@R-?SH$Xs-qU-qysVwu-;Dsfnl4idADjg}b@6LO zV+Ot1)Diw`sNx4_nd|WDMu*y)D$y3mk5?TX{Cs}!CI|$B&D8v+7R?OvPI|?i{e9S0%iE8rIuJ$5JIUK%P{~;L#0TQ0EULjk%D4MiKV(sjMV+` zKmqpGQpl>xhGGOFS_&4Z%0N+{5-8}$=Tr$K86@p(Xr5E++Zed&t1U3l3e~Fi z`ZnhD-awa{+o%NC*cf<*6sQCk?9Op20jln1)_9l5zf=M=?bfFJR=6id1uFRhYkdOL z01XOI<1;KkV;?afK-1kI0@@u;wV{X1taVM$b~hlPu)AIXOn1Ek*zS4+=yca3K(~9L z0Bg9+G@fVUpN;~ygR%VXtN?x83lUgbv*F07u(5#v0O@SACPGzQh3ytbMiw?UMsQg% z42A6?BO?*E+ZY>Z+fk}YK2V{Nkx2)fV%=V(fTCd z!34KCmYCqaN{k8ar=*zRu0xIqZ-pQk!Tl45_fVLiUSHy%-U#ngtRP7sY41}s_a#uJ zzDLoN@%|)4vu}=j=0}zfRPC9c+qsBb4EI&-i{qX+?tiD=|5s=4J2y91C9dYb8V}TX z;N9|o>ORF%=OR`*pZBI#mO4AIMwa|Cfsd8K3l4i*GF#QP;DL$M(cY#A>Y#rLHJIW8 z1wD*K7I2A-ksB{_L2V0*+5&TR33`|aEi8m4YHqBwN5vvm|Bds~*UUSO5=9GKQDfh88r`&5!x!0U>uQ}yj zbIQHulzYu7_nK4gHK*KbPPx~da<4h%UUSO5=9Ih6DR&v}GC{(3EvPPdzd~6rIDKvf zDG`#gnx`3MwXvvvV6%TUx0{Yj8sL-^WlL$>K%VR!v7P!Ly0kVL;s?9mmAI$2Q(7VO z0PKGw?%^9SN;q*;Z4!J#N12qAMD3=u-19(R+`~6`s*T<37sr_?b^lKPV;4&2k%1M^L<}Y^Wa^Id%h3KI}b_|_vml<_MSFXm$^}%c~F|T zk31Twgp;G%wB?5%s>Rw+)_G8xxL+`TzSeH)1Ng>fwOJp_G7rH18Ib6@siG){KgY0) zwoXVYUtMCr!1#LnE)YvojzcVpV z(PPi};GKwpiXMB${%Risl{NN^52|$xRMyxt_E*~&sO+(4d{8Z8pt8rFvA^2IKvj)B z>2wjJqD`l*fTz;)EIy_R_I+L-uBot_E%aAz*{-=+WxlZ zJ++-u*ek7+7^v=J&)8q#G4QU8J>!E4je#9M@6a3j)n(pOyD2Tr-wW8!HbZ%Re>mgRzqBFY~#c%J4;v{S`a@@YZOZ zSmMW48Ow>#F9?#PqGF&Z9Oa3BJY!ds>+sf^OqOg?J{%cpS zR`%Fa`4w?Kl*)R8meu|jnJ;u?!Q1&UwAk5sfO*zN%p0;Few9MoR-Ns~Gn=eU@CGm~ZnTXZM=Zmy zWa#j-_M@Gc*x1K*J@Y25BynzthsBF|HkQkhXXU}Kgy`6hYaVMO`h(?X+xU6(gMsxw z$dGL%sb}?9be@e{#EwL!ZlpBU`E!DeX_lYG!`9>HA=?J|YH2@z zoGEVp{Q!*%w25yg^0IRX+o>GJ2j#NABr#GF9>5dJV0vTSX7Be{JK4`cwq9Qzd09Cc zeQ(`()CPS-VkHq$y>5BZ;$8hOqo8K27J0UR@^ZBhp7%#1U zU0i@qfz1r=7%WqJfF@ztvXH6(h?V$j5BPf!N)-TUAyom8E7gVqRRK^IQUm~MRgO_n zg-X2&2*A*x2t;jwk%n?wL->YOR9TIHAQH4tLv;{CH6lfgmiYE&XGk89=zAg*27g=x zn0Ob&6n=hTeDUwCs-j%(bqsLhdQcTu4e5yBxwOPZ!2Py9JNdS_l^C>!5wPpTO;vxd zp7%F~QpXV+H*e#6@wi`tdYRZQaUAjE=54*t0rfKYF<)#P0nb~F8~(mdY2yg+M^l^i z#SMO6h<>-WD!w~Ynm7X7I_r(TxWRL4?BDaN;`>h}jU&LXpuR_nwzK1jf16;jW4@}! zfW-xQ4}I$?)LTK)e%9i-2o^u)@%#|qhRPlT-ua9~eb{Lo;Mb0UzWB$pUwr(PIR<*- zU$5^O{MBjY*hQ6J#B0eXgj zJ!_$_o$?{Ye!R0r#qR4;8>wuTmd5{dPn>^V4sr3%zp(bP_%Y8rUsjsEb*=ySxQi>Z z=YRQUpb!(Dhh_c3;z!%iX10zw^HJg$V&xZym*38w-{qfS(&JMdtaNPHGrzPBFjWbD z_B)2`*-_S~Y+SSTXfKPMciyPd@w4kDdxi)xvbfkYb1Z%~{xSBM*uj{aLFZ?2l#QRV z=Gk+8h#fIgeC(Mw7C+Y0F+<<;@XLzBP20D*Qjn#_C<9Nzg-FPgDQxZa{>ev*NpCgmJkS1YS3cqNKR9r|EShiIE z9*veV?J?L6{gPNJFO;j&ql8~Y#&!*5@gOcEsK-N1l$t;p{=p$EHMK;lz|&xADn=TE zr@+)yiZlseXs8@1Du!QXR-KQ7Uu)K((4;;$R{>OWFidqU3-w?beid4Y2hl)3p3{;* zl0nj*)3Sm>5f_YMP$k3$KfZ$WK>)pyD$q@_Ncb42?S|gp&A)doOPP6A((wUnyS{g4 zmqnMpJ}8^h**v7NzCqz|ZGO4+~RmdAERe~Eoyz;=92l2CbNp~ZbJP}_k|S&9@3yly4I z1AJN^&@~w;)r&MEJ)<BRjQ1vmS|3zk|s-4}-z&!N_f3Je>(Lj4*34Ktc{;aGl zRXe*E!S07p{fGzmv#?CD6{Vl@P^!=VjOXcES#&=S@P^AAUM%HeAo}MSCd!RV(G!C#1Wl+8RJd~qLVn1IeTc#N4-V)kI zeL?r5szN`jgKsBoqm=P~k$s z1Prn48eLp}%^Ds{hXVRL<32H6!;9*VJeoaaXWCzb!M`Nqpz-?~d%1uC$1)MumW$!O zI-kS%S&Vg>bte&dS=}@b^=|lgxe&mZdjDUo49sJl=5KaxlwThO84>uNi6hGgYWrhe z^X`cv*A + + + Company.TestProject1 + net9.0 + TargetFrameworkOverride + true + false + + + + + + + + + + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb new file mode 100644 index 000000000000..dc21f884811d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb @@ -0,0 +1,12 @@ +Imports System +Imports Xunit + +Namespace Company.TestProject1 + Public Class UnitTest1 + + Sub TestSub() + + End Sub + End Class +End Namespace + diff --git a/template_feed/README.md b/template_feed/README.md index bf98de54b1f9..9b29cf870b92 100644 --- a/template_feed/README.md +++ b/template_feed/README.md @@ -7,6 +7,7 @@ This folder contains common project and item templates: - Class Library (`classlib`) - .NET `gitignore` (`gitignore`) - Editor config (`editorconfig`) +- Test templates (`mstest`, `nunit`, `xunit`) and some others The issues for the content of these templates should be opened in dotnet/sdk repo with label [`Area-Templates`](https://github.com/dotnet/sdk/issues?q=is%3Aopen+is%3Aissue+label%3AArea-Templates). @@ -18,7 +19,6 @@ The other templates are located in the following repositories: |ASP.NET Single Page Application templates| [dotnet/spa-templates](https://github.com/dotnet/spa-templates)| |WPF templates|[dotnet/wpf](https://github.com/dotnet/wpf)| |Windows Forms templates|[dotnet/winforms](https://github.com/dotnet/winforms)| -|Test templates|[dotnet/test-templates](https://github.com/dotnet/test-templates)| |MAUI templates|[dotnet/maui](https://github.com/dotnet/maui)| -Issues for the template content should be opened in the corresponding repository. \ No newline at end of file +Issues for the template content should be opened in the corresponding repository. From 9fd57cb745fd45a52c89323e41a65e7eaf9d9f57 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 19:20:34 +0000 Subject: [PATCH 146/702] Merged PR 44224: [internal/release/9.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 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241023.5 - **Date Produced**: October 23, 2024 5:38:46 PM UTC - **Commit**: 2e5178f9d725c4becd3f04f9627f9e45d7469f03 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24523.1 to 9.0.0-rtm.24523.5][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24523.1 to 9.0.0-rtm.24523.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc328fcebfb70f2c9e429d51a4fc5b620003720eb&targetVersion=GC2e5178f9d725c4becd3f04f9627f9e45d7469f03&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC42170a8179ee2744f25e203ab235144125ddc361&targetVersion=GCc23c8e8b764b527c6bf96b8f38379faae3c4dc1d&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCf1cbb10e281b9545b9980a148caae895de895f67&targetVersion=GCbcf70f48f3ad07c7747c64601348e1df81f1f19e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3d2dafc10e7..fb03b1f107e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -32,7 +32,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c865fe4070e7..608bcaa85962 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c328fcebfb70f2c9e429d51a4fc5b620003720eb + 2e5178f9d725c4becd3f04f9627f9e45d7469f03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c328fcebfb70f2c9e429d51a4fc5b620003720eb + 2e5178f9d725c4becd3f04f9627f9e45d7469f03 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c328fcebfb70f2c9e429d51a4fc5b620003720eb + 2e5178f9d725c4becd3f04f9627f9e45d7469f03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c328fcebfb70f2c9e429d51a4fc5b620003720eb + 2e5178f9d725c4becd3f04f9627f9e45d7469f03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42170a8179ee2744f25e203ab235144125ddc361 + c23c8e8b764b527c6bf96b8f38379faae3c4dc1d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1cbb10e281b9545b9980a148caae895de895f67 + bcf70f48f3ad07c7747c64601348e1df81f1f19e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42170a8179ee2744f25e203ab235144125ddc361 + c23c8e8b764b527c6bf96b8f38379faae3c4dc1d https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0134646448a5..3bc6738bb745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24522.3 + 9.0.0-rtm.24523.2 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24523.1 - 9.0.0-rtm.24523.1 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 9.0.0 9.0.0 @@ -253,8 +253,8 @@ - 9.0.0-rtm.24522.3 - 9.0.0-rtm.24522.3 + 9.0.0-rtm.24523.2 + 9.0.0-rtm.24523.2 From aa2f71f0178b0e3e7b2c3dc558059a3ce45bd96a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Oct 2024 21:08:41 +0000 Subject: [PATCH 147/702] Update dependencies from https://github.com/dotnet/razor build 20241023.8 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.24523.1 -> To Version 9.0.0-preview.24523.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7bffde9b113..199f6c0604bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/razor - ad2bd3e7a405afd7787cf0c045897e90270013a3 + d259d206ccf132b58a3e4e2f57bce968511ae369 - + https://github.com/dotnet/razor - ad2bd3e7a405afd7787cf0c045897e90270013a3 + d259d206ccf132b58a3e4e2f57bce968511ae369 - + https://github.com/dotnet/razor - ad2bd3e7a405afd7787cf0c045897e90270013a3 + d259d206ccf132b58a3e4e2f57bce968511ae369 - + https://github.com/dotnet/razor - ad2bd3e7a405afd7787cf0c045897e90270013a3 + d259d206ccf132b58a3e4e2f57bce968511ae369 diff --git a/eng/Versions.props b/eng/Versions.props index 4252d283427a..0a4f401bb51a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -247,9 +247,9 @@ - 9.0.0-preview.24523.1 - 9.0.0-preview.24523.1 - 9.0.0-preview.24523.1 + 9.0.0-preview.24523.8 + 9.0.0-preview.24523.8 + 9.0.0-preview.24523.8 From ce0288dec5cf9e6eab38a1ec396a7111e4433b18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 00:21:37 +0000 Subject: [PATCH 148/702] Update dependencies from https://github.com/dotnet/razor build 20241023.9 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.24523.8 -> To Version 9.0.0-preview.24523.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 199f6c0604bc..12bcd77e7e30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/razor - d259d206ccf132b58a3e4e2f57bce968511ae369 + 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 - + https://github.com/dotnet/razor - d259d206ccf132b58a3e4e2f57bce968511ae369 + 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 - + https://github.com/dotnet/razor - d259d206ccf132b58a3e4e2f57bce968511ae369 + 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 - + https://github.com/dotnet/razor - d259d206ccf132b58a3e4e2f57bce968511ae369 + 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 diff --git a/eng/Versions.props b/eng/Versions.props index 0a4f401bb51a..25b1b0e679ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -247,9 +247,9 @@ - 9.0.0-preview.24523.8 - 9.0.0-preview.24523.8 - 9.0.0-preview.24523.8 + 9.0.0-preview.24523.9 + 9.0.0-preview.24523.9 + 9.0.0-preview.24523.9 From e72a65706c4f4c571d07fa5783754d00182ca7e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:15:41 -0700 Subject: [PATCH 149/702] [release/9.0.1xx] Update dependencies from dotnet/roslyn (#44424) Co-authored-by: dotnet-maestro[bot] --- 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 199f6c0604bc..2ca959d18d8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://github.com/dotnet/roslyn - 1d59d9f40a804971aa2a4ddee7097dd668d48902 + f3348c2a2be16ec6525cb3df7be12952c3e2de9d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0a4f401bb51a..7085c2fea51b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 - 4.12.0-3.24522.8 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 + 4.12.0-3.24523.4 From 625837c0f0a57aef44e2fddc7d0dba0158029c76 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 24 Oct 2024 02:50:49 +0000 Subject: [PATCH 150/702] Merged PR 44233: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 7c429c14-b12b-40f6-ae9e-395f98f369df - **Build**: 20241023.5 - **Date Produced**: October 23, 2024 11:06:38 PM UTC - **Commit**: 592ca7fd80495bc6625c8b9d309355b6a8609861 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **dotnet-user-jwts**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **dotnet-user-secrets**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.Analyzers**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Authorization**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.Components.Web**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.AspNetCore.TestHost**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.ObjectPool**: [from 9.0.0 to 9.0.0][1] - **Microsoft.JSInterop**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.0-rtm.24522.6 to 9.0.0-rtm.24523.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC282167d92299fc4dc1972edfc69193397a4114ad&targetVersion=GC592ca7fd80495bc6625c8b9d309355b6a8609861&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df) --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 109cf4c83ea6..c7197630b8e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e01e0b015a9b..eb15c2357a83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 282167d92299fc4dc1972edfc69193397a4114ad + 592ca7fd80495bc6625c8b9d309355b6a8609861 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6bed5f012765..f76c6a0beba6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -232,18 +232,18 @@ 9.0.0 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 9.0.0 9.0.0 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 - 9.0.0-rtm.24522.6 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 + 9.0.0-rtm.24523.5 From d15344bce3f6e70b7252586456b4cc55860fc40f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 11:22:24 +0000 Subject: [PATCH 151/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.40 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.39 -> To Version 6.13.0-preview.1.40 --- NuGet.config | 10 ------ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 46 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index b20333c22218..20236599c646 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,6 @@ - - - - - @@ -51,11 +46,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20e88b1ea9bf..cb1358dfd1e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 - + https://github.com/nuget/nuget.client - bac310ea23370cbbd38cc1e99a6ce1c3b0242d97 + fac35579c8c3c92799361e5695e9f7539b4fd5a2 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 974c93333853..63ccdd08aa4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 - 6.13.0-preview.1.39 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 + 6.13.0-preview.1.40 From 2b13a3a353d2d53b56bf04e6c62a2a7ffd670911 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 12:49:12 +0000 Subject: [PATCH 152/702] Update dependencies from https://github.com/dotnet/roslyn build 20241023.10 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.24523.4 -> To Version 4.12.0-3.24523.10 --- NuGet.config | 10 ---------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb210a88bcd1..c6b58883dceb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,11 +20,6 @@ - - - - - @@ -61,11 +56,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b249fb9356c4..49f0a80079dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn - f3348c2a2be16ec6525cb3df7be12952c3e2de9d + 16f58fa314e7deff4b3df36c862f157609ace2b4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 70002949bb7e..8e6bc8123920 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 - 4.12.0-3.24523.4 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 + 4.12.0-3.24523.10 From fe14a0eceb4d377fe725353d2c8b8825de93df58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 12:49:56 +0000 Subject: [PATCH 153/702] Update dependencies from https://github.com/dotnet/msbuild build 20241024.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.7-preview-24522-03 -> To Version 17.12.9-preview-24524-01 --- NuGet.config | 12 +----------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb210a88bcd1..007703032e6d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,17 +14,12 @@ - + - - - - - @@ -61,11 +56,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b249fb9356c4..df474cff9e00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ 8be5676af1ccf568b258133788a24aedd1a80994 - + https://github.com/dotnet/msbuild - 5b866566089bfdd756730948f6418e2759b8850f + 43a24969a23bd2dd76cd26be26210e2afcd0595e - + https://github.com/dotnet/msbuild - 5b866566089bfdd756730948f6418e2759b8850f + 43a24969a23bd2dd76cd26be26210e2afcd0595e - + https://github.com/dotnet/msbuild - 5b866566089bfdd756730948f6418e2759b8850f + 43a24969a23bd2dd76cd26be26210e2afcd0595e diff --git a/eng/Versions.props b/eng/Versions.props index 70002949bb7e..398798754888 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.7 - 17.12.7-preview-24522-03 + 17.12.9 + 17.12.9-preview-24524-01 17.11.4 17.12 From 024a33e02a1fd6729ea489e67daf49bbf9b52f90 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 24 Oct 2024 16:09:29 -0700 Subject: [PATCH 154/702] Remove net2.1 targets for test that's failing sometimes --- .../GivenThatWeWantToControlGeneratedAssemblyInfo.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index 98ebc8121ae7..b92ef6480c54 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -812,8 +812,6 @@ public void It_does_not_write_to_undefined_assembly_metadata_attribute(string ta [Theory] [InlineData("netcoreapp3.1", ".NET Core 3.1")] - [InlineData("netcoreapp2.1", ".NET Core 2.1")] - [InlineData("netstandard2.1", ".NET Standard 2.1")] [InlineData(ToolsetInfo.CurrentTargetFramework, $".NET {ToolsetInfo.CurrentTargetFrameworkVersion}")] public void CheckTargetFrameworkDisplayName(string targetFrameworkVersion, string expectedFrameworkDisplayName) { From 1e00891c8cdc05f3b7a66e078cf3fc67cddeadb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Oct 2024 09:11:40 +0000 Subject: [PATCH 155/702] Update dependencies from https://github.com/dotnet/test-templates build 20241025.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24525.1 --- NuGet.config | 3 +-- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 007703032e6d..4eb33ad6c718 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -23,6 +21,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a6654c04091..b8366caaf4d2 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 - 6be1945e663153cd1db4ccd31f6ca38e7f35330d + 66b263ffecee032b2d5071076b42b9614fcf7013 - + https://github.com/dotnet/test-templates - 6be1945e663153cd1db4ccd31f6ca38e7f35330d + 66b263ffecee032b2d5071076b42b9614fcf7013 diff --git a/eng/Versions.props b/eng/Versions.props index 6ce0bb911f43..cc43cf63427c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24523.2 + 1.1.0-rtm.24525.1 From 987bb590be7e03ba6cb968d42ed52a6282aa9d7a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 25 Oct 2024 11:56:05 -0700 Subject: [PATCH 156/702] Gather test diag logging to track down nuget issue We're seeing NU3003 for packages that when downloaded manually, don't show an issue. Per NuGet team, this means an exception is thrown and collecting verbosity information should help. I believe I've mostly seen this on windows so let's enable for windows and just keep rerunning until we hit it. --- build/RunTestsOnHelix.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index f55fcf1ead42..11f87e1114b4 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -23,6 +23,7 @@ mkdir %TestExecutionDirectory% REM https://stackoverflow.com/a/7487697/294804 robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory% /s /nfl /ndl /njh /njs /np +set Verbosity=diagnostic set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory% set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets From 6ecb683fde39b96859ac67096ac3ca4669b017d2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 25 Oct 2024 15:47:34 -0700 Subject: [PATCH 157/702] Add diagnostic verbosity to all msbuild commands. Test output is going to be long. --- build/RunTestsOnHelix.cmd | 1 - test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index 11f87e1114b4..f55fcf1ead42 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -23,7 +23,6 @@ mkdir %TestExecutionDirectory% REM https://stackoverflow.com/a/7487697/294804 robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory% /s /nfl /ndl /njh /njs /np -set Verbosity=diagnostic set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory% set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets diff --git a/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs b/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs index 73f3416ea8f8..178966a6888f 100644 --- a/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs +++ b/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs @@ -133,6 +133,8 @@ public override CommandResult Execute(IEnumerable args) args = new[] { "/restore" }.Concat(args); } + args = args.Concat(new[] { "-v:diag" }); + return base.Execute(args); } From fc71602bc87189dad49f25aef9c13a6e9ab8e22d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 25 Oct 2024 16:54:00 -0700 Subject: [PATCH 158/702] Let's try removing the additional TL characters instead. --- .../GivenThatWeWantToControlGeneratedAssemblyInfo.cs | 2 ++ .../Utilities/TerminalLoggerStringExtensions.cs | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index b92ef6480c54..98ebc8121ae7 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -812,6 +812,8 @@ public void It_does_not_write_to_undefined_assembly_metadata_attribute(string ta [Theory] [InlineData("netcoreapp3.1", ".NET Core 3.1")] + [InlineData("netcoreapp2.1", ".NET Core 2.1")] + [InlineData("netstandard2.1", ".NET Standard 2.1")] [InlineData(ToolsetInfo.CurrentTargetFramework, $".NET {ToolsetInfo.CurrentTargetFrameworkVersion}")] public void CheckTargetFrameworkDisplayName(string targetFrameworkVersion, string expectedFrameworkDisplayName) { diff --git a/test/Microsoft.NET.TestFramework/Utilities/TerminalLoggerStringExtensions.cs b/test/Microsoft.NET.TestFramework/Utilities/TerminalLoggerStringExtensions.cs index f14b109155f9..2c28bde412ce 100644 --- a/test/Microsoft.NET.TestFramework/Utilities/TerminalLoggerStringExtensions.cs +++ b/test/Microsoft.NET.TestFramework/Utilities/TerminalLoggerStringExtensions.cs @@ -12,6 +12,8 @@ public static string StripTerminalLoggerProgressIndicators(this string stdout) { return stdout .Replace("\x1b]9;4;3;\x1b\\", "") // indeterminate progress start - .Replace("\x1b]9;4;0;\x1b\\", ""); // indeterminate progress end + .Replace("\x1b]9;4;0;\x1b\\", "") // indeterminate progress end + .Replace("\x1b[?25l", "") // make cursor invisble + .Replace("\x1b[?25h", ""); // make cursor visible } -} \ No newline at end of file +} From 20fd99a9b902c52e76931d152cf5e23c096ebcf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Oct 2024 12:41:57 +0000 Subject: [PATCH 159/702] 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 e9a4ad0379ec951d1de1016deadb59d5f74cbb49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Oct 2024 08:57:54 +0000 Subject: [PATCH 160/702] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241027.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.24508.2 -> To Version 3.11.0-beta1.24527.2 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 007703032e6d..271f01d9bbb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -23,6 +21,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a6654c04091..d53bbdda8061 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 6ce0bb911f43..1c2b6d64a547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,8 +174,8 @@ - 9.0.0-preview.24508.2 - 3.11.0-beta1.24508.2 + 9.0.0-preview.24527.2 + 3.11.0-beta1.24527.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 161/702] 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 86958764eb748e3a33dafac5bfbdada5ea53e331 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Oct 2024 12:09:57 +0000 Subject: [PATCH 162/702] Update dependencies from https://github.com/dotnet/roslyn build 20241027.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24523.10 -> To Version 4.12.0-3.24527.2 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 007703032e6d..271f01d9bbb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -23,6 +21,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a6654c04091..5c5122fa2867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,41 +97,41 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 - + https://github.com/dotnet/roslyn 16f58fa314e7deff4b3df36c862f157609ace2b4 diff --git a/eng/Versions.props b/eng/Versions.props index 6ce0bb911f43..1df643075645 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 - 4.12.0-3.24523.10 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 + 4.12.0-3.24527.2 From dad1162fc6eebdc6ba851278365b800c12987679 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Oct 2024 12:10:20 +0000 Subject: [PATCH 163/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241027.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.24522.2 -> To Version 9.0.0-beta.24527.1 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 12 ++++++------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 007703032e6d..271f01d9bbb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - @@ -23,6 +21,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a6654c04091..abb482d1cfa0 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 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f - + https://github.com/dotnet/sourcelink 1f252d795c563515fe55a228f499e399b915363f diff --git a/eng/Versions.props b/eng/Versions.props index 6ce0bb911f43..fb82b794946f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24522.2 - 9.0.0-beta.24522.2 - 9.0.0-beta.24522.2 - 9.0.0-beta.24522.2 - 9.0.0-beta.24522.2 - 9.0.0-beta.24522.2 + 9.0.0-beta.24527.1 + 9.0.0-beta.24527.1 + 9.0.0-beta.24527.1 + 9.0.0-beta.24527.1 + 9.0.0-beta.24527.1 + 9.0.0-beta.24527.1 From 6179b9293cb07bd5f4872c26a130f1f1ecef501f Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 27 Oct 2024 19:23:28 -0700 Subject: [PATCH 164/702] Update the description --- eng/Versions.props | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f268d95a2f88..b13bad0977ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -194,7 +194,9 @@ from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, then use that in Directory.Packages.props. - At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> + At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. + + Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> 17.13.0-preview-24524-23 17.13.0-preview-24524-23 17.11.4 From 2cf531795b1eb0a1a2167fafe78146f1fd13f4ea Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 28 Oct 2024 09:39:56 -0700 Subject: [PATCH 165/702] [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 166/702] [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 167/702] [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 bf1e91fc8abb662c5a28f9d79f844c21795c01cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 28 Oct 2024 22:28:53 +0000 Subject: [PATCH 168/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20241028.4 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0 -> To Version 9.0.0 --- NuGet.config | 32 +++++++++-------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++--- 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index c7197630b8e2..0bacde434aea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,17 @@ - - + + + + + @@ -19,20 +22,21 @@ - - - - - - + + + + + + + @@ -59,17 +63,17 @@ + + - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eaffe5c0ccab..a676da6b9251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 5f6da416352c99eb0460211853b69b99026c6757 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index fd04afa841f9..2fda384a3f3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24522.16 + 9.0.0-rtm.24528.4 9.0.0 9.0.0 - 9.0.0-rtm.24522.16 + 9.0.0-rtm.24528.4 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24522.16 - 9.0.0-rtm.24522.16 + 9.0.0-rtm.24528.4 + 9.0.0-rtm.24528.4 9.0.0 9.0.0 9.0.0 From 951986d3ad7acfebfa764610edd5cced42a87806 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 29 Oct 2024 07:44:27 +0000 Subject: [PATCH 169/702] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20241028.9 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0 -> To Version 9.0.0 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.0-rtm.24519.2 -> To Version 9.0.0-rtm.24528.2 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 9 ++--- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 53 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0bacde434aea..592d357340d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,7 @@ - - - - + @@ -22,7 +19,7 @@ - + @@ -68,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a676da6b9251..6c5d73d0c103 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - cd2146c90fc68d5ff2db715337e696229c74651e + 763d10a1a251be35337ee736832bfde3f9200672 https://github.com/dotnet/emsdk - cd2146c90fc68d5ff2db715337e696229c74651e + 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/emsdk - cd2146c90fc68d5ff2db715337e696229c74651e + 763d10a1a251be35337ee736832bfde3f9200672 @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f6da416352c99eb0460211853b69b99026c6757 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2fda384a3f3e..8d2e39c547d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24528.4 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 - 9.0.0-rtm.24528.4 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24528.4 - 9.0.0-rtm.24528.4 + 9.0.0-rtm.24528.9 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 9.0.0 @@ -333,7 +333,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24519.2 + 9.0.0-rtm.24528.2 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From a9858c43aa56593808147dfa2a6da6002c06cd87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Oct 2024 11:25:40 +0000 Subject: [PATCH 170/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.45 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.23 -> To Version 6.13.0-preview.1.45 --- NuGet.config | 2 -- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 20236599c646..620a5cf50f57 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb1358dfd1e3..e4a1774d8cdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 - + https://github.com/nuget/nuget.client - fac35579c8c3c92799361e5695e9f7539b4fd5a2 + fad31532917c9b67c2ce0d9d6861121e27a78ae6 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 63ccdd08aa4e..a5901b4dd17b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 - 6.13.0-preview.1.40 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 + 6.13.0-preview.1.45 From 7dd309d7a5d25a8b650033f3088b3eafe59a4470 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Oct 2024 12:16:51 +0000 Subject: [PATCH 171/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241029.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.24522.2 -> To Version 9.0.0-beta.24529.1 --- 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 b4071901bb21..1ffbcaf48ae9 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 - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed - + https://github.com/dotnet/sourcelink - 1f252d795c563515fe55a228f499e399b915363f + cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed diff --git a/eng/Versions.props b/eng/Versions.props index 28650ac818b5..82e0c5c21434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24527.1 - 9.0.0-beta.24527.1 - 9.0.0-beta.24527.1 - 9.0.0-beta.24527.1 - 9.0.0-beta.24527.1 - 9.0.0-beta.24527.1 + 9.0.0-beta.24529.1 + 9.0.0-beta.24529.1 + 9.0.0-beta.24529.1 + 9.0.0-beta.24529.1 + 9.0.0-beta.24529.1 + 9.0.0-beta.24529.1 From 9f2317ae1cd8bfde91f57314bc6fde062952f992 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 29 Oct 2024 15:10:34 +0000 Subject: [PATCH 172/702] Merged PR 44480: [internal/release/9.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 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a - **Build**: 20241029.2 - **Date Produced**: October 29, 2024 1:26:07 PM UTC - **Commit**: 308dc7955704be60afc72ec00902cc18e028c3c2 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.1][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC2e5178f9d725c4becd3f04f9627f9e45d7469f03&targetVersion=GC308dc7955704be60afc72ec00902cc18e028c3c2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCc23c8e8b764b527c6bf96b8f38379faae3c4dc1d&targetVersion=GCa04736acb8edb533756131d3d5fc55f15cd03d6a&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbcf70f48f3ad07c7747c64601348e1df81f1f19e&targetVersion=GC62ebdb4b0d5cc7e163b8dc9331dc196e576bf162&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 592d357340d8..ab275d2f1eb6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,10 +30,7 @@ - - - - + @@ -68,10 +65,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c5d73d0c103..c2121030a9e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2e5178f9d725c4becd3f04f9627f9e45d7469f03 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2e5178f9d725c4becd3f04f9627f9e45d7469f03 + 308dc7955704be60afc72ec00902cc18e028c3c2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2e5178f9d725c4becd3f04f9627f9e45d7469f03 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2e5178f9d725c4becd3f04f9627f9e45d7469f03 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c23c8e8b764b527c6bf96b8f38379faae3c4dc1d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcf70f48f3ad07c7747c64601348e1df81f1f19e + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c23c8e8b764b527c6bf96b8f38379faae3c4dc1d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8d2e39c547d6..a0ed12120f16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24523.2 + 9.0.0-rtm.24529.1 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 9.0.0 9.0.0 @@ -253,8 +253,8 @@ - 9.0.0-rtm.24523.2 - 9.0.0-rtm.24523.2 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 From 59db016f11bb27d359336cf37524b863d77e7fea Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 29 Oct 2024 15:49:15 +0000 Subject: [PATCH 173/702] Merged PR 44497: [internal/release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 7c429c14-b12b-40f6-ae9e-395f98f369df - **Build**: 20241029.3 - **Date Produced**: October 29, 2024 3:20:55 PM UTC - **Commit**: af22effae4069a5dfb9b0735859de48820104f5b - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **dotnet-user-jwts**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **dotnet-user-secrets**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.Analyzers**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Authorization**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.Components.Web**: [from 9.0.0 to 9.0.0][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.AspNetCore.TestHost**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.0 to 9.0.0][1] - **Microsoft.Extensions.ObjectPool**: [from 9.0.0 to 9.0.0][1] - **Microsoft.JSInterop**: [from 9.0.0 to 9.0.0][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.3][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC592ca7fd80495bc6625c8b9d309355b6a8609861&targetVersion=GCaf22effae4069a5dfb9b0735859de48820104f5b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df) --- NuGet.config | 8 ++---- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index ab275d2f1eb6..6810f372fcba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,7 @@ - - - + @@ -57,9 +55,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2121030a9e0..3fc7759fdbba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn f3348c2a2be16ec6525cb3df7be12952c3e2de9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 592ca7fd80495bc6625c8b9d309355b6a8609861 + af22effae4069a5dfb9b0735859de48820104f5b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a0ed12120f16..5aa283b91eaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -232,18 +232,18 @@ 9.0.0 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 9.0.0 9.0.0 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 - 9.0.0-rtm.24523.5 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 From 348977d7e8a524ed75d796d9e7104b94a6ac4ae0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 29 Oct 2024 09:51:20 -0700 Subject: [PATCH 174/702] Turning on diag for all commands causes significant issues in the test run and makes it hard to track down. --- .../Commands/MSBuildCommand.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs b/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs index 178966a6888f..f145835ab2c7 100644 --- a/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs +++ b/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs @@ -133,9 +133,17 @@ public override CommandResult Execute(IEnumerable args) args = new[] { "/restore" }.Concat(args); } - args = args.Concat(new[] { "-v:diag" }); + var command = base.Execute(args); - return base.Execute(args); + var error = command.StdErr.ToString(); + var output = command.StdOut.ToString(); + if ((!String.IsNullOrEmpty(error) && error.Contains("NU3003")) || (!String.IsNullOrEmpty(output) && output.Contains("NU3003"))) + { + args = args.Concat(new[] { "-v:diag" }); + command = base.Execute(args); + } + + return command; } public CommandResult ExecuteWithoutRestore(IEnumerable args) From 230e1741f553fd5b631494664d3b599a95bc4dc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 08:46:36 +0000 Subject: [PATCH 175/702] Update dependencies from https://github.com/dotnet/test-templates build 20241030.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24530.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 ee7f59ce3535..6c2d8f4d019d 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 - 66b263ffecee032b2d5071076b42b9614fcf7013 + 37c392ea6ed93b4884daf81c1006cf0f15a4bc62 - + https://github.com/dotnet/test-templates - 66b263ffecee032b2d5071076b42b9614fcf7013 + 37c392ea6ed93b4884daf81c1006cf0f15a4bc62 diff --git a/eng/Versions.props b/eng/Versions.props index c34207f54702..761e3d455dda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24525.1 + 1.1.0-rtm.24530.1 From 1eb9703df3136e98d0e8c21689b5bbca4a90b2c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 11:22:25 +0000 Subject: [PATCH 176/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.46 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.23 -> To Version 6.13.0-preview.1.46 --- 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 e4a1774d8cdf..185ab2562e6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 - + https://github.com/nuget/nuget.client - fad31532917c9b67c2ce0d9d6861121e27a78ae6 + dddfdd8617e80ec5a2ea0dd94a094b243f355d09 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index a5901b4dd17b..8c6414929acc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 - 6.13.0-preview.1.45 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 + 6.13.0-preview.1.46 From 5f99d754e7bc920de6adb59309cbf84f11706a8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 14:07:48 +0000 Subject: [PATCH 177/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241030.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.24529.3 -> To Version 9.0.0-beta.24530.1 --- 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 c3628164e602..b34994813dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - 196983c6e97621b051c67cd898c4db630168cd81 + ed7498ee2384633831a44285ea5c124465b438c1 diff --git a/eng/Versions.props b/eng/Versions.props index f9c37cac20c8..be489db0a371 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -291,12 +291,12 @@ - 9.0.0-beta.24529.3 - 9.0.0-beta.24529.3 - 9.0.0-beta.24529.3 - 9.0.0-beta.24529.3 - 9.0.0-beta.24529.3 - 9.0.0-beta.24529.3 + 9.0.0-beta.24530.1 + 9.0.0-beta.24530.1 + 9.0.0-beta.24530.1 + 9.0.0-beta.24530.1 + 9.0.0-beta.24530.1 + 9.0.0-beta.24530.1 From 8a91ff68b347508cc4c69135273991e78d0103e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 14:34:13 +0000 Subject: [PATCH 178/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24529.5 -> To Version 4.13.0-2.24530.1 --- 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 c3628164e602..8dc1c37a259f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 - + https://github.com/dotnet/roslyn - eadb8aee946dcc1fd8889d3a8ab6e8398514275e + 5d355f603fea5193e055af58083966c73cbb5aa8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f9c37cac20c8..1f9cfc66fc3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 - 4.13.0-2.24529.5 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 + 4.13.0-2.24530.1 From fcec07bb479523dac1fb36b181525884a5a00c47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 14:37:17 +0000 Subject: [PATCH 179/702] Update dependencies from https://github.com/dotnet/razor build 20241030.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24529.2 -> To Version 9.0.0-preview.24530.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3628164e602..4fa3fea532f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - e22180b5fd5d599723561ca6f85b58f6adb1cbce + 41693dec1d9ec15e674efa83b749750fd0921e39 - + https://github.com/dotnet/razor - e22180b5fd5d599723561ca6f85b58f6adb1cbce + 41693dec1d9ec15e674efa83b749750fd0921e39 - + https://github.com/dotnet/razor - e22180b5fd5d599723561ca6f85b58f6adb1cbce + 41693dec1d9ec15e674efa83b749750fd0921e39 - + https://github.com/dotnet/razor - e22180b5fd5d599723561ca6f85b58f6adb1cbce + 41693dec1d9ec15e674efa83b749750fd0921e39 diff --git a/eng/Versions.props b/eng/Versions.props index f9c37cac20c8..1e5c40fb337f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -245,9 +245,9 @@ - 9.0.0-preview.24529.2 - 9.0.0-preview.24529.2 - 9.0.0-preview.24529.2 + 9.0.0-preview.24530.1 + 9.0.0-preview.24530.1 + 9.0.0-preview.24530.1 From 531d2a58c93bf3c2564c4727dedf5b057b88a827 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 15:13:02 +0000 Subject: [PATCH 180/702] Update dependencies from https://github.com/dotnet/test-templates build 20241030.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24530.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 271f01d9bbb9..28a1940810ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c2d8f4d019d..a6ea9f46bc8a 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 - 37c392ea6ed93b4884daf81c1006cf0f15a4bc62 + 07bc34d92ccb43b98e9ec00774af86c1f678d02b - + https://github.com/dotnet/test-templates - 37c392ea6ed93b4884daf81c1006cf0f15a4bc62 + 07bc34d92ccb43b98e9ec00774af86c1f678d02b diff --git a/eng/Versions.props b/eng/Versions.props index 761e3d455dda..9a7781b04384 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24530.1 + 1.1.0-rtm.24530.2 From 023b1e6fa60ef539662e3b2a7096a82d6be84d5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 15:20:11 +0000 Subject: [PATCH 181/702] Update dependencies from https://github.com/dotnet/test-templates build 20241030.3 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24530.3 --- 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 a6ea9f46bc8a..85bb02a98932 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 - 07bc34d92ccb43b98e9ec00774af86c1f678d02b + 764e98851850e9ebdf7c3ff556f893068bc5871d - + https://github.com/dotnet/test-templates - 07bc34d92ccb43b98e9ec00774af86c1f678d02b + 764e98851850e9ebdf7c3ff556f893068bc5871d diff --git a/eng/Versions.props b/eng/Versions.props index 9a7781b04384..935f0047acf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24530.2 + 1.1.0-rtm.24530.3 From 33982d57d2bdee5e793b49ce95078cc2da277280 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 17:58:45 +0000 Subject: [PATCH 182/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24529.5 -> To Version 4.13.0-2.24530.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dc1c37a259f..6198da67323b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa - + https://github.com/dotnet/roslyn - 5d355f603fea5193e055af58083966c73cbb5aa8 + 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1f9cfc66fc3f..f38e68db24a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 - 4.13.0-2.24530.1 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 + 4.13.0-2.24530.2 From 4a7bcdf8597ef508597ae0f9e487d7c71d84705f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 19:59:21 +0000 Subject: [PATCH 183/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24529.5 -> To Version 4.13.0-2.24530.3 --- 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 6198da67323b..e27d0890b89b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c - + https://github.com/dotnet/roslyn - 5ab7f5b48ecad900a2d899a047d53f0ee0c388fa + 308cda3f583adb7d17c298da64f3019730100e6c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f38e68db24a7..cdb232d193a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 - 4.13.0-2.24530.2 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 + 4.13.0-2.24530.3 From 864f9278e12248a349780d96fd03dab53401a4fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 20:34:26 +0000 Subject: [PATCH 184/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24529.5 -> To Version 4.13.0-2.24530.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e27d0890b89b..352f5affdb74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 - + https://github.com/dotnet/roslyn - 308cda3f583adb7d17c298da64f3019730100e6c + a26b1445e65fed2c33a876089aacb4d395e2c315 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index cdb232d193a1..46eed09ecae4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 - 4.13.0-2.24530.3 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 + 4.13.0-2.24530.4 From 3cd391bca5e5f9ac84e6804d0e0318b90fbbee96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Oct 2024 21:27:18 +0000 Subject: [PATCH 185/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24529.5 -> To Version 4.13.0-2.24530.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 352f5affdb74..ff6e75868119 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 - + https://github.com/dotnet/roslyn - a26b1445e65fed2c33a876089aacb4d395e2c315 + 697989601cb5319af38ca7c36d8727875c4f49c4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 46eed09ecae4..bbeb652d7f04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 - 4.13.0-2.24530.4 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 + 4.13.0-2.24530.5 From 3dd27f1778fb136242f20874930c2fdb7be2268a Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Sat, 26 Oct 2024 21:30:57 +0000 Subject: [PATCH 186/702] add `dotnet new sln --format slnx` --- .../.template.config/dotnetcli.host.json | 7 +++- .../localize/templatestrings.cs.json | 8 ++++- .../localize/templatestrings.de.json | 8 ++++- .../localize/templatestrings.en.json | 8 ++++- .../localize/templatestrings.es.json | 8 ++++- .../localize/templatestrings.fr.json | 8 ++++- .../localize/templatestrings.it.json | 8 ++++- .../localize/templatestrings.ja.json | 8 ++++- .../localize/templatestrings.ko.json | 8 ++++- .../localize/templatestrings.pl.json | 8 ++++- .../localize/templatestrings.pt-BR.json | 8 ++++- .../localize/templatestrings.ru.json | 8 ++++- .../localize/templatestrings.tr.json | 8 ++++- .../localize/templatestrings.zh-Hans.json | 8 ++++- .../localize/templatestrings.zh-Hant.json | 8 ++++- .../Solution/.template.config/template.json | 34 +++++++++++++++++-- .../content/Solution/Solution1.slnx | 2 ++ 17 files changed, 138 insertions(+), 17 deletions(-) create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnx diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/dotnetcli.host.json index 94f4ee10148d..e50513e1b6fa 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/dotnetcli.host.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/dotnetcli.host.json @@ -1,3 +1,8 @@ { - "$schema": "http://json.schemastore.org/dotnetcli.host" + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "Format": { + "longName": "format" + } + } } diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json index 01c0027f96ab..c4378d97baab 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Soubor řešení", - "description": "Vytvořit prázdné řešení neobsahující projekty" + "description": "Vytvořit prázdné řešení neobsahující projekty", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json index 92e9c34c9c6a..b2ed623eb8dd 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Projektmappendatei", - "description": "Erstellt eine leere Projektmappe, die keine Projekte enthält" + "description": "Erstellt eine leere Projektmappe, die keine Projekte enthält", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json index 7f7be3bc41c4..e82e8b9b9a98 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Solution File", - "description": "Create an empty solution containing no projects" + "description": "Create an empty solution containing no projects", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json index 697406a90c65..57a0180e3285 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Archivo de la solución", - "description": "Crea una solución vacía sin proyectos." + "description": "Crea una solución vacía sin proyectos.", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json index 47843051c7f5..ee181d6e7bab 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Fichier solution", - "description": "Créer une solution vide ne contenant aucun projet" + "description": "Créer une solution vide ne contenant aucun projet", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json index fcfe285115a4..f1f62099a960 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "File di soluzione", - "description": "Crea una soluzione vuota che non contiene alcun progetto" + "description": "Crea una soluzione vuota che non contiene alcun progetto", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json index 9abc257b709b..448a38aacd3a 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "ソリューション ファイル", - "description": "プロジェクトを含まない空のソリューションを作成します。" + "description": "プロジェクトを含まない空のソリューションを作成します。", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json index 015bf0109633..642ccd721419 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "솔루션 파일", - "description": "프로젝트 없는 빈 솔루션 만들기" + "description": "프로젝트 없는 빈 솔루션 만들기", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json index 4b3e01084bda..0ad22ad7072d 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Plik rozwiązania", - "description": "Utwórz puste rozwiązanie niezawierające żadnych projektów" + "description": "Utwórz puste rozwiązanie niezawierające żadnych projektów", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json index 0212fcf5cba3..356625dd4b0e 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Arquivo de Solução", - "description": "Uma solução vazia sem projetos" + "description": "Uma solução vazia sem projetos", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json index 585b10da0e01..c666693b1eff 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json @@ -1,5 +1,11 @@ { "author": "Майкрософт", "name": "Файл решения", - "description": "Создание пустого решения, не содержащего проектов" + "description": "Создание пустого решения, не содержащего проектов", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json index d95ad06165a4..0f75a7f3f91a 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "Çözüm Dosyası", - "description": "Hiçbir proje içermeyen boş bir çözüm oluştur" + "description": "Hiçbir proje içermeyen boş bir çözüm oluştur", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json index 6b78e6364333..e79d6bbcf28d 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "解决方案文件", - "description": "创建不包含项目的空解决方案" + "description": "创建不包含项目的空解决方案", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json index 8849a7bcc65e..55b3fd5a39e7 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json @@ -1,5 +1,11 @@ { "author": "Microsoft", "name": "方案檔", - "description": "建立不含專案的空白方案" + "description": "建立不含專案的空白方案", + "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/displayName": "Solution file format", + "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/displayName": ".sln format", + "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json index 7faebdf5252e..0e510a367b12 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json @@ -15,9 +15,39 @@ "solution" ], "sourceName": "Solution1", - "primaryOutputs": [ + "symbols": { + "Format": { + "type": "parameter", + "displayName": "Solution file format", + "description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "defaultValue": "sln", + "datatype": "choice", + "choices": [ + { + "choice": "sln", + "displayName": ".sln format", + "description": "Traditional solution file" + }, + { + "choice": "slnx", + "displayName": ".slnx format", + "description": "XML-based solution file" + } + ] + } + }, + "sources": [ { - "path": "Solution1.sln" + "modifiers": [ + { + "condition": "(Format == \"slnx\")", + "exclude": [ "Solution1.sln" ] + }, + { + "condition": "(Format == \"sln\")", + "exclude": [ "Solution1.slnx" ] + } + ] } ], "defaultName": "Solution1" diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnx b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnx new file mode 100644 index 000000000000..ba788ff0d17d --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnx @@ -0,0 +1,2 @@ + + From bc0da3cfa142549e5879644d4069112848b19fd5 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:49:22 +0000 Subject: [PATCH 187/702] updates --- .../.template.config/localize/templatestrings.cs.json | 6 +++--- .../.template.config/localize/templatestrings.de.json | 6 +++--- .../.template.config/localize/templatestrings.en.json | 6 +++--- .../.template.config/localize/templatestrings.es.json | 6 +++--- .../.template.config/localize/templatestrings.fr.json | 6 +++--- .../.template.config/localize/templatestrings.it.json | 6 +++--- .../.template.config/localize/templatestrings.ja.json | 6 +++--- .../.template.config/localize/templatestrings.ko.json | 6 +++--- .../.template.config/localize/templatestrings.pl.json | 6 +++--- .../.template.config/localize/templatestrings.pt-BR.json | 6 +++--- .../.template.config/localize/templatestrings.ru.json | 6 +++--- .../.template.config/localize/templatestrings.tr.json | 6 +++--- .../.template.config/localize/templatestrings.zh-Hans.json | 6 +++--- .../.template.config/localize/templatestrings.zh-Hant.json | 6 +++--- .../content/Solution/.template.config/template.json | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json index c4378d97baab..fe41e5a3650a 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.cs.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Soubor řešení", "description": "Vytvořit prázdné řešení neobsahující projekty", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json index b2ed623eb8dd..b393ed7bbbd7 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.de.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Projektmappendatei", "description": "Erstellt eine leere Projektmappe, die keine Projekte enthält", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json index e82e8b9b9a98..3044566e0fdb 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.en.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Solution File", "description": "Create an empty solution containing no projects", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json index 57a0180e3285..9f6203851904 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.es.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Archivo de la solución", "description": "Crea una solución vacía sin proyectos.", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json index ee181d6e7bab..1b30d59b7781 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.fr.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Fichier solution", "description": "Créer une solution vide ne contenant aucun projet", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json index f1f62099a960..83820bbb5df5 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.it.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "File di soluzione", "description": "Crea una soluzione vuota che non contiene alcun progetto", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json index 448a38aacd3a..95391ab9c0a1 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ja.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "ソリューション ファイル", "description": "プロジェクトを含まない空のソリューションを作成します。", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json index 642ccd721419..372dcc2e6aec 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ko.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "솔루션 파일", "description": "프로젝트 없는 빈 솔루션 만들기", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json index 0ad22ad7072d..f573cd5ff73b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pl.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Plik rozwiązania", "description": "Utwórz puste rozwiązanie niezawierające żadnych projektów", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json index 356625dd4b0e..319705608ecb 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.pt-BR.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Arquivo de Solução", "description": "Uma solução vazia sem projetos", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json index c666693b1eff..92477412bc1c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.ru.json @@ -2,10 +2,10 @@ "author": "Майкрософт", "name": "Файл решения", "description": "Создание пустого решения, не содержащего проектов", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json index 0f75a7f3f91a..e3cd9702fdd6 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.tr.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "Çözüm Dosyası", "description": "Hiçbir proje içermeyen boş bir çözüm oluştur", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json index e79d6bbcf28d..2ae629c21472 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hans.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "解决方案文件", "description": "创建不包含项目的空解决方案", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json index 55b3fd5a39e7..93db3e86a6d0 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/localize/templatestrings.zh-Hant.json @@ -2,10 +2,10 @@ "author": "Microsoft", "name": "方案檔", "description": "建立不含專案的空白方案", - "symbols/Format/description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "symbols/Format/description": "Choose the format for the solution file: sln or slnx.", "symbols/Format/displayName": "Solution file format", - "symbols/Format/choices/sln/description": "Traditional solution file", + "symbols/Format/choices/sln/description": "Solution file", "symbols/Format/choices/sln/displayName": ".sln format", - "symbols/Format/choices/slnx/description": "XML-based solution file", + "symbols/Format/choices/slnx/description": "XML Solution file", "symbols/Format/choices/slnx/displayName": ".slnx format" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json index 0e510a367b12..a4e584a02541 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json @@ -19,19 +19,19 @@ "Format": { "type": "parameter", "displayName": "Solution file format", - "description": "Choose the format for the solution file: traditional (.sln) or XML-based (.slnx).", + "description": "Choose the format for the solution file: sln or slnx.", "defaultValue": "sln", "datatype": "choice", "choices": [ { "choice": "sln", "displayName": ".sln format", - "description": "Traditional solution file" + "description": "Solution file" }, { "choice": "slnx", "displayName": ".slnx format", - "description": "XML-based solution file" + "description": "XML Solution file" } ] } From 57a832eefa08a6e9c35e9b273b4fd2bd82ab949a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 01:09:03 +0000 Subject: [PATCH 188/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241030.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.24529.3 -> To Version 9.0.0-beta.24530.2 --- 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 b34994813dfe..afa2fe9b64dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink ed7498ee2384633831a44285ea5c124465b438c1 diff --git a/eng/Versions.props b/eng/Versions.props index be489db0a371..b09238aa807a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -291,12 +291,12 @@ - 9.0.0-beta.24530.1 - 9.0.0-beta.24530.1 - 9.0.0-beta.24530.1 - 9.0.0-beta.24530.1 - 9.0.0-beta.24530.1 - 9.0.0-beta.24530.1 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 From d6ced2c9a3e302620a2979c089206b2ac14c7a62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 01:23:17 +0000 Subject: [PATCH 189/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.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.13.0-2.24529.5 -> To Version 4.13.0-2.24530.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 ff6e75868119..68b0beabc47f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 - + https://github.com/dotnet/roslyn - 697989601cb5319af38ca7c36d8727875c4f49c4 + 9e862f15fc4d57a479ac45724748a41c87a7d0b6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bbeb652d7f04..36dcec557cac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 - 4.13.0-2.24530.5 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 + 4.13.0-2.24530.6 From 488e0301e77f3163b33aa1f5080bccc47ec8df2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 01:27:02 +0000 Subject: [PATCH 190/702] Update dependencies from https://github.com/dotnet/roslyn build 20241030.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.13.0-2.24529.5 -> To Version 4.13.0-2.24530.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 68b0beabc47f..26b923268112 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 - + https://github.com/dotnet/roslyn - 9e862f15fc4d57a479ac45724748a41c87a7d0b6 + 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 36dcec557cac..5b54c61a9d1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 - 4.13.0-2.24530.6 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 + 4.13.0-2.24530.7 From ea681f845e67993ed7498050591b90d415c57ea1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 01:40:46 +0000 Subject: [PATCH 191/702] Update dependencies from https://github.com/dotnet/razor build 20241030.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24529.2 -> To Version 9.0.0-preview.24530.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fa3fea532f5..5d7c468f3ff6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 41693dec1d9ec15e674efa83b749750fd0921e39 + b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 - + https://github.com/dotnet/razor - 41693dec1d9ec15e674efa83b749750fd0921e39 + b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 - + https://github.com/dotnet/razor - 41693dec1d9ec15e674efa83b749750fd0921e39 + b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 - + https://github.com/dotnet/razor - 41693dec1d9ec15e674efa83b749750fd0921e39 + b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 diff --git a/eng/Versions.props b/eng/Versions.props index 1e5c40fb337f..6787b45afe44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -245,9 +245,9 @@ - 9.0.0-preview.24530.1 - 9.0.0-preview.24530.1 - 9.0.0-preview.24530.1 + 9.0.0-preview.24530.4 + 9.0.0-preview.24530.4 + 9.0.0-preview.24530.4 From 7aacfecab82b7010594f51ebd1a30416a2bce555 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 11:24:10 +0000 Subject: [PATCH 192/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.50 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.23 -> To Version 6.13.0-preview.1.50 --- 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 185ab2562e6d..ad2b82a3b398 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore 280c613963a1768b810d09f32c998fe4490855e9 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 - + https://github.com/nuget/nuget.client - dddfdd8617e80ec5a2ea0dd94a094b243f355d09 + 00cd9c48644694c43ee430287fe22d49cdd4c534 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8c6414929acc..6503036afd9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 - 6.13.0-preview.1.46 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 + 6.13.0-preview.1.50 From cb1963ba9bd82868409802e8f2b558244418375a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 12:48:16 +0000 Subject: [PATCH 193/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241030.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.24522.2 -> To Version 9.0.0-beta.24530.2 --- NuGet.config | 9 +++++++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 271f01d9bbb9..8eead538bea8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,10 +21,19 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ffbcaf48ae9..758df1f0c6b0 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 - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 - + https://github.com/dotnet/sourcelink - cbfd26c30805b7b005f8fab4bc25186e8f8aa1ed + ed7498ee2384633831a44285ea5c124465b438c1 diff --git a/eng/Versions.props b/eng/Versions.props index 82e0c5c21434..4e6dee10a101 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24529.1 - 9.0.0-beta.24529.1 - 9.0.0-beta.24529.1 - 9.0.0-beta.24529.1 - 9.0.0-beta.24529.1 - 9.0.0-beta.24529.1 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 + 9.0.0-beta.24530.2 From e1c59fc0c669d06cf738c36337c7026b17c01709 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 13:21:30 +0000 Subject: [PATCH 194/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24530.7 -> To Version 4.13.0-2.24531.1 --- 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 18adf46b53c9..c7239dfa4fcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a - + https://github.com/dotnet/roslyn - 1fde068b9cd69a472d2aa0be01fd75f290ad4de9 + 455196fc2558d9f446d8aef53a58039ffb45147a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 06931a155b61..d63595c4513c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 - 4.13.0-2.24530.7 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 + 4.13.0-2.24531.1 From ba54e2f2e2f755b2cc6ecf8b246e03c420202488 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 13:52:54 +0000 Subject: [PATCH 195/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241031.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.24530.2 -> To Version 9.0.0-beta.24531.1 --- 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 18adf46b53c9..7152048490b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 diff --git a/eng/Versions.props b/eng/Versions.props index 06931a155b61..8db5d62b425d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -291,12 +291,12 @@ - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 + 9.0.0-beta.24531.1 + 9.0.0-beta.24531.1 + 9.0.0-beta.24531.1 + 9.0.0-beta.24531.1 + 9.0.0-beta.24531.1 + 9.0.0-beta.24531.1 From 15122d54fcf77ea8293bf2ce0e8de46a248268d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 14:36:49 +0000 Subject: [PATCH 196/702] Update dependencies from https://github.com/dotnet/msbuild build 20241031.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24530-03 -> To Version 17.13.0-preview-24531-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18adf46b53c9..e3bf85c442a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 1f83ac1d48374297806bda821d894ef2cd8f0352 + 47776184d13e75081408c3dadc607f65f03111d4 - + https://github.com/dotnet/msbuild - 1f83ac1d48374297806bda821d894ef2cd8f0352 + 47776184d13e75081408c3dadc607f65f03111d4 - + https://github.com/dotnet/msbuild - 1f83ac1d48374297806bda821d894ef2cd8f0352 + 47776184d13e75081408c3dadc607f65f03111d4 diff --git a/eng/Versions.props b/eng/Versions.props index 06931a155b61..d6159484f247 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,8 +195,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24530-03 - 17.13.0-preview-24530-03 + 17.13.0-preview-24531-02 + 17.13.0-preview-24531-02 17.11.4 From 50243533457a2ddb55124d5facb4c8c6748e0f27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 14:47:07 +0000 Subject: [PATCH 197/702] Update dependencies from https://github.com/dotnet/msbuild build 20241031.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24530-03 -> To Version 17.13.0-preview-24531-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3bf85c442a3..b1c3e4658103 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 47776184d13e75081408c3dadc607f65f03111d4 + 2b126ffd25b71c88669807a1275ae5f662eea59f - + https://github.com/dotnet/msbuild - 47776184d13e75081408c3dadc607f65f03111d4 + 2b126ffd25b71c88669807a1275ae5f662eea59f - + https://github.com/dotnet/msbuild - 47776184d13e75081408c3dadc607f65f03111d4 + 2b126ffd25b71c88669807a1275ae5f662eea59f diff --git a/eng/Versions.props b/eng/Versions.props index d6159484f247..325e8e75455a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,8 +195,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24531-02 - 17.13.0-preview-24531-02 + 17.13.0-preview-24531-01 + 17.13.0-preview-24531-01 17.11.4 From d2e6b248ce169324b1f9b1ffc19d3d22e1d0ce31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 17:03:53 +0000 Subject: [PATCH 198/702] Update dependencies from https://github.com/dotnet/test-templates build 20241031.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24530.3 -> To Version 1.1.0-rtm.24531.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 18adf46b53c9..ba789bcc7c70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 764e98851850e9ebdf7c3ff556f893068bc5871d + 1cd8415746cd9b3eeddab3bcb277cada16c1576a - + https://github.com/dotnet/test-templates - 764e98851850e9ebdf7c3ff556f893068bc5871d + 1cd8415746cd9b3eeddab3bcb277cada16c1576a diff --git a/eng/Versions.props b/eng/Versions.props index 06931a155b61..88b2470e9319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24530.3 + 1.1.0-rtm.24531.1 From 92728e494790434b9bd2c9a2f8cc3bbcffd2d90b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 17:03:56 +0000 Subject: [PATCH 199/702] Update dependencies from https://github.com/dotnet/test-templates build 20241031.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24531.1 --- NuGet.config | 7 +++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28a1940810ff..8eead538bea8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,12 +21,19 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85bb02a98932..be21fab0f9f7 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 - 764e98851850e9ebdf7c3ff556f893068bc5871d + 1cd8415746cd9b3eeddab3bcb277cada16c1576a - + https://github.com/dotnet/test-templates - 764e98851850e9ebdf7c3ff556f893068bc5871d + 1cd8415746cd9b3eeddab3bcb277cada16c1576a diff --git a/eng/Versions.props b/eng/Versions.props index 935f0047acf7..17667285ff6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24530.3 + 1.1.0-rtm.24531.1 From 7a07664fc0e9fb9057b99069bf47135b95bb9a0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 17:43:48 +0000 Subject: [PATCH 200/702] Update dependencies from https://github.com/dotnet/msbuild build 20241031.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24530-03 -> To Version 17.13.0-preview-24531-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1c3e4658103..43423167b857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 2b126ffd25b71c88669807a1275ae5f662eea59f + 18eb9edf069c3d01dc08a56612fdabf4578aa32c - + https://github.com/dotnet/msbuild - 2b126ffd25b71c88669807a1275ae5f662eea59f + 18eb9edf069c3d01dc08a56612fdabf4578aa32c - + https://github.com/dotnet/msbuild - 2b126ffd25b71c88669807a1275ae5f662eea59f + 18eb9edf069c3d01dc08a56612fdabf4578aa32c diff --git a/eng/Versions.props b/eng/Versions.props index 325e8e75455a..a783135d8c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,8 +195,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24531-01 - 17.13.0-preview-24531-01 + 17.13.0-preview-24531-03 + 17.13.0-preview-24531-03 17.11.4 From 6deaf6cba40ccc96fb64c296277f25ca0296e3a0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 31 Oct 2024 11:30:05 -0700 Subject: [PATCH 201/702] Update the loc build to target 9.0.2xx After this flows to 9.0.2xx and we get a loc build from there, we'll need to file an internal ticket to change the backend loc target branch. --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1f4b15c068c6..8959c26c3e0b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -104,7 +104,7 @@ extends: templateFolderName: templates-official publishTaskPrefix: 1ES. runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - locBranch: release/9.0.1xx + locBranch: release/9.0.2xx ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: timeoutInMinutes: 90 windowsJobParameterSets: From a1545fc138204311611dab38b0665fef24326343 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 23:20:44 +0000 Subject: [PATCH 202/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24531.1 -> To Version 4.13.0-2.24531.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54676558ae4..17b5cdd7201b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 - + https://github.com/dotnet/roslyn - 455196fc2558d9f446d8aef53a58039ffb45147a + 49b022cea27cb4823d129e2355d92041191b8458 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 065c8ca991bc..ea885bfa64be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 - 4.13.0-2.24531.1 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 + 4.13.0-2.24531.2 From 43c42e909aebe8cca01a1c52779cb5bd4bea0ad7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Oct 2024 23:23:55 +0000 Subject: [PATCH 203/702] Update dependencies from https://github.com/dotnet/razor build 20241031.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24530.4 -> To Version 9.0.0-preview.24531.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54676558ae4..29426259571d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 + 17eec6578b329a4b8a984537d5e60ee8900929a0 - + https://github.com/dotnet/razor - b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 + 17eec6578b329a4b8a984537d5e60ee8900929a0 - + https://github.com/dotnet/razor - b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 + 17eec6578b329a4b8a984537d5e60ee8900929a0 - + https://github.com/dotnet/razor - b7255b89efa2be413f17ad5e4a0febc2c0c1e1e7 + 17eec6578b329a4b8a984537d5e60ee8900929a0 diff --git a/eng/Versions.props b/eng/Versions.props index 065c8ca991bc..69cde7955f11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24530.4 - 9.0.0-preview.24530.4 - 9.0.0-preview.24530.4 + 9.0.0-preview.24531.2 + 9.0.0-preview.24531.2 + 9.0.0-preview.24531.2 From 862eb8117125f13cedb34d9b3e493aea3a968038 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 01:13:26 +0000 Subject: [PATCH 204/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241031.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.24531.1 -> To Version 9.0.0-beta.24531.2 --- 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 b54676558ae4..616bee375f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 diff --git a/eng/Versions.props b/eng/Versions.props index 065c8ca991bc..37f431de3174 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24531.1 - 9.0.0-beta.24531.1 - 9.0.0-beta.24531.1 - 9.0.0-beta.24531.1 - 9.0.0-beta.24531.1 - 9.0.0-beta.24531.1 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 From f5266ef72897c964432c6336d85523c03c39b70e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 02:11:45 +0000 Subject: [PATCH 205/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24531.1 -> To Version 4.13.0-2.24531.3 --- 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 17b5cdd7201b..ce5818297773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f - + https://github.com/dotnet/roslyn - 49b022cea27cb4823d129e2355d92041191b8458 + 6200694f1e16db934fdd360d9a4dc0460baf172f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ea885bfa64be..267e7f4ff961 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 - 4.13.0-2.24531.2 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 + 4.13.0-2.24531.3 From 4a34b5c457124fdf26e17bae92935796ead210d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 02:17:06 +0000 Subject: [PATCH 206/702] Update dependencies from https://github.com/dotnet/razor build 20241031.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24530.4 -> To Version 9.0.0-preview.24531.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29426259571d..7d163fae7266 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 17eec6578b329a4b8a984537d5e60ee8900929a0 + 09cba53db5bfb56cf9a53651cbae4725e72ef065 - + https://github.com/dotnet/razor - 17eec6578b329a4b8a984537d5e60ee8900929a0 + 09cba53db5bfb56cf9a53651cbae4725e72ef065 - + https://github.com/dotnet/razor - 17eec6578b329a4b8a984537d5e60ee8900929a0 + 09cba53db5bfb56cf9a53651cbae4725e72ef065 - + https://github.com/dotnet/razor - 17eec6578b329a4b8a984537d5e60ee8900929a0 + 09cba53db5bfb56cf9a53651cbae4725e72ef065 diff --git a/eng/Versions.props b/eng/Versions.props index 69cde7955f11..9f0de83bf957 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24531.2 - 9.0.0-preview.24531.2 - 9.0.0-preview.24531.2 + 9.0.0-preview.24531.3 + 9.0.0-preview.24531.3 + 9.0.0-preview.24531.3 From b77f2c4c747af9d0e35d75ce25ce28f36af065a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 03:04:29 +0000 Subject: [PATCH 207/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24531.1 -> To Version 4.13.0-2.24531.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce5818297773..da7e0ef29343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c - + https://github.com/dotnet/roslyn - 6200694f1e16db934fdd360d9a4dc0460baf172f + 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 267e7f4ff961..79572bc64453 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 - 4.13.0-2.24531.3 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 + 4.13.0-2.24531.4 From 828a6408b7ea89a46e187247ea111c11b4dc22b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 03:34:14 +0000 Subject: [PATCH 208/702] Update dependencies from https://github.com/dotnet/razor build 20241031.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24530.4 -> To Version 9.0.0-preview.24531.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d163fae7266..dff6bfe4f7f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 09cba53db5bfb56cf9a53651cbae4725e72ef065 + 6ff656614e80cb0376bffcc9a5e965bb340d555f - + https://github.com/dotnet/razor - 09cba53db5bfb56cf9a53651cbae4725e72ef065 + 6ff656614e80cb0376bffcc9a5e965bb340d555f - + https://github.com/dotnet/razor - 09cba53db5bfb56cf9a53651cbae4725e72ef065 + 6ff656614e80cb0376bffcc9a5e965bb340d555f - + https://github.com/dotnet/razor - 09cba53db5bfb56cf9a53651cbae4725e72ef065 + 6ff656614e80cb0376bffcc9a5e965bb340d555f diff --git a/eng/Versions.props b/eng/Versions.props index 9f0de83bf957..b7d11793f8c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24531.3 - 9.0.0-preview.24531.3 - 9.0.0-preview.24531.3 + 9.0.0-preview.24531.4 + 9.0.0-preview.24531.4 + 9.0.0-preview.24531.4 From 1201939ec21124eb0469d9924538de013c204c95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 11:23:36 +0000 Subject: [PATCH 209/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.52 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.50 -> To Version 6.13.0-preview.1.52 --- 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 d83adc03519f..4f8df6db91f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 - + https://github.com/nuget/nuget.client - 00cd9c48644694c43ee430287fe22d49cdd4c534 + edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 72408a3c91a2..27ec4457c2a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 - 6.13.0-preview.1.50 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 + 6.13.0-preview.1.52 From 09f26ea01a8e7f71090d13f4ba42ecf726744d19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 12:44:25 +0000 Subject: [PATCH 210/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.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.24523.10 -> To Version 4.12.0-3.24531.8 --- NuGet.config | 9 +++++++++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 271f01d9bbb9..8eead538bea8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,10 +21,19 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94d8e60f8e1b..9bc4373208fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 - + https://github.com/dotnet/roslyn - 16f58fa314e7deff4b3df36c862f157609ace2b4 + c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b8f1a4bfe5a1..68ce77f0c271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 - 4.12.0-3.24527.2 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 + 4.12.0-3.24531.8 From 3c9f673e82a33486838d6456be6f88465f967e56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 12:44:54 +0000 Subject: [PATCH 211/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241031.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.24522.2 -> To Version 9.0.0-beta.24531.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 758df1f0c6b0..469d4445e07d 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 - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 - + https://github.com/dotnet/sourcelink - ed7498ee2384633831a44285ea5c124465b438c1 + 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 diff --git a/eng/Versions.props b/eng/Versions.props index 4e6dee10a101..86ac135e556f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 - 9.0.0-beta.24530.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 + 9.0.0-beta.24531.2 From fefa29f9efc401be4bb0b6383274a541fdaa70bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 13:41:19 +0000 Subject: [PATCH 212/702] Update dependencies from https://github.com/dotnet/test-templates build 20241101.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24531.1 -> To Version 1.1.0-rtm.24551.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 d83adc03519f..bb2edac298f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 1cd8415746cd9b3eeddab3bcb277cada16c1576a + ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 - + https://github.com/dotnet/test-templates - 1cd8415746cd9b3eeddab3bcb277cada16c1576a + ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 diff --git a/eng/Versions.props b/eng/Versions.props index 72408a3c91a2..23bd6b7fbeba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24531.1 + 1.1.0-rtm.24551.1 From 5edd576b9a3fa2769028495b27244090069a9ca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 13:41:21 +0000 Subject: [PATCH 213/702] Update dependencies from https://github.com/dotnet/test-templates build 20241101.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24551.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 be21fab0f9f7..41c2aadea4ed 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 - 1cd8415746cd9b3eeddab3bcb277cada16c1576a + ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 - + https://github.com/dotnet/test-templates - 1cd8415746cd9b3eeddab3bcb277cada16c1576a + ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 diff --git a/eng/Versions.props b/eng/Versions.props index 17667285ff6e..0cfb2c55b4de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24531.1 + 1.1.0-rtm.24551.1 From 37a43ac89d603942b2aa64aa280c5965256ae3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 1 Nov 2024 08:11:09 -0700 Subject: [PATCH 214/702] Prevent propagation of Ctrl+C to child processes (#44565) --- .../dotnet-watch/EnvironmentOptions.cs | 6 ++ .../dotnet-watch/HotReloadDotNetWatcher.cs | 13 ++- .../dotnet-watch/Internal/IConsole.cs | 5 -- .../dotnet-watch/Internal/PhysicalConsole.cs | 83 +++++++++++++------ .../dotnet-watch/Internal/ProcessRunner.cs | 58 ++++++++++--- src/BuiltInTools/dotnet-watch/Program.cs | 52 +++++++----- .../ConsoleReporterTests.cs | 28 +++---- .../HotReload/ApplyDeltaTests.cs | 23 ++++- .../Utilities/TestConsole.cs | 13 --- test/dotnet-watch.Tests/Watch/ProgramTests.cs | 10 +-- .../Watch/Utilities/WatchableApp.cs | 19 +++++ 11 files changed, 201 insertions(+), 109 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs index f2fb13a8c123..a9488af4feea 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs @@ -17,6 +17,12 @@ internal enum TestFlags /// Elevates the severity of from . /// ElevateWaitingForChangesMessageSeverity = 1 << 2, + + /// + /// Instead of using to watch for Ctrl+C, Ctlr+R, and other keys, read from standard input. + /// This allows tests to trigger key based events. + /// + ReadKeyFromStdin = 1 << 3, } internal sealed record EnvironmentOptions( diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 3ca446c43b30..513c6b0548b0 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -44,8 +44,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke _console.KeyPressed += (key) => { - var modifiers = ConsoleModifiers.Control; - if ((key.Modifiers & modifiers) == modifiers && key.Key == ConsoleKey.R && forceRestartCancellationSource is { } source) + if (key.Modifiers.HasFlag(ConsoleModifiers.Control) && key.Key == ConsoleKey.R && forceRestartCancellationSource is { } source) { // provide immediate feedback to the user: Context.Reporter.Report(source.IsCancellationRequested ? MessageDescriptor.RestartInProgress : MessageDescriptor.RestartRequested); @@ -327,11 +326,6 @@ await Task.WhenAll( } finally { - if (!rootProcessTerminationSource.IsCancellationRequested) - { - rootProcessTerminationSource.Cancel(); - } - if (runtimeProcessLauncher != null) { // Request cleanup of all processes created by the launcher before we terminate the root process. @@ -345,6 +339,11 @@ await Task.WhenAll( await compilationHandler.TerminateNonRootProcessesAndDispose(CancellationToken.None); } + if (!rootProcessTerminationSource.IsCancellationRequested) + { + rootProcessTerminationSource.Cancel(); + } + try { // Wait for the root process to exit. diff --git a/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs b/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs index b166d6ce93b8..926642927498 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs @@ -9,14 +9,9 @@ namespace Microsoft.Extensions.Tools.Internal /// internal interface IConsole { - event ConsoleCancelEventHandler CancelKeyPress; event Action KeyPressed; TextWriter Out { get; } TextWriter Error { get; } - TextReader In { get; } - bool IsInputRedirected { get; } - bool IsOutputRedirected { get; } - bool IsErrorRedirected { get; } ConsoleColor ForegroundColor { get; set; } void ResetColor(); void Clear(); diff --git a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs index c78bb694b219..bf4cc645bc33 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Watcher; + namespace Microsoft.Extensions.Tools.Internal { /// @@ -9,52 +11,81 @@ namespace Microsoft.Extensions.Tools.Internal /// internal sealed class PhysicalConsole : IConsole { - private readonly List> _keyPressedListeners = new(); + public const char CtrlC = '\x03'; + public const char CtrlR = '\x12'; + + public event Action? KeyPressed; - private PhysicalConsole() + public PhysicalConsole(TestFlags testFlags) { Console.OutputEncoding = Encoding.UTF8; - Console.CancelKeyPress += (o, e) => + + bool readFromStdin; + if (testFlags.HasFlag(TestFlags.ReadKeyFromStdin)) { - CancelKeyPress?.Invoke(o, e); - }; + readFromStdin = true; + } + else + { + try + { + Console.TreatControlCAsInput = true; + readFromStdin = false; + } + catch + { + // fails when stdin is redirected + readFromStdin = true; + } + } + + _ = readFromStdin ? ListenToStandardInputAsync() : ListenToConsoleKeyPressAsync(); } - public event Action KeyPressed + private async Task ListenToStandardInputAsync() { - add + using var stream = Console.OpenStandardInput(); + var buffer = new byte[1]; + + while (true) { - _keyPressedListeners.Add(value); - ListenToConsoleKeyPress(); - } + var bytesRead = await stream.ReadAsync(buffer, CancellationToken.None); + if (bytesRead != 1) + { + break; + } + + var c = (char)buffer[0]; - remove => _keyPressedListeners.Remove(value); + // handle all input keys that watcher might consume: + var key = c switch + { + CtrlC => new ConsoleKeyInfo('C', ConsoleKey.C, shift: false, alt: false, control: true), + CtrlR => new ConsoleKeyInfo('R', ConsoleKey.R, shift: false, alt: false, control: true), + >= 'A' and <= 'Z' => new ConsoleKeyInfo(c, ConsoleKey.A + (c - 'A'), shift: false, alt: false, control: false), + _ => default + }; + + if (key.Key != ConsoleKey.None) + { + KeyPressed?.Invoke(key); + } + } } - private void ListenToConsoleKeyPress() - { - Task.Factory.StartNew(() => + private Task ListenToConsoleKeyPressAsync() + => Task.Factory.StartNew(() => { while (true) { var key = Console.ReadKey(intercept: true); - for (var i = 0; i < _keyPressedListeners.Count; i++) - { - _keyPressedListeners[i](key); - } + KeyPressed?.Invoke(key); } }, TaskCreationOptions.LongRunning); - } - - public static IConsole Singleton { get; } = new PhysicalConsole(); - public event ConsoleCancelEventHandler? CancelKeyPress; public TextWriter Error => Console.Error; - public TextReader In => Console.In; public TextWriter Out => Console.Out; - public bool IsInputRedirected => Console.IsInputRedirected; - public bool IsOutputRedirected => Console.IsOutputRedirected; - public bool IsErrorRedirected => Console.IsErrorRedirected; + public ConsoleColor ForegroundColor { get => Console.ForegroundColor; diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs index 06d9fd194327..415624c0bacf 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs @@ -246,19 +246,11 @@ private static void TerminateProcess(Process process, ProcessState state, IRepor if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - process.Kill(); + TerminateWindowsProcess(process, state, reporter); } else { - [DllImport("libc", SetLastError = true, EntryPoint = "kill")] - static extern int sys_kill(int pid, int sig); - - var result = sys_kill(state.ProcessId, state.ForceExit ? SIGKILL : SIGTERM); - if (result != 0) - { - var error = Marshal.GetLastPInvokeError(); - reporter.Verbose($"Error while sending SIGTERM to process {state.ProcessId}: {Marshal.GetPInvokeErrorMessage(error)} (code {error})."); - } + TerminateUnixProcess(state, reporter); } reporter.Verbose($"Process {state.ProcessId} killed."); @@ -272,5 +264,51 @@ private static void TerminateProcess(Process process, ProcessState state, IRepor #endif } } + + private static void TerminateWindowsProcess(Process process, ProcessState state, IReporter reporter) + { + // Needs API: https://github.com/dotnet/runtime/issues/109432 + // Code below does not work because the process creation needs CREATE_NEW_PROCESS_GROUP flag. +#if TODO + if (!state.ForceExit) + { + const uint CTRL_C_EVENT = 0; + + [DllImport("kernel32.dll", SetLastError = true)] + static extern bool GenerateConsoleCtrlEvent(uint dwCtrlEvent, uint dwProcessGroupId); + + [DllImport("kernel32.dll", SetLastError = true)] + static extern bool AttachConsole(uint dwProcessId); + + [DllImport("kernel32.dll", SetLastError = true)] + static extern bool FreeConsole(); + + if (AttachConsole((uint)state.ProcessId) && + GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0) && + FreeConsole()) + { + return; + } + + var error = Marshal.GetLastPInvokeError(); + reporter.Verbose($"Failed to send Ctrl+C to process {state.ProcessId}: {Marshal.GetPInvokeErrorMessage(error)} (code {error})"); + } +#endif + + process.Kill(); + } + + private static void TerminateUnixProcess(ProcessState state, IReporter reporter) + { + [DllImport("libc", SetLastError = true, EntryPoint = "kill")] + static extern int sys_kill(int pid, int sig); + + var result = sys_kill(state.ProcessId, state.ForceExit ? SIGKILL : SIGTERM); + if (result != 0) + { + var error = Marshal.GetLastPInvokeError(); + reporter.Verbose($"Error while sending SIGTERM to process {state.ProcessId}: {Marshal.GetPInvokeErrorMessage(error)} (code {error})."); + } + } } } diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs index 75106f6e67f8..977253f943a5 100644 --- a/src/BuiltInTools/dotnet-watch/Program.cs +++ b/src/BuiltInTools/dotnet-watch/Program.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.Loader; using Microsoft.Build.Graph; @@ -36,10 +37,12 @@ public static async Task Main(string[] args) // Register listeners that load Roslyn-related assemblies from the `Roslyn/bincore` directory. RegisterAssemblyResolutionEvents(sdkRootDirectory); + var environmentOptions = EnvironmentOptions.FromEnvironment(); + var program = TryCreate( args, - PhysicalConsole.Singleton, - EnvironmentOptions.FromEnvironment(), + new PhysicalConsole(environmentOptions.TestFlags), + environmentOptions, EnvironmentVariables.VerboseCliOutput, out var exitCode); @@ -77,6 +80,11 @@ public static async Task Main(string[] args) var workingDirectory = environmentOptions.WorkingDirectory; reporter.Verbose($"Working directory: '{workingDirectory}'"); + if (environmentOptions.TestFlags != TestFlags.None) + { + reporter.Verbose($"Test flags: {environmentOptions.TestFlags}"); + } + string projectPath; try { @@ -97,9 +105,28 @@ public static async Task Main(string[] args) // internal for testing internal async Task RunAsync() { + var shutdownCancellationSourceDisposed = false; var shutdownCancellationSource = new CancellationTokenSource(); var shutdownCancellationToken = shutdownCancellationSource.Token; - console.CancelKeyPress += OnCancelKeyPress; + + console.KeyPressed += key => + { + if (!shutdownCancellationSourceDisposed && key.Modifiers.HasFlag(ConsoleModifiers.Control) && key.Key == ConsoleKey.C) + { + // if we already canceled, we force immediate shutdown: + var forceShutdown = shutdownCancellationSource.IsCancellationRequested; + + if (!forceShutdown) + { + reporter.Report(MessageDescriptor.ShutdownRequested); + shutdownCancellationSource.Cancel(); + } + else + { + Environment.Exit(0); + } + } + }; try { @@ -130,26 +157,9 @@ internal async Task RunAsync() } finally { - console.CancelKeyPress -= OnCancelKeyPress; + shutdownCancellationSourceDisposed = true; shutdownCancellationSource.Dispose(); } - - void OnCancelKeyPress(object? sender, ConsoleCancelEventArgs args) - { - // if we already canceled, we force immediate shutdown: - var forceShutdown = shutdownCancellationSource.IsCancellationRequested; - - if (!forceShutdown) - { - reporter.Report(MessageDescriptor.ShutdownRequested); - shutdownCancellationSource.Cancel(); - args.Cancel = true; - } - else - { - Environment.Exit(0); - } - } } // internal for testing diff --git a/test/dotnet-watch.Tests/ConsoleReporterTests.cs b/test/dotnet-watch.Tests/ConsoleReporterTests.cs index b7c4065cc4e6..da3155fee5ec 100644 --- a/test/dotnet-watch.Tests/ConsoleReporterTests.cs +++ b/test/dotnet-watch.Tests/ConsoleReporterTests.cs @@ -67,12 +67,9 @@ private class TestConsole : IConsole { private readonly StringBuilder _out; private readonly StringBuilder _error; - - event Action IConsole.KeyPressed - { - add { } - remove { } - } + public TextWriter Out { get; } + public TextWriter Error { get; } + public ConsoleColor ForegroundColor { get; set; } public TestConsole() { @@ -82,14 +79,17 @@ public TestConsole() Error = new StringWriter(_error); } - event ConsoleCancelEventHandler IConsole.CancelKeyPress + event Action IConsole.KeyPressed { add { } remove { } } - public string GetOutput() => _out.ToString(); - public string GetError() => _error.ToString(); + public string GetOutput() + => _out.ToString(); + + public string GetError() + => _error.ToString(); public void Clear() { @@ -99,16 +99,8 @@ public void Clear() public void ResetColor() { - ForegroundColor = default(ConsoleColor); + ForegroundColor = default; } - - public TextWriter Out { get; } - public TextWriter Error { get; } - public TextReader In { get; } - public bool IsInputRedirected { get; } - public bool IsOutputRedirected { get; } - public bool IsErrorRedirected { get; } - public ConsoleColor ForegroundColor { get; set; } } } } diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index fa8f184c48af..6e64e9e91dc9 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -387,7 +387,7 @@ public async Task Aspire() Assert.Equal(0, result.ExitCode); var serviceSourcePath = Path.Combine(testAsset.Path, "WatchAspire.ApiService", "Program.cs"); - App.Start(testAsset, ["-lp", "http"], relativeProjectDirectory: "WatchAspire.AppHost"); + App.Start(testAsset, ["-lp", "http"], relativeProjectDirectory: "WatchAspire.AppHost", testFlags: TestFlags.ReadKeyFromStdin); await App.AssertWaitingForChanges(); @@ -409,6 +409,27 @@ public async Task Aspire() // Only one browser should be launched (dashboard). The child process shouldn't launch a browser. Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: "))); + + App.SendControlC(); + + await App.AssertOutputLineStartsWith("dotnet watch 🛑 Shutdown requested. Press Ctrl+C again to force exit."); + + // We don't have means to gracefully terminate process on Windows, see https://github.com/dotnet/runtime/issues/109432 + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + await App.AssertOutputLineStartsWith("dotnet watch ❌ [WatchAspire.ApiService (net9.0)] Exited with error code -1"); + await App.AssertOutputLineStartsWith("dotnet watch ❌ [WatchAspire.AppHost (net9.0)] Exited with error code -1"); + } + else + { + await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Exited"); + await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.AppHost (net9.0)] Exited"); + } + + await App.AssertOutputLineStartsWith("dotnet watch ⭐ Waiting for server to shutdown ..."); + + App.AssertOutputContains("dotnet watch ⭐ Stop session #1"); + App.AssertOutputContains("dotnet watch ⭐ [#1] Sending 'sessionTerminated'"); } } } diff --git a/test/dotnet-watch.Tests/Utilities/TestConsole.cs b/test/dotnet-watch.Tests/Utilities/TestConsole.cs index 4e11c7b8f5d4..909e5e027f6b 100644 --- a/test/dotnet-watch.Tests/Utilities/TestConsole.cs +++ b/test/dotnet-watch.Tests/Utilities/TestConsole.cs @@ -9,7 +9,6 @@ namespace Microsoft.Extensions.Tools.Internal { internal class TestConsole : IConsole { - public event ConsoleCancelEventHandler? CancelKeyPress; public event Action? KeyPressed; private readonly TestOutputWriter _testWriter; @@ -37,18 +36,6 @@ public void PressKey(ConsoleKeyInfo key) KeyPressed.Invoke(key); } - public void PressCancelKey() - { - Assert.NotNull(CancelKeyPress); - - var ctor = typeof(ConsoleCancelEventArgs) - .GetTypeInfo() - .DeclaredConstructors - .Single(c => c.GetParameters().First().ParameterType == typeof(ConsoleSpecialKey)); - - CancelKeyPress.Invoke(this, (ConsoleCancelEventArgs)ctor.Invoke([ConsoleSpecialKey.ControlC])); - } - public void ResetColor() { } diff --git a/test/dotnet-watch.Tests/Watch/ProgramTests.cs b/test/dotnet-watch.Tests/Watch/ProgramTests.cs index cb22f2cc4396..39c31719ea74 100644 --- a/test/dotnet-watch.Tests/Watch/ProgramTests.cs +++ b/test/dotnet-watch.Tests/Watch/ProgramTests.cs @@ -1,19 +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 Microsoft.AspNetCore.Testing; using Microsoft.DotNet.Watcher.Tools; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tests { - public class ProgramTests : DotNetWatchTestBase + public class ProgramTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { - public ProgramTests(ITestOutputHelper logger) - : base(logger) - { - } - [Fact] public async Task ConsoleCancelKey() { @@ -40,7 +34,7 @@ public async Task ConsoleCancelKey() await watching.WaitAsync(); - console.PressCancelKey(); + console.PressKey(new ConsoleKeyInfo('C', ConsoleKey.C, shift: false, alt: false, control: true)); var exitCode = await run; Assert.Equal(0, exitCode); diff --git a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs index c6a0da60a072..3a7c74b2fa71 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs @@ -1,6 +1,7 @@ // 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; using System.Runtime.CompilerServices; using Microsoft.DotNet.Watcher.Tools; using Microsoft.Extensions.Tools.Internal; @@ -18,6 +19,8 @@ internal sealed class WatchableApp(ITestOutputHelper logger) : IDisposable private const string WatchErrorOutputEmoji = "❌"; private const string WatchFileChanged = "dotnet watch ⌚ File changed:"; + public TestFlags TestFlags { get; private set; } + public ITestOutputHelper Logger => logger; public AwaitableProcess Process { get; private set; } @@ -131,11 +134,27 @@ public void Start(TestAsset asset, IEnumerable arguments, string relativ Process = new AwaitableProcess(commandSpec, Logger); Process.Start(); + + TestFlags = testFlags; } public void Dispose() { Process?.Dispose(); } + + public void SendControlC() + => SendKey(PhysicalConsole.CtrlC); + + public void SendControlR() + => SendKey(PhysicalConsole.CtrlR); + + public void SendKey(char c) + { + Assert.True(TestFlags.HasFlag(TestFlags.ReadKeyFromStdin)); + + Process.Process.StandardInput.Write(c); + Process.Process.StandardInput.Flush(); + } } } From 866b72c229460e943c3935be67071daf3f531e98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 16:40:40 +0000 Subject: [PATCH 215/702] Update dependencies from https://github.com/dotnet/msbuild build 20241101.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24531-03 -> To Version 17.13.0-preview-24551-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d83adc03519f..5629ab12a1a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 18eb9edf069c3d01dc08a56612fdabf4578aa32c + 2e2d372f68fe102f2a73031610a5de87acc2db76 - + https://github.com/dotnet/msbuild - 18eb9edf069c3d01dc08a56612fdabf4578aa32c + 2e2d372f68fe102f2a73031610a5de87acc2db76 - + https://github.com/dotnet/msbuild - 18eb9edf069c3d01dc08a56612fdabf4578aa32c + 2e2d372f68fe102f2a73031610a5de87acc2db76 diff --git a/eng/Versions.props b/eng/Versions.props index 72408a3c91a2..7833defc8f42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24531-03 - 17.13.0-preview-24531-03 + 17.13.0-preview-24551-01 + 17.13.0-preview-24551-01 17.11.4 17.12 From 3453fe357920cef22b92868e51359b1f0cc12eba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 18:28:43 +0000 Subject: [PATCH 216/702] Update dependencies from https://github.com/dotnet/fsharp build 20241101.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24529.3 -> To Version 9.0.200-beta.24551.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 d83adc03519f..cbfc2e8e03da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 18eb9edf069c3d01dc08a56612fdabf4578aa32c - + https://github.com/dotnet/fsharp - 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 + 2ede9ec566b2504f1fe38e71bb72e0e0b2965ba5 - + https://github.com/dotnet/fsharp - 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 + 2ede9ec566b2504f1fe38e71bb72e0e0b2965ba5 diff --git a/eng/Versions.props b/eng/Versions.props index 72408a3c91a2..58e3ec58e049 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24529.3 + 13.9.200-beta.24551.1 From f824e83a6d3ebfe4d8cc204257816808f9bb94d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 18:31:01 +0000 Subject: [PATCH 217/702] Update dependencies from https://github.com/dotnet/msbuild build 20241101.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24531-03 -> To Version 17.13.0-preview-24551-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5629ab12a1a9..fd4c286c33a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 2e2d372f68fe102f2a73031610a5de87acc2db76 + 0cce533e766000b2f6218332447c38ab84985070 - + https://github.com/dotnet/msbuild - 2e2d372f68fe102f2a73031610a5de87acc2db76 + 0cce533e766000b2f6218332447c38ab84985070 - + https://github.com/dotnet/msbuild - 2e2d372f68fe102f2a73031610a5de87acc2db76 + 0cce533e766000b2f6218332447c38ab84985070 diff --git a/eng/Versions.props b/eng/Versions.props index 7833defc8f42..2666d0c57c78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24551-01 - 17.13.0-preview-24551-01 + 17.13.0-preview-24551-02 + 17.13.0-preview-24551-02 17.11.4 17.12 From f0c33912d481b3de4302c69e5c540269fffbff0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 19:40:34 +0000 Subject: [PATCH 218/702] Update dependencies from https://github.com/dotnet/roslyn build 20241101.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24531.4 -> To Version 4.13.0-2.24551.1 --- 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 19e032e608c0..a34b349af102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d - + https://github.com/dotnet/roslyn - 9bb57bf3b4a88a3d3c1fabb95e7b34d03da1478c + 6217b5c7e33c562117429ae2e64bc128f5ca104d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 616e7700302c..ad4acb313492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 - 4.13.0-2.24531.4 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 + 4.13.0-2.24551.1 From dffa266bfe4fa90da3f3b9e2f5968f6ca7b8467b Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 1 Nov 2024 13:37:19 -0700 Subject: [PATCH 219/702] Increased the timeout for Arm64 test builds to 90 minutes. --- .vsts-ci.yml | 1 + .vsts-pr.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 0855f3480606..543a786bf890 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -300,6 +300,7 @@ extends: vmImage: macOS-latest os: macOS helixTargetQueue: osx.13.arm64 + timeoutInMinutes: 90 macOSJobParameterSets: - categoryName: TestBuild buildArchitecture: arm64 diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 854e3d6231b8..900a00fbe8f3 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -66,6 +66,7 @@ stages: vmImage: macOS-latest os: macOS helixTargetQueue: osx.13.arm64.open + timeoutInMinutes: 90 macOSJobParameterSets: - categoryName: TestBuild buildArchitecture: arm64 From a62484e28c5e92a4596306f57991fabd2809468d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 20:44:40 +0000 Subject: [PATCH 220/702] Update dependencies from https://github.com/nuget/nuget.client build 6.12.1.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.0-rc.127 -> To Version 6.12.1-rc.1 --- NuGet.config | 10 ++++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 271f01d9bbb9..97b52fb41d81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,10 +21,20 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d53bbdda8061..6c840a82a241 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,74 +143,74 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/nuget/nuget.client - 19756345139c45de23bd196e9b4be01d48e84fdd + aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1c2b6d64a547..14841d8cdc45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,18 +153,18 @@ - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 - 6.12.0-rc.127 + 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 From 3d3a8c60633a2f2e3d8ab469903be893425d5faa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 21:38:25 +0000 Subject: [PATCH 221/702] Update dependencies from https://github.com/dotnet/razor build 20241101.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24531.4 -> To Version 9.0.0-preview.24551.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19e032e608c0..13c279e1980f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 6ff656614e80cb0376bffcc9a5e965bb340d555f + c37ef3927a30c5d3f6dabe825c00eb345eccfd06 - + https://github.com/dotnet/razor - 6ff656614e80cb0376bffcc9a5e965bb340d555f + c37ef3927a30c5d3f6dabe825c00eb345eccfd06 - + https://github.com/dotnet/razor - 6ff656614e80cb0376bffcc9a5e965bb340d555f + c37ef3927a30c5d3f6dabe825c00eb345eccfd06 - + https://github.com/dotnet/razor - 6ff656614e80cb0376bffcc9a5e965bb340d555f + c37ef3927a30c5d3f6dabe825c00eb345eccfd06 diff --git a/eng/Versions.props b/eng/Versions.props index 616e7700302c..1b1586b3e063 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24531.4 - 9.0.0-preview.24531.4 - 9.0.0-preview.24531.4 + 9.0.0-preview.24551.2 + 9.0.0-preview.24551.2 + 9.0.0-preview.24551.2 From 498dffb247030a24a901efba33a0213a2fe47ec0 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 1 Nov 2024 15:10:25 -0700 Subject: [PATCH 222/702] Reverted job timeout change. Increased Helix work item timeout to 60 mins. --- .vsts-ci.yml | 1 - .vsts-pr.yml | 1 - test/UnitTests.proj | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 543a786bf890..0855f3480606 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -300,7 +300,6 @@ extends: vmImage: macOS-latest os: macOS helixTargetQueue: osx.13.arm64 - timeoutInMinutes: 90 macOSJobParameterSets: - categoryName: TestBuild buildArchitecture: arm64 diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 900a00fbe8f3..854e3d6231b8 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -66,7 +66,6 @@ stages: vmImage: macOS-latest os: macOS helixTargetQueue: osx.13.arm64.open - timeoutInMinutes: 90 macOSJobParameterSets: - categoryName: TestBuild buildArchitecture: arm64 diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 4483173428dc..07502976bda3 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -8,7 +8,7 @@ true - 00:45:00 + 00:60:00 From d8b8f8caa3a5fab8957efbda269d84022270a491 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 1 Nov 2024 15:26:40 -0700 Subject: [PATCH 223/702] Used 1 hour instead of 60 minutes. --- test/UnitTests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTests.proj b/test/UnitTests.proj index 07502976bda3..cac7a0cd6d35 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -8,7 +8,7 @@ true - 00:60:00 + 01:00:00 From 35942c9595a85a3efcd932a10cafa00b3418e0a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 23:06:52 +0000 Subject: [PATCH 224/702] Update dependencies from https://github.com/dotnet/razor build 20241101.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24531.4 -> To Version 9.0.0-preview.24551.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13c279e1980f..9de59f737823 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - c37ef3927a30c5d3f6dabe825c00eb345eccfd06 + 70abe7163ba7bf45965d8d5af9bf08813a3ba974 - + https://github.com/dotnet/razor - c37ef3927a30c5d3f6dabe825c00eb345eccfd06 + 70abe7163ba7bf45965d8d5af9bf08813a3ba974 - + https://github.com/dotnet/razor - c37ef3927a30c5d3f6dabe825c00eb345eccfd06 + 70abe7163ba7bf45965d8d5af9bf08813a3ba974 - + https://github.com/dotnet/razor - c37ef3927a30c5d3f6dabe825c00eb345eccfd06 + 70abe7163ba7bf45965d8d5af9bf08813a3ba974 diff --git a/eng/Versions.props b/eng/Versions.props index 1b1586b3e063..0ca3584af82f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24551.2 - 9.0.0-preview.24551.2 - 9.0.0-preview.24551.2 + 9.0.0-preview.24551.3 + 9.0.0-preview.24551.3 + 9.0.0-preview.24551.3 From 2c29f947cf7191d71cc858faf2f0396fff68ad7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Nov 2024 23:42:21 +0000 Subject: [PATCH 225/702] Update dependencies from https://github.com/dotnet/roslyn build 20241101.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24531.4 -> To Version 4.13.0-2.24551.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a34b349af102..bd05cb9b79ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 02f6bb08e742b0bb1cfd8cd7c104c5ddbcc4cbf8 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 - + https://github.com/dotnet/roslyn - 6217b5c7e33c562117429ae2e64bc128f5ca104d + cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ad4acb313492..5f987b8343d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 - 4.13.0-2.24551.1 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 + 4.13.0-2.24551.4 From c08440ffefc967004df15e13ebb311814feb7efd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Nov 2024 10:34:23 +0000 Subject: [PATCH 226/702] Update dependencies from https://github.com/dotnet/razor build 20241103.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24531.4 -> To Version 9.0.0-preview.24553.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b89b759dc1ab..209b37ecbb94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 70abe7163ba7bf45965d8d5af9bf08813a3ba974 + ad744393845dd7c55b94ad6097041c6658d8c877 - + https://github.com/dotnet/razor - 70abe7163ba7bf45965d8d5af9bf08813a3ba974 + ad744393845dd7c55b94ad6097041c6658d8c877 - + https://github.com/dotnet/razor - 70abe7163ba7bf45965d8d5af9bf08813a3ba974 + ad744393845dd7c55b94ad6097041c6658d8c877 - + https://github.com/dotnet/razor - 70abe7163ba7bf45965d8d5af9bf08813a3ba974 + ad744393845dd7c55b94ad6097041c6658d8c877 diff --git a/eng/Versions.props b/eng/Versions.props index 65901664b36c..18fd8d21920e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24551.3 - 9.0.0-preview.24551.3 - 9.0.0-preview.24551.3 + 9.0.0-preview.24553.1 + 9.0.0-preview.24553.1 + 9.0.0-preview.24553.1 From 1a7b50033acfd7012424558f1c18bd01b305ac6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Nov 2024 10:38:09 +0000 Subject: [PATCH 227/702] Update dependencies from https://github.com/dotnet/razor build 20241103.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24531.4 -> To Version 9.0.0-preview.24553.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 209b37ecbb94..cc52cc9e4e07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - ad744393845dd7c55b94ad6097041c6658d8c877 + a37ee126f87e6f5f0a9c0e51f085f8f097875315 - + https://github.com/dotnet/razor - ad744393845dd7c55b94ad6097041c6658d8c877 + a37ee126f87e6f5f0a9c0e51f085f8f097875315 - + https://github.com/dotnet/razor - ad744393845dd7c55b94ad6097041c6658d8c877 + a37ee126f87e6f5f0a9c0e51f085f8f097875315 - + https://github.com/dotnet/razor - ad744393845dd7c55b94ad6097041c6658d8c877 + a37ee126f87e6f5f0a9c0e51f085f8f097875315 diff --git a/eng/Versions.props b/eng/Versions.props index 18fd8d21920e..67f2aa81af7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24553.1 - 9.0.0-preview.24553.1 - 9.0.0-preview.24553.1 + 9.0.0-preview.24553.2 + 9.0.0-preview.24553.2 + 9.0.0-preview.24553.2 From e24d6a566a053879adfe186a69620150bfb37b6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 09:51:55 +0000 Subject: [PATCH 228/702] Update dependencies from https://github.com/dotnet/msbuild build 20241104.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24551-02 -> To Version 17.13.0-preview-24554-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ad4b058fd2..c2a09e904e16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 0cce533e766000b2f6218332447c38ab84985070 + 5facb26eb231af66154531735cbc1a0026e897f0 - + https://github.com/dotnet/msbuild - 0cce533e766000b2f6218332447c38ab84985070 + 5facb26eb231af66154531735cbc1a0026e897f0 - + https://github.com/dotnet/msbuild - 0cce533e766000b2f6218332447c38ab84985070 + 5facb26eb231af66154531735cbc1a0026e897f0 diff --git a/eng/Versions.props b/eng/Versions.props index c56c9f134458..8c546de83826 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24551-02 - 17.13.0-preview-24551-02 + 17.13.0-preview-24554-02 + 17.13.0-preview-24554-02 17.11.4 17.12 From 153cb4fe0c7c52d252186076bb8818ab63ebfe54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 10:05:09 +0000 Subject: [PATCH 229/702] Update dependencies from https://github.com/dotnet/test-templates build 20241104.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24551.1 -> To Version 1.1.0-rtm.24554.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 35ad4b058fd2..f3969810efb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 + cfb55bfa45eea729ab2ac64f44d47b7547dc979c - + https://github.com/dotnet/test-templates - ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 + cfb55bfa45eea729ab2ac64f44d47b7547dc979c diff --git a/eng/Versions.props b/eng/Versions.props index c56c9f134458..940f899dc30f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24551.1 + 1.1.0-rtm.24554.1 From de158793ca51b5d03e1acd1c6d3e7a9bdfdfaec2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 10:05:16 +0000 Subject: [PATCH 230/702] Update dependencies from https://github.com/dotnet/test-templates build 20241104.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24554.1 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8eead538bea8..97b52fb41d81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,6 +29,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41c2aadea4ed..afb9f69baf3f 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 - ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 + cfb55bfa45eea729ab2ac64f44d47b7547dc979c - + https://github.com/dotnet/test-templates - ba61a1355016f1ef13f6c7b6e8c23b8d9160d004 + cfb55bfa45eea729ab2ac64f44d47b7547dc979c diff --git a/eng/Versions.props b/eng/Versions.props index 0cfb2c55b4de..6bcd26929d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24551.1 + 1.1.0-rtm.24554.1 From 0442fc58fa3ee5278be17a5b05a0ce33edfe6d50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 10:26:29 +0000 Subject: [PATCH 231/702] Update dependencies from https://github.com/dotnet/razor build 20241104.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24553.2 -> To Version 9.0.0-preview.24554.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ad4b058fd2..1ea11dbcfacd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - a37ee126f87e6f5f0a9c0e51f085f8f097875315 + 123b17b69bff8feddc4f0652a3e1895ec6ac49eb - + https://github.com/dotnet/razor - a37ee126f87e6f5f0a9c0e51f085f8f097875315 + 123b17b69bff8feddc4f0652a3e1895ec6ac49eb - + https://github.com/dotnet/razor - a37ee126f87e6f5f0a9c0e51f085f8f097875315 + 123b17b69bff8feddc4f0652a3e1895ec6ac49eb - + https://github.com/dotnet/razor - a37ee126f87e6f5f0a9c0e51f085f8f097875315 + 123b17b69bff8feddc4f0652a3e1895ec6ac49eb diff --git a/eng/Versions.props b/eng/Versions.props index c56c9f134458..7aee82dc7b71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24553.2 - 9.0.0-preview.24553.2 - 9.0.0-preview.24553.2 + 9.0.0-preview.24554.1 + 9.0.0-preview.24554.1 + 9.0.0-preview.24554.1 From 1efca884502429f3348353d6923032606805f502 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 12:10:21 +0000 Subject: [PATCH 232/702] Update dependencies from https://github.com/dotnet/fsharp build 20241104.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24551.1 -> To Version 9.0.200-beta.24554.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 35ad4b058fd2..fa1b46fa8f7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 0cce533e766000b2f6218332447c38ab84985070 - + https://github.com/dotnet/fsharp - 2ede9ec566b2504f1fe38e71bb72e0e0b2965ba5 + 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/fsharp - 2ede9ec566b2504f1fe38e71bb72e0e0b2965ba5 + 6dcaa8d887951003c56332dc40be6af56dd40c69 diff --git a/eng/Versions.props b/eng/Versions.props index c56c9f134458..4759bdd4ccb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24551.1 + 13.9.200-beta.24554.1 From fa5167678216a28e650f193dface72a578df36dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 14:58:57 +0000 Subject: [PATCH 233/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241104.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.24531.2 -> To Version 9.0.0-beta.24554.1 --- 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 35ad4b058fd2..bdb7b3b728e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c diff --git a/eng/Versions.props b/eng/Versions.props index c56c9f134458..16c73e3eee1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 + 9.0.0-beta.24554.1 + 9.0.0-beta.24554.1 + 9.0.0-beta.24554.1 + 9.0.0-beta.24554.1 + 9.0.0-beta.24554.1 + 9.0.0-beta.24554.1 From 36017a8cd83be07c6ce4df053f36b05f5c4f79a4 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 4 Nov 2024 12:13:21 -0500 Subject: [PATCH 234/702] Switch mock workload resolver to 8.0.100 This fixes a test which was testing an update to workload set 8.0.302 --- test/dotnet-workload-search.Tests/MockWorkloadResolver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dotnet-workload-search.Tests/MockWorkloadResolver.cs b/test/dotnet-workload-search.Tests/MockWorkloadResolver.cs index 45120fe3d04a..9ba675d348d8 100644 --- a/test/dotnet-workload-search.Tests/MockWorkloadResolver.cs +++ b/test/dotnet-workload-search.Tests/MockWorkloadResolver.cs @@ -38,8 +38,8 @@ public void RefreshWorkloadManifests() { /* noop */ } public string GetManifestFeatureBand(string manifestId) => throw new NotImplementedException(); public IEnumerable GetInstalledManifests() => _installedManifests ?? throw new NotImplementedException(); public IWorkloadResolver CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException(); - public string GetSdkFeatureBand() => "12.0.400"; - public IWorkloadManifestProvider.WorkloadVersionInfo GetWorkloadVersion() => new IWorkloadManifestProvider.WorkloadVersionInfo("12.0.400.2"); + public string GetSdkFeatureBand() => "8.0.100"; + public IWorkloadManifestProvider.WorkloadVersionInfo GetWorkloadVersion() => new IWorkloadManifestProvider.WorkloadVersionInfo("8.0.100.2"); public IEnumerable GetUpdatedWorkloads(WorkloadResolver advertisingManifestResolver, IEnumerable installedWorkloads) => throw new NotImplementedException(); WorkloadResolver IWorkloadResolver.CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException(); WorkloadManifest IWorkloadResolver.GetManifestFromWorkload(WorkloadId workloadId) => throw new NotImplementedException(); From e59db0633f90913f5ec71b880e6ac6020a18e680 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 21:15:05 +0000 Subject: [PATCH 235/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24554.1 --- 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 6e7a8f53b4c3..d63d9b635971 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e - + https://github.com/dotnet/roslyn - cbb2d124058fc80051c9d5e9d798d22e8d5aaab3 + 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 524632606b4d..9010b8a20a9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 - 4.13.0-2.24551.4 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 + 4.13.0-2.24554.1 From 5ce40c106c54c7a18983906a047958c446a34b56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 21:46:59 +0000 Subject: [PATCH 236/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24554.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d63d9b635971..b9a9940ecad6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 - + https://github.com/dotnet/roslyn - 36e1fe3c27adb70b3ad49c9d51d7cc19d88e656e + 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9010b8a20a9e..329867b0cfc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 - 4.13.0-2.24554.1 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 + 4.13.0-2.24554.4 From 8eb2bfd2de024ead91e5115416492dc78a017791 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 22:43:58 +0000 Subject: [PATCH 237/702] Update dependencies from https://github.com/dotnet/razor build 20241104.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24553.2 -> To Version 9.0.0-preview.24554.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ea11dbcfacd..e7aa4a4a118f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 123b17b69bff8feddc4f0652a3e1895ec6ac49eb + b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 - + https://github.com/dotnet/razor - 123b17b69bff8feddc4f0652a3e1895ec6ac49eb + b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 - + https://github.com/dotnet/razor - 123b17b69bff8feddc4f0652a3e1895ec6ac49eb + b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 - + https://github.com/dotnet/razor - 123b17b69bff8feddc4f0652a3e1895ec6ac49eb + b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 diff --git a/eng/Versions.props b/eng/Versions.props index 7aee82dc7b71..19e5a7875a5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24554.1 - 9.0.0-preview.24554.1 - 9.0.0-preview.24554.1 + 9.0.0-preview.24554.3 + 9.0.0-preview.24554.3 + 9.0.0-preview.24554.3 From 2bb22268575f8aad377e661ca25abef949cca842 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 23:47:58 +0000 Subject: [PATCH 238/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24554.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9a9940ecad6..3fbc96717c19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 - + https://github.com/dotnet/roslyn - 00b8c9e89e65cc5446aa32c5a61aaa8c70887c96 + 985a2a3efa482ed53f35f4680369bb232ba7be68 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 329867b0cfc5..749986880478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 - 4.13.0-2.24554.4 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 + 4.13.0-2.24554.5 From ba280be0e68ee601e3f3f155838f5153a480739c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 00:08:14 +0000 Subject: [PATCH 239/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.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.13.0-2.24551.4 -> To Version 4.13.0-2.24554.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 3fbc96717c19..5a8c1975ba99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa - + https://github.com/dotnet/roslyn - 985a2a3efa482ed53f35f4680369bb232ba7be68 + f2eab908fa6d53a93f2a68d4dfdacd82de4204fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 749986880478..b23e994d979c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 - 4.13.0-2.24554.5 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 + 4.13.0-2.24554.7 From a451f4d4472ac90c2bd7b27524cff34721e85589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 01:02:42 +0000 Subject: [PATCH 240/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241104.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.24554.1 -> To Version 9.0.0-beta.24554.2 --- 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 6e7a8f53b4c3..3c9d8d3fc71c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink 30158dbab8aa11592c27561d9710cd7e5239ea3c diff --git a/eng/Versions.props b/eng/Versions.props index 524632606b4d..104c8e3f0618 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24554.1 - 9.0.0-beta.24554.1 - 9.0.0-beta.24554.1 - 9.0.0-beta.24554.1 - 9.0.0-beta.24554.1 - 9.0.0-beta.24554.1 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 From f8062547fa370ff12402adc585ae8e961c022cd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 02:24:43 +0000 Subject: [PATCH 241/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.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.13.0-2.24551.4 -> To Version 4.13.0-2.24554.8 --- 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 5a8c1975ba99..f207de45c8c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 - + https://github.com/dotnet/roslyn - f2eab908fa6d53a93f2a68d4dfdacd82de4204fa + 8fc87e00bbe35131f7d3707621ae18e1af1aae55 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b23e994d979c..57f62036a8ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 - 4.13.0-2.24554.7 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 + 4.13.0-2.24554.8 From 26bc198f866b5bcf5c6d2a0d40cc0a314b9ed481 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 02:56:50 +0000 Subject: [PATCH 242/702] Update dependencies from https://github.com/dotnet/msbuild build 20241105.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24551-02 -> To Version 17.13.0-preview-24555-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a09e904e16..6da6001370f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 5facb26eb231af66154531735cbc1a0026e897f0 + a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 - + https://github.com/dotnet/msbuild - 5facb26eb231af66154531735cbc1a0026e897f0 + a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 - + https://github.com/dotnet/msbuild - 5facb26eb231af66154531735cbc1a0026e897f0 + a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 diff --git a/eng/Versions.props b/eng/Versions.props index 8c546de83826..d47df27d0b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24554-02 - 17.13.0-preview-24554-02 + 17.13.0-preview-24555-01 + 17.13.0-preview-24555-01 17.11.4 17.12 From 8b71fe45e40e1e45207d24049a4b071e6e20139c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 08:53:08 +0000 Subject: [PATCH 243/702] Update dependencies from https://github.com/dotnet/razor build 20241104.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.24554.3 -> To Version 9.0.0-preview.24554.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a611b81d0624..780931d513ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 + dab429d0cd6c5b5c7550e5591837b91df4478a6b - + https://github.com/dotnet/razor - b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 + dab429d0cd6c5b5c7550e5591837b91df4478a6b - + https://github.com/dotnet/razor - b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 + dab429d0cd6c5b5c7550e5591837b91df4478a6b - + https://github.com/dotnet/razor - b7186c440dcd5b8b4fe9826d7fc565dafa4390f4 + dab429d0cd6c5b5c7550e5591837b91df4478a6b diff --git a/eng/Versions.props b/eng/Versions.props index 23e1cd6646d6..d705390733b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24554.3 - 9.0.0-preview.24554.3 - 9.0.0-preview.24554.3 + 9.0.0-preview.24554.7 + 9.0.0-preview.24554.7 + 9.0.0-preview.24554.7 From 670252ba1881e547c371f24516aed6d709252b97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 11:21:54 +0000 Subject: [PATCH 244/702] Update dependencies from https://github.com/dotnet/razor build 20241105.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24554.3 -> To Version 9.0.0-preview.24555.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 780931d513ad..adf44e77d871 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - dab429d0cd6c5b5c7550e5591837b91df4478a6b + f89cf41c612d3defd486dd6ee4868e53e6a88781 - + https://github.com/dotnet/razor - dab429d0cd6c5b5c7550e5591837b91df4478a6b + f89cf41c612d3defd486dd6ee4868e53e6a88781 - + https://github.com/dotnet/razor - dab429d0cd6c5b5c7550e5591837b91df4478a6b + f89cf41c612d3defd486dd6ee4868e53e6a88781 - + https://github.com/dotnet/razor - dab429d0cd6c5b5c7550e5591837b91df4478a6b + f89cf41c612d3defd486dd6ee4868e53e6a88781 diff --git a/eng/Versions.props b/eng/Versions.props index d705390733b0..1bb552741f5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24554.7 - 9.0.0-preview.24554.7 - 9.0.0-preview.24554.7 + 9.0.0-preview.24555.3 + 9.0.0-preview.24555.3 + 9.0.0-preview.24555.3 From 89782782d51b2e5838a51d1ed2f5f7cef9b293db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 11:32:13 +0000 Subject: [PATCH 245/702] Update dependencies from https://github.com/dotnet/msbuild build 20241105.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24555-01 -> To Version 17.13.0-preview-24555-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a611b81d0624..d43d7260684f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 + d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c - + https://github.com/dotnet/msbuild - a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 + d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c - + https://github.com/dotnet/msbuild - a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 + d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c diff --git a/eng/Versions.props b/eng/Versions.props index 23e1cd6646d6..5bef38410db8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24555-01 - 17.13.0-preview-24555-01 + 17.13.0-preview-24555-02 + 17.13.0-preview-24555-02 17.11.4 17.12 From ad59b4740c6be3344946dcad2c29ba391e489966 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 12:20:08 +0000 Subject: [PATCH 246/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.57 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.52 -> To Version 6.13.0-preview.1.57 --- 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 a611b81d0624..6bd55b64bbf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b - + https://github.com/nuget/nuget.client - edb1d2f0a148e80a1b2c86bc930ca55f09635aa4 + b34beb6039fba765b922a4b7d654a8cacb04185b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 23e1cd6646d6..5949b7a9b99c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 - 6.13.0-preview.1.52 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 + 6.13.0-preview.1.57 From b31ab62b347ce917548f9ce0b35c07d709caeed0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 12:38:05 +0000 Subject: [PATCH 247/702] Update dependencies from https://github.com/dotnet/razor build 20241105.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24554.3 -> To Version 9.0.0-preview.24555.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adf44e77d871..aed10913c4d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f89cf41c612d3defd486dd6ee4868e53e6a88781 + d0a5326f2b715919541fe9b37789539a0f28e1cf - + https://github.com/dotnet/razor - f89cf41c612d3defd486dd6ee4868e53e6a88781 + d0a5326f2b715919541fe9b37789539a0f28e1cf - + https://github.com/dotnet/razor - f89cf41c612d3defd486dd6ee4868e53e6a88781 + d0a5326f2b715919541fe9b37789539a0f28e1cf - + https://github.com/dotnet/razor - f89cf41c612d3defd486dd6ee4868e53e6a88781 + d0a5326f2b715919541fe9b37789539a0f28e1cf diff --git a/eng/Versions.props b/eng/Versions.props index 1bb552741f5d..a26cf96b1c9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.3 - 9.0.0-preview.24555.3 - 9.0.0-preview.24555.3 + 9.0.0-preview.24555.4 + 9.0.0-preview.24555.4 + 9.0.0-preview.24555.4 From b60b6256902b12ddd61fe8beefbc0bb5430d75e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 12:53:17 +0000 Subject: [PATCH 248/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24555.1 --- 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 f207de45c8c6..e27383674a93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 - + https://github.com/dotnet/roslyn - 8fc87e00bbe35131f7d3707621ae18e1af1aae55 + 9dcb2a31699f7d09974c9b5af571b102b291ee44 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 57f62036a8ac..bb9ed5e97d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 - 4.13.0-2.24554.8 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 + 4.13.0-2.24555.1 From 1e24195b11095677245afa7dfd80aa7b4c868a3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 13:56:42 +0000 Subject: [PATCH 249/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24523.10 -> To Version 4.12.0-3.24554.3 --- NuGet.config | 3 +++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8eead538bea8..3e87cf77613e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,6 +29,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bc4373208fc..8dbf15d72e3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d - + https://github.com/dotnet/roslyn - c33947608898e0194abf6b6d45ffdb4cf1f0d6f0 + 26920eb85c829675ba662ad6db36a17dc591638d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 68ce77f0c271..42b3d36ccc47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 - 4.12.0-3.24531.8 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 + 4.12.0-3.24554.3 From 7af615fb04b6adc9d97654fe3af94ac5df344340 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 13:57:12 +0000 Subject: [PATCH 250/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241104.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.24522.2 -> To Version 9.0.0-beta.24554.2 --- NuGet.config | 3 +++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8eead538bea8..3e87cf77613e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,6 +29,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 469d4445e07d..6089c4edb1b5 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 - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c - + https://github.com/dotnet/sourcelink - 2dd43fb4a61fa12a918203f91a85bb22e33ce4c9 + 30158dbab8aa11592c27561d9710cd7e5239ea3c diff --git a/eng/Versions.props b/eng/Versions.props index 86ac135e556f..a5d85b84ff13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 - 9.0.0-beta.24531.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 + 9.0.0-beta.24554.2 From 085ef9c07a5ec16b65817f794acc065bb925fcf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 14:56:32 +0000 Subject: [PATCH 251/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241105.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.24554.1 -> To Version 9.0.0-beta.24555.1 --- 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 3c9d8d3fc71c..4ad7df707cbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + b7fa6e76d524dc33698de18617c7a6f49ce207ce diff --git a/eng/Versions.props b/eng/Versions.props index 104c8e3f0618..6892b42ea31e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 + 9.0.0-beta.24555.1 + 9.0.0-beta.24555.1 + 9.0.0-beta.24555.1 + 9.0.0-beta.24555.1 + 9.0.0-beta.24555.1 + 9.0.0-beta.24555.1 From 1ffd580a5532fe6d765d2ce84785d6389d808747 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 15:50:43 +0000 Subject: [PATCH 252/702] Update dependencies from https://github.com/dotnet/test-templates build 20241105.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24554.1 -> To Version 1.1.0-rtm.24555.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 a611b81d0624..93e7a79acbcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - cfb55bfa45eea729ab2ac64f44d47b7547dc979c + 1ab4caea85ef1ccdb735be3e8a908f4728daf624 - + https://github.com/dotnet/test-templates - cfb55bfa45eea729ab2ac64f44d47b7547dc979c + 1ab4caea85ef1ccdb735be3e8a908f4728daf624 diff --git a/eng/Versions.props b/eng/Versions.props index 23e1cd6646d6..17f3f87ceea5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24554.1 + 1.1.0-rtm.24555.1 From c0124ec598f7e05d69e8b85433fc336ae1867ba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 15:50:46 +0000 Subject: [PATCH 253/702] Update dependencies from https://github.com/dotnet/test-templates build 20241105.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24523.2 -> To Version 1.1.0-rtm.24555.1 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97b52fb41d81..3e87cf77613e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,6 +29,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afb9f69baf3f..56a6a31f4891 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 - cfb55bfa45eea729ab2ac64f44d47b7547dc979c + 1ab4caea85ef1ccdb735be3e8a908f4728daf624 - + https://github.com/dotnet/test-templates - cfb55bfa45eea729ab2ac64f44d47b7547dc979c + 1ab4caea85ef1ccdb735be3e8a908f4728daf624 diff --git a/eng/Versions.props b/eng/Versions.props index 6bcd26929d1a..0b9d33a22c16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24554.1 + 1.1.0-rtm.24555.1 From 8a334987138b8ba713a2212550657f3549509aa6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 16:24:21 +0000 Subject: [PATCH 254/702] Update dependencies from https://github.com/dotnet/msbuild build 20241105.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24555-01 -> To Version 17.13.0-preview-24555-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d43d7260684f..42c2832a2509 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c + b7195ce54619126f615001bd4e4115059595a177 - + https://github.com/dotnet/msbuild - d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c + b7195ce54619126f615001bd4e4115059595a177 - + https://github.com/dotnet/msbuild - d8d42efee8dbe0aa0f08ed85e98327e315ba2b6c + b7195ce54619126f615001bd4e4115059595a177 diff --git a/eng/Versions.props b/eng/Versions.props index 5bef38410db8..38ac35239f1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24555-02 - 17.13.0-preview-24555-02 + 17.13.0-preview-24555-03 + 17.13.0-preview-24555-03 17.11.4 17.12 From b6bda1d7363c97aba2a77bf2ec5a4a1d1f8b968d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 17:36:24 +0000 Subject: [PATCH 255/702] Update dependencies from https://github.com/dotnet/fsharp build 20241105.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24554.1 -> To Version 9.0.200-beta.24555.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 a611b81d0624..1569fa9230d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ a6b18fc5e32583dcbaa0e3c44258a5762a9af4f1 - + https://github.com/dotnet/fsharp - 6dcaa8d887951003c56332dc40be6af56dd40c69 + 6d6e689c213288b47f0bd042fc8d27f135246808 - + https://github.com/dotnet/fsharp - 6dcaa8d887951003c56332dc40be6af56dd40c69 + 6d6e689c213288b47f0bd042fc8d27f135246808 diff --git a/eng/Versions.props b/eng/Versions.props index 23e1cd6646d6..3793e4519efb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24554.1 + 13.9.200-beta.24555.1 From 72cc0710b6d4d89ad7b41cbc651f872c086e19ca Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:44:35 -0800 Subject: [PATCH 256/702] 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 f0a3400476ca6a3337288b95162c9645ded9a3a4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:44:41 -0800 Subject: [PATCH 257/702] Update branding to 8.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1a3c9f9a2d5f..b68eb6b280bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.307 + 8.0.308 8.0.300 true From 6b45032c19680cbc0d977ff34a94b221c2133252 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:44:46 -0800 Subject: [PATCH 258/702] Update branding to 8.0.405 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9bf0c4a98984..58d499091f57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.404 + 8.0.405 8.0.400 true From 2eb86351e1af93904e52b2c69dd596a024101c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 20:52:26 +0000 Subject: [PATCH 259/702] Update dependencies from https://github.com/dotnet/templating build 20241105.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-rtm.24518.2 -> To Version 9.0.101-servicing.24555.6 --- NuGet.config | 7 +------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 271f01d9bbb9..309c8dd023a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,12 +20,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d53bbdda8061..33638a4a5cb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 diff --git a/eng/Versions.props b/eng/Versions.props index 1c2b6d64a547..4ab034b17d9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,13 +203,13 @@ - 9.0.100 + 9.0.101 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-rtm.24518.2 + 9.0.101-servicing.24555.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 00555dabbe0fcd556cbc2a8249b3b584926b0a85 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Date: Tue, 5 Nov 2024 22:25:52 +0100 Subject: [PATCH 260/702] Set mediaType from http response if manifest mediaType is not present (#44530) --- .../Microsoft.NET.Build.Containers/BuiltImage.cs | 5 +++++ .../Microsoft.NET.Build.Containers/ImageBuilder.cs | 7 +++++-- .../Microsoft.NET.Build.Containers/ManifestV2.cs | 2 +- .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 2 +- .../Registry/DefaultManifestOperations.cs | 4 ++-- .../Registry/IManifestOperations.cs | 2 +- .../Registry/Registry.cs | 11 +++++++---- .../ImageBuilderTests.cs | 2 +- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs index b3bb668fca28..64d4e9a528ef 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs @@ -33,6 +33,11 @@ internal readonly struct BuiltImage /// internal required ManifestV2 Manifest { get; init; } + /// + /// Gets manifest mediaType. + /// + internal required string ManifestMediaType { get; init; } + /// /// Gets layers descriptors. /// diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs index 92d81fc8813a..cc832263f909 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs @@ -19,6 +19,7 @@ internal sealed class ImageBuilder // the mutable internal manifest that we're building by modifying the base and applying customizations private readonly ManifestV2 _manifest; + private readonly string _manifestMediaType; private readonly ImageConfig _baseImageConfig; private readonly ILogger _logger; @@ -33,12 +34,13 @@ internal sealed class ImageBuilder /// /// MediaType of the output manifest. /// - public string ManifestMediaType => _manifest.MediaType; // output the same media type as the base image manifest. + public string ManifestMediaType => _manifestMediaType; // output the same media type as the base image manifest. - internal ImageBuilder(ManifestV2 manifest, ImageConfig baseImageConfig, ILogger logger) + internal ImageBuilder(ManifestV2 manifest, string manifestMediaType, ImageConfig baseImageConfig, ILogger logger) { _baseImageManifest = manifest; _manifest = new ManifestV2() { SchemaVersion = manifest.SchemaVersion, Config = manifest.Config, Layers = new(manifest.Layers), MediaType = manifest.MediaType }; + _manifestMediaType = manifestMediaType; _baseImageConfig = baseImageConfig; _logger = logger; } @@ -83,6 +85,7 @@ internal BuiltImage Build() ImageSha = imageSha, ImageSize = imageSize, Manifest = newManifest, + ManifestMediaType = ManifestMediaType }; } diff --git a/src/Containers/Microsoft.NET.Build.Containers/ManifestV2.cs b/src/Containers/Microsoft.NET.Build.Containers/ManifestV2.cs index 30937d782a4b..b4334c5e26db 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ManifestV2.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ManifestV2.cs @@ -30,7 +30,7 @@ public class ManifestV2 /// When used, this field MUST contain the media type application/vnd.oci.image.manifest.v1+json. This field usage differs from the descriptor use of mediaType. /// [JsonPropertyName("mediaType")] - public required string MediaType { get; init; } + public string? MediaType { get; init; } /// /// This REQUIRED property references a configuration object for a container, by digest. diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt index 8e7f42f35d3f..be51aee20053 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -90,7 +90,7 @@ Microsoft.NET.Build.Containers.ManifestV2.KnownDigest.set -> void Microsoft.NET.Build.Containers.ManifestV2.Layers.get -> System.Collections.Generic.List! Microsoft.NET.Build.Containers.ManifestV2.Layers.init -> void Microsoft.NET.Build.Containers.ManifestV2.ManifestV2() -> void -Microsoft.NET.Build.Containers.ManifestV2.MediaType.get -> string! +Microsoft.NET.Build.Containers.ManifestV2.MediaType.get -> string? Microsoft.NET.Build.Containers.ManifestV2.MediaType.init -> void Microsoft.NET.Build.Containers.ManifestV2.SchemaVersion.get -> int Microsoft.NET.Build.Containers.ManifestV2.SchemaVersion.init -> void diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs index 994f97162551..ac8492e359d7 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs @@ -38,11 +38,11 @@ public async Task GetAsync(string repositoryName, string re }; } - public async Task PutAsync(string repositoryName, string reference, ManifestV2 manifest, CancellationToken cancellationToken) + public async Task PutAsync(string repositoryName, string reference, ManifestV2 manifest, string mediaType, CancellationToken cancellationToken) { string jsonString = JsonSerializer.SerializeToNode(manifest)?.ToJsonString() ?? ""; HttpContent manifestUploadContent = new StringContent(jsonString); - manifestUploadContent.Headers.ContentType = new MediaTypeHeaderValue(manifest.MediaType); + manifestUploadContent.Headers.ContentType = new MediaTypeHeaderValue(mediaType); HttpResponseMessage putResponse = await _client.PutAsync(new Uri(_baseUri, $"/v2/{repositoryName}/manifests/{reference}"), manifestUploadContent, cancellationToken).ConfigureAwait(false); diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/IManifestOperations.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/IManifestOperations.cs index cec13dd68b4d..16751a5c6685 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/IManifestOperations.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/IManifestOperations.cs @@ -14,5 +14,5 @@ internal interface IManifestOperations { public Task GetAsync(string repositoryName, string reference, CancellationToken cancellationToken); - public Task PutAsync(string repositoryName, string reference, ManifestV2 manifest, CancellationToken cancellationToken); + public Task PutAsync(string repositoryName, string reference, ManifestV2 manifest, string mediaType, CancellationToken cancellationToken); } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs index 6f64ec7d4f64..f20b840164b5 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs @@ -183,6 +183,7 @@ public async Task GetImageManifestAsync(string repositoryName, str SchemaTypes.DockerManifestV2 or SchemaTypes.OciManifestV1 => await ReadSingleImageAsync( repositoryName, await ReadManifest().ConfigureAwait(false), + initialManifestResponse.Content.Headers.ContentType.MediaType, cancellationToken).ConfigureAwait(false), SchemaTypes.DockerManifestListV2 => await PickBestImageFromManifestListAsync( repositoryName, @@ -231,7 +232,7 @@ async Task ReadManifest() }; } - private async Task ReadSingleImageAsync(string repositoryName, ManifestV2 manifest, CancellationToken cancellationToken) + private async Task ReadSingleImageAsync(string repositoryName, ManifestV2 manifest, string manifestMediaType, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); ManifestConfig config = manifest.Config; @@ -240,7 +241,8 @@ private async Task ReadSingleImageAsync(string repositoryName, Man JsonNode configDoc = await _registryAPI.Blob.GetJsonAsync(repositoryName, configSha, cancellationToken).ConfigureAwait(false); cancellationToken.ThrowIfCancellationRequested(); - return new ImageBuilder(manifest, new ImageConfig(configDoc), _logger); + // ManifestV2.MediaType can be null, so we also provide manifest mediaType from http response + return new ImageBuilder(manifest, manifest.MediaType ?? manifestMediaType, new ImageConfig(configDoc), _logger); } @@ -348,6 +350,7 @@ private async Task PickBestImageFromManifestsAsync( return await ReadSingleImageAsync( repositoryName, manifest, + matchingManifest.mediaType, cancellationToken).ConfigureAwait(false); } else @@ -560,7 +563,7 @@ private async Task PushAsync(BuiltImage builtImage, SourceImageReference source, foreach (string tag in destination.Tags) { _logger.LogInformation(Strings.Registry_TagUploadStarted, tag, RegistryName); - await _registryAPI.Manifest.PutAsync(destination.Repository, tag, builtImage.Manifest, cancellationToken).ConfigureAwait(false); + await _registryAPI.Manifest.PutAsync(destination.Repository, tag, builtImage.Manifest, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false); _logger.LogInformation(Strings.Registry_TagUploaded, tag, RegistryName); } } @@ -568,7 +571,7 @@ private async Task PushAsync(BuiltImage builtImage, SourceImageReference source, { string manifestDigest = builtImage.Manifest.GetDigest(); _logger.LogInformation(Strings.Registry_ManifestUploadStarted, RegistryName, manifestDigest); - await _registryAPI.Manifest.PutAsync(destination.Repository, manifestDigest, builtImage.Manifest, cancellationToken).ConfigureAwait(false); + await _registryAPI.Manifest.PutAsync(destination.Repository, manifestDigest, builtImage.Manifest, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false); _logger.LogInformation(Strings.Registry_ManifestUploaded, RegistryName); } } diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs index c353c4b28565..08951356179c 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs @@ -702,6 +702,6 @@ private ImageBuilder FromBaseImageConfig(string baseImageConfig, [CallerMemberNa Layers = new List(), KnownDigest = StaticKnownDigestValue }; - return new ImageBuilder(manifest, new ImageConfig(baseImageConfig), _loggerFactory.CreateLogger(testName)); + return new ImageBuilder(manifest, manifest.MediaType, new ImageConfig(baseImageConfig), _loggerFactory.CreateLogger(testName)); } } From b45e2230184bfb2eb31c6ffb7be826ee46e34b31 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 13:28:00 -0800 Subject: [PATCH 261/702] Update branding to 9.0.101 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1c2b6d64a547..7977197c2dcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 00 + 01 From 0ca8ce96c23181b1877cd9932dbc9a065e649a46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 21:53:35 +0000 Subject: [PATCH 262/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24555.3 --- 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 e27383674a93..a8e05f8d6539 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c - + https://github.com/dotnet/roslyn - 9dcb2a31699f7d09974c9b5af571b102b291ee44 + 964269c57dde75032799a7296cf2e0af8d72474c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bb9ed5e97d3e..5f3e9ed387be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 - 4.13.0-2.24555.1 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 + 4.13.0-2.24555.3 From eb42a7a341ba1e4cf972aa230258594803d3561c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 22:22:51 +0000 Subject: [PATCH 263/702] Update dependencies from https://github.com/dotnet/razor build 20241105.5 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.24554.3 -> To Version 9.0.0-preview.24555.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aed10913c4d4..a1fc4d6796b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - d0a5326f2b715919541fe9b37789539a0f28e1cf + 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 - + https://github.com/dotnet/razor - d0a5326f2b715919541fe9b37789539a0f28e1cf + 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 - + https://github.com/dotnet/razor - d0a5326f2b715919541fe9b37789539a0f28e1cf + 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 - + https://github.com/dotnet/razor - d0a5326f2b715919541fe9b37789539a0f28e1cf + 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 diff --git a/eng/Versions.props b/eng/Versions.props index a26cf96b1c9a..bcccdde2499e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.4 - 9.0.0-preview.24555.4 - 9.0.0-preview.24555.4 + 9.0.0-preview.24555.5 + 9.0.0-preview.24555.5 + 9.0.0-preview.24555.5 From 53798b4b6ac19c17e0ec743fd09aa0d272fa2b8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:03:52 +0000 Subject: [PATCH 264/702] Update dependencies from https://github.com/dotnet/roslyn build 20241104.2 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.11.0-3.24510.3 -> To Version 4.11.0-3.24554.2 --- NuGet.config | 72 ----------------------------------------- eng/Version.Details.xml | 28 ++++++++-------- eng/Versions.props | 14 ++++---- 3 files changed, 21 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7f82f990faa..4588c6226f8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,15 +21,6 @@ - - - - - - - - - @@ -37,40 +28,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,15 +59,6 @@ - - - - - - - - - @@ -117,36 +72,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204bf4d9b4ed..e63ad2ab87b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 86f5186deeea364bd8541d51657e52a54b2a96b2 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://github.com/dotnet/roslyn - cfe3bd0a653ebd218fec07ff4cce9a994715a473 + bc1c3011064a493b0ca527df6fb7215e2e5cfa96 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a30f0988e7c4..458b360b2807 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,13 +158,13 @@ - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 - 4.11.0-3.24510.3 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 + 4.11.0-3.24554.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 1c2d60672160b95161ae4ef643566199b8051fca Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 5 Nov 2024 15:05:37 -0800 Subject: [PATCH 265/702] Revert "[release/9.0.1xx] Update dependencies from dotnet/templating" --- NuGet.config | 7 ++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 309c8dd023a5..271f01d9bbb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,12 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33638a4a5cb5..d53bbdda8061 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 + e07a90b4df2f1b41a83064cfa3164611756c3746 - + https://github.com/dotnet/templating - 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 + e07a90b4df2f1b41a83064cfa3164611756c3746 - + https://github.com/dotnet/templating - 9e13b53dbf06a99b699c1f3634f4b5cca82e7b85 + e07a90b4df2f1b41a83064cfa3164611756c3746 diff --git a/eng/Versions.props b/eng/Versions.props index 4772c7315e87..7977197c2dcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,13 +203,13 @@ - 9.0.101 + 9.0.100 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.101-servicing.24555.6 + 9.0.100-rtm.24518.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7e304480cd07dffafbab99f2d1f598d46ff37753 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:07:47 +0000 Subject: [PATCH 266/702] Update dependencies from https://github.com/dotnet/razor build 20241023.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.24515.6 -> To Version 9.0.0-preview.24523.7 --- NuGet.config | 72 ----------------------------------------- eng/Version.Details.xml | 12 +++---- eng/Versions.props | 6 ++-- 3 files changed, 9 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7f82f990faa..4588c6226f8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,15 +21,6 @@ - - - - - - - - - @@ -37,40 +28,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,15 +59,6 @@ - - - - - - - - - @@ -117,36 +72,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204bf4d9b4ed..1841dd051f2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://github.com/dotnet/razor - a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 + aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 - + https://github.com/dotnet/razor - a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 + aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 - + https://github.com/dotnet/razor - a6fcedcc35ff98b6c8a9c2a31a2538a027539d25 + aed0fbca2fb10728f7ee4c531a9fe9d04d4ab6c7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a30f0988e7c4..b6311ab36135 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24515.6 - 9.0.0-preview.24515.6 - 9.0.0-preview.24515.6 + 9.0.0-preview.24523.7 + 9.0.0-preview.24523.7 + 9.0.0-preview.24523.7 From 181c49689844b1d260ffa0ce64cc0e23e2a2b9ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:07:48 +0000 Subject: [PATCH 267/702] Update dependencies from https://github.com/dotnet/fsharp build 20241026.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.403-beta.24509.1 -> To Version 8.0.403-beta.24526.2 --- NuGet.config | 72 ----------------------------------------- eng/Version.Details.xml | 8 ++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7f82f990faa..4588c6226f8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,15 +21,6 @@ - - - - - - - - - @@ -37,40 +28,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,15 +59,6 @@ - - - - - - - - - @@ -117,36 +72,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204bf4d9b4ed..eadae9ac15f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,13 +68,13 @@ a69bbaaf5f8d7249b8cab7309e81ad2221ce396c - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/fsharp - 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 diff --git a/eng/Versions.props b/eng/Versions.props index a30f0988e7c4..9d4ad2e483d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ - 12.8.403-beta.24509.1 + 12.8.403-beta.24526.2 From f729dc12adcdbe976af24e3864dd69759d084095 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:09:14 +0000 Subject: [PATCH 268/702] 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 | 34 ---------------------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index c33a012aacc2..f454d764d056 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,28 +27,11 @@ - - - - - - - - - - - - - - - - - @@ -90,25 +73,8 @@ - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c2a654eccec..7a2bdbbb5335 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 51a7ce9229e9..0dd5426515cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24516.1 + 8.0.0-beta.24525.2 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.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 c49754a35780383425c34835356d68e4c6591d6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:09:14 +0000 Subject: [PATCH 269/702] 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 | 72 ----------------------------------------- eng/Version.Details.xml | 16 ++++----- eng/Versions.props | 4 +-- global.json | 4 +-- 4 files changed, 12 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7f82f990faa..4588c6226f8c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,15 +21,6 @@ - - - - - - - - - @@ -37,40 +28,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,15 +59,6 @@ - - - - - - - - - @@ -117,36 +72,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204bf4d9b4ed..1b002843f681 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 a30f0988e7c4..8105ce26a9c3 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.24516.1 + 8.0.0-beta.24525.2 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.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 8e4bfd9cbba4ae50d0dc70b128cc45975d2fe30d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:09:37 +0000 Subject: [PATCH 270/702] Update dependencies from https://github.com/dotnet/roslyn build 20241031.5 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.10.0-3.24515.13 -> To Version 4.10.0-3.24531.5 --- NuGet.config | 34 ---------------------------------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 21 insertions(+), 55 deletions(-) diff --git a/NuGet.config b/NuGet.config index c33a012aacc2..f454d764d056 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,28 +27,11 @@ - - - - - - - - - - - - - - - - - @@ -90,25 +73,8 @@ - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c2a654eccec..e7f49bd99367 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 86f5186deeea364bd8541d51657e52a54b2a96b2 - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 51a7ce9229e9..7387587a7127 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,13 +158,13 @@ - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 - 4.10.0-3.24515.13 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 + 4.10.0-3.24531.5 $(MicrosoftNetCompilersToolsetPackageVersion) From b80c966499dd45e4029454709e0fa6c3b108bb48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2024 23:48:26 +0000 Subject: [PATCH 271/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24555.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8e05f8d6539..6e8582cf5ac4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f - + https://github.com/dotnet/roslyn - 964269c57dde75032799a7296cf2e0af8d72474c + 33e986c4c814f374e853ddc145dcb73a23a15d2f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5f3e9ed387be..2692a60f45fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 - 4.13.0-2.24555.3 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 + 4.13.0-2.24555.4 From 31d8a32d212b7ac9cb48aa0fe2e85c44df98ac5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 00:34:22 +0000 Subject: [PATCH 272/702] 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 44871d4129f1b6d034bc89958c4ab0340e37d348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 5 Nov 2024 16:35:12 -0800 Subject: [PATCH 273/702] Browser refresh and WASM delta applier refactoring (#44539) --- src/BuiltInTools/BrowserRefresh/.editorconfig | 2 + .../BrowserRefresh/BlazorHotReload.js | 11 +- .../BlazorWasmHotReloadMiddleware.cs | 95 ++--- .../BrowserRefreshMiddleware.cs | 50 +-- .../BrowserRefresh/BrowserScriptMiddleware.cs | 1 + .../BrowserRefresh/HostingStartup.cs | 1 + ...oft.AspNetCore.Watch.BrowserRefresh.csproj | 14 +- .../WebSocketScriptInjection.js | 96 +++-- .../DotNetDeltaApplier/HotReloadAgent.cs | 290 ++++++------- ...osoft.Extensions.DotNetDeltaApplier.csproj | 3 + .../DotNetDeltaApplier/StartupHook.cs | 21 +- .../dotnet-watch/Browser/BrowserConnection.cs | 85 ++++ .../dotnet-watch/Browser/BrowserConnector.cs | 2 +- .../Browser/BrowserRefreshServer.cs | 204 +++++----- .../HotReload/AgentMessageSeverity.cs | 11 + .../BlazorWebAssemblyDeltaApplier.cs | 190 ++++----- .../HotReload/CompilationHandler.cs | 12 +- .../HotReload/DefaultDeltaApplier.cs | 24 +- .../dotnet-watch/HotReload/DeltaApplier.cs | 22 + .../HotReload/NamedPipeContract.cs | 33 +- .../dotnet-watch/HotReload/ProjectLauncher.cs | 44 +- .../HotReload/ResponseLoggingLevel.cs | 10 + .../HotReload/ScopedCssFileHandler.cs | 2 +- .../HotReload/StaticFileHandler.cs | 2 +- .../dotnet-watch/HotReload/UpdateDelta.cs | 13 + .../Internal/BrowserSpecificReporter.cs | 28 ++ src/BuiltInTools/dotnet-watch/Program.cs | 1 - .../BlazorWasmHotReloadMiddlewareTest.cs | 383 +++++++----------- .../BrowserRefreshMiddlewareTest.cs | 16 +- .../HostingStartupTest.cs | 22 +- .../HotReload/ApplyDeltaTests.cs | 3 + .../HotReload/UpdatePayloadTests.cs | 48 +-- 32 files changed, 913 insertions(+), 826 deletions(-) create mode 100644 src/BuiltInTools/BrowserRefresh/.editorconfig create mode 100644 src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs create mode 100644 src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs create mode 100644 src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs create mode 100644 src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs create mode 100644 src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs diff --git a/src/BuiltInTools/BrowserRefresh/.editorconfig b/src/BuiltInTools/BrowserRefresh/.editorconfig new file mode 100644 index 000000000000..4ae90dd7a7a0 --- /dev/null +++ b/src/BuiltInTools/BrowserRefresh/.editorconfig @@ -0,0 +1,2 @@ +[*.js] +indent_size = 2 diff --git a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js index 0c979861ea82..87a203450f01 100644 --- a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js +++ b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js @@ -1,3 +1,6 @@ +// Used by older versions of Microsoft.AspNetCore.Components.WebAssembly. +// For back compat only to support WASM packages older than the SDK. + export function receiveHotReload() { return BINDING.js_to_mono_obj(new Promise((resolve) => receiveHotReloadAsync().then(resolve(0)))); } @@ -5,10 +8,12 @@ export function receiveHotReload() { export async function receiveHotReloadAsync() { const response = await fetch('/_framework/blazor-hotreload'); if (response.status === 200) { - const deltas = await response.json(); - if (deltas) { + const updates = await response.json(); + if (updates) { try { - deltas.forEach(d => window.Blazor._internal.applyHotReload(d.moduleId, d.metadataDelta, d.ilDelta, d.pdbDelta, d.updatedTypes)); + updates.forEach(u => { + u.deltas.forEach(d => window.Blazor._internal.applyHotReload(d.moduleId, d.metadataDelta, d.ilDelta, d.pdbDelta, d.updatedTypes)); + }) } catch (error) { console.warn(error); return; diff --git a/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs index f5b4da6f12bf..aa58d083c712 100644 --- a/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs @@ -1,10 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Globalization; using System.Text.Json; using Microsoft.AspNetCore.Http; -using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { @@ -12,12 +10,27 @@ namespace Microsoft.AspNetCore.Watch.BrowserRefresh /// A middleware that manages receiving and sending deltas from a BlazorWebAssembly app. /// This assembly is shared between Visual Studio and dotnet-watch. By putting some of the complexity /// in here, we can avoid duplicating work in watch and VS. + /// + /// Mapped to . /// internal sealed class BlazorWasmHotReloadMiddleware { - private readonly object @lock = new(); - private readonly string EtagDiscriminator = Guid.NewGuid().ToString(); - private readonly JsonSerializerOptions _jsonSerializerOptions = new() + internal sealed class Update + { + public int Id { get; set; } + public Delta[] Deltas { get; set; } = default!; + } + + internal sealed class Delta + { + public string ModuleId { get; set; } = default!; + public string MetadataDelta { get; set; } = default!; + public string ILDelta { get; set; } = default!; + public string PdbDelta { get; set; } = default!; + public int[] UpdatedTypes { get; set; } = default!; + } + + private static readonly JsonSerializerOptions s_jsonSerializerOptions = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, }; @@ -26,13 +39,13 @@ public BlazorWasmHotReloadMiddleware(RequestDelegate next) { } - internal List Deltas { get; } = new(); + internal List Updates { get; } = []; public Task InvokeAsync(HttpContext context) { // Multiple instances of the BlazorWebAssembly app could be running (multiple tabs or multiple browsers). // We want to avoid serialize reads and writes between then - lock (@lock) + lock (Updates) { if (HttpMethods.IsGet(context.Request.Method)) { @@ -54,85 +67,31 @@ public Task InvokeAsync(HttpContext context) private async Task OnGet(HttpContext context) { - if (Deltas.Count == 0) + if (Updates.Count == 0) { context.Response.StatusCode = StatusCodes.Status204NoContent; return; } - if (EtagMatches(context)) - { - context.Response.StatusCode = StatusCodes.Status304NotModified; - return; - } - - WriteETag(context); - await JsonSerializer.SerializeAsync(context.Response.Body, Deltas, _jsonSerializerOptions); - } - - private bool EtagMatches(HttpContext context) - { - if (context.Request.Headers[HeaderNames.IfNoneMatch] is not { Count: 1 } ifNoneMatch) - { - return false; - } - - var expected = GetETag(); - return string.Equals(expected, ifNoneMatch[0], StringComparison.Ordinal); + await JsonSerializer.SerializeAsync(context.Response.Body, Updates, s_jsonSerializerOptions); } private async Task OnPost(HttpContext context) { - var updateDeltas = await JsonSerializer.DeserializeAsync(context.Request.Body, _jsonSerializerOptions); - AppendDeltas(updateDeltas); - - WriteETag(context); - } - - private void WriteETag(HttpContext context) - { - var etag = GetETag(); - if (etag is not null) - { - context.Response.Headers[HeaderNames.ETag] = etag; - } - } - - private string? GetETag() - { - if (Deltas.Count == 0) - { - return null; - } - - return string.Format(CultureInfo.InvariantCulture, "W/\"{0}{1}\"", EtagDiscriminator, Deltas[^1].SequenceId); - } - - private void AppendDeltas(UpdateDelta[]? updateDeltas) - { - if (updateDeltas == null || updateDeltas.Length == 0) + var update = await JsonSerializer.DeserializeAsync(context.Request.Body, s_jsonSerializerOptions); + if (update == null) { + context.Response.StatusCode = StatusCodes.Status400BadRequest; return; } // It's possible that multiple instances of the BlazorWasm are simultaneously executing and could be posting the same deltas // We'll use the sequence id to ensure that we're not recording duplicate entries. Replaying duplicated values would cause // ApplyDelta to fail. - // It's currently not possible to receive different ranges of sequences from different clients (for e.g client 1 sends deltas 1 - 3, - // and client 2 sends deltas 2 - 4, client 3 sends 1 - 5 etc), so we only need to verify that the first item in the sequence has not already been seen. - if (Deltas.Count == 0 || Deltas[^1].SequenceId < updateDeltas[0].SequenceId) + if (Updates is [] || Updates[^1].Id < update.Id) { - Deltas.AddRange(updateDeltas); + Updates.Add(update); } } - - internal class UpdateDelta - { - public int SequenceId { get; set; } - public string ModuleId { get; set; } = default!; - public string MetadataDelta { get; set; } = default!; - public string ILDelta { get; set; } = default!; - public int[]? UpdatedTypes { get; set; } = default!; - } } } diff --git a/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs index 4e37ff24ed6a..07a687d7e315 100644 --- a/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs @@ -9,39 +9,33 @@ namespace Microsoft.AspNetCore.Watch.BrowserRefresh { - public class BrowserRefreshMiddleware + public sealed class BrowserRefreshMiddleware(RequestDelegate next, ILogger logger) { - private static readonly MediaTypeHeaderValue _textHtmlMediaType = new("text/html"); - private static readonly MediaTypeHeaderValue _applicationJsonMediaType = new("application/json"); - private readonly string? _dotnetModifiableAssemblies = GetNonEmptyEnvironmentVariableValue("DOTNET_MODIFIABLE_ASSEMBLIES"); - private readonly string? _aspnetcoreBrowserTools = GetNonEmptyEnvironmentVariableValue("__ASPNETCORE_BROWSER_TOOLS"); - - private readonly RequestDelegate _next; - private readonly ILogger _logger; + private static readonly MediaTypeHeaderValue s_textHtmlMediaType = new("text/html"); + private static readonly MediaTypeHeaderValue s_applicationJsonMediaType = new("application/json"); + private string? _dotnetModifiableAssemblies = GetNonEmptyEnvironmentVariableValue("DOTNET_MODIFIABLE_ASSEMBLIES"); + private string? _aspnetcoreBrowserTools = GetNonEmptyEnvironmentVariableValue("__ASPNETCORE_BROWSER_TOOLS"); private static string? GetNonEmptyEnvironmentVariableValue(string name) => Environment.GetEnvironmentVariable(name) is { Length: > 0 } value ? value : null; - public BrowserRefreshMiddleware(RequestDelegate next, ILogger logger) => - (_next, _logger) = (next, logger); - public async Task InvokeAsync(HttpContext context) { if (IsWebAssemblyBootRequest(context)) { AttachWebAssemblyHeaders(context); - await _next(context); + await next(context); } else if (IsBrowserDocumentRequest(context)) { // Use a custom StreamWrapper to rewrite output on Write/WriteAsync - using var responseStreamWrapper = new ResponseStreamWrapper(context, _logger); + using var responseStreamWrapper = new ResponseStreamWrapper(context, logger); var originalBodyFeature = context.Features.Get(); context.Features.Set(new StreamResponseBodyFeature(responseStreamWrapper)); try { - await _next(context); + await next(context); } finally { @@ -52,21 +46,21 @@ public async Task InvokeAsync(HttpContext context) { if (responseStreamWrapper.ScriptInjectionPerformed) { - Log.BrowserConfiguredForRefreshes(_logger); + Log.BrowserConfiguredForRefreshes(logger); } else if (context.Response.Headers.TryGetValue(HeaderNames.ContentEncoding, out var contentEncodings)) { - Log.ResponseCompressionDetected(_logger, contentEncodings); + Log.ResponseCompressionDetected(logger, contentEncodings); } else { - Log.FailedToConfiguredForRefreshes(_logger); + Log.FailedToConfiguredForRefreshes(logger); } } } else { - await _next(context); + await next(context); } } @@ -76,18 +70,18 @@ private void AttachWebAssemblyHeaders(HttpContext context) { if (!context.Response.Headers.ContainsKey("DOTNET-MODIFIABLE-ASSEMBLIES")) { - if(_dotnetModifiableAssemblies != null) + if (_dotnetModifiableAssemblies != null) { context.Response.Headers.Add("DOTNET-MODIFIABLE-ASSEMBLIES", _dotnetModifiableAssemblies); } else { - _logger.LogDebug("DOTNET_MODIFIABLE_ASSEMBLIES environment variable is not set, likely because hot reload is not enabled. The browser refresh feature may not work as expected."); + logger.LogDebug("DOTNET_MODIFIABLE_ASSEMBLIES environment variable is not set, likely because hot reload is not enabled. The browser refresh feature may not work as expected."); } } else { - _logger.LogDebug("DOTNET-MODIFIABLE-ASSEMBLIES header is already set."); + logger.LogDebug("DOTNET-MODIFIABLE-ASSEMBLIES header is already set."); } if (!context.Response.Headers.ContainsKey("ASPNETCORE-BROWSER-TOOLS")) @@ -98,12 +92,12 @@ private void AttachWebAssemblyHeaders(HttpContext context) } else { - _logger.LogDebug("__ASPNETCORE_BROWSER_TOOLS environment variable is not set. The browser refresh feature may not work as expected."); + logger.LogDebug("__ASPNETCORE_BROWSER_TOOLS environment variable is not set. The browser refresh feature may not work as expected."); } } else { - _logger.LogDebug("ASPNETCORE-BROWSER-TOOLS header is already set."); + logger.LogDebug("ASPNETCORE-BROWSER-TOOLS header is already set."); } return Task.CompletedTask; @@ -141,7 +135,7 @@ internal static bool IsWebAssemblyBootRequest(HttpContext context) for (var i = 0; i < acceptHeaders.Count; i++) { - if (acceptHeaders[i].MatchesAllTypes || acceptHeaders[i].IsSubsetOf(_applicationJsonMediaType)) + if (acceptHeaders[i].MatchesAllTypes || acceptHeaders[i].IsSubsetOf(s_applicationJsonMediaType)) { return true; } @@ -175,7 +169,7 @@ internal static bool IsBrowserDocumentRequest(HttpContext context) for (var i = 0; i < acceptHeaders.Count; i++) { - if (acceptHeaders[i].IsSubsetOf(_textHtmlMediaType)) + if (acceptHeaders[i].IsSubsetOf(s_textHtmlMediaType)) { return true; } @@ -184,6 +178,12 @@ internal static bool IsBrowserDocumentRequest(HttpContext context) return false; } + internal void Test_SetEnvironment(string dotnetModifiableAssemblies, string aspnetcoreBrowserTools) + { + _dotnetModifiableAssemblies = dotnetModifiableAssemblies; + _aspnetcoreBrowserTools = aspnetcoreBrowserTools; + } + internal static class Log { private static readonly Action _setupResponseForBrowserRefresh = LoggerMessage.Define( diff --git a/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs index aa82bf273d0c..9c5111df61d7 100644 --- a/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs @@ -30,6 +30,7 @@ public async Task InvokeAsync(HttpContext context) await context.Response.Body.WriteAsync(_scriptBytes.AsMemory(), context.RequestAborted); } + // for backwards compat only internal static byte[] GetBlazorHotReloadJS() { var jsFileName = "Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorHotReload.js"; diff --git a/src/BuiltInTools/BrowserRefresh/HostingStartup.cs b/src/BuiltInTools/BrowserRefresh/HostingStartup.cs index 06d400d26578..d68a6e2e4b92 100644 --- a/src/BuiltInTools/BrowserRefresh/HostingStartup.cs +++ b/src/BuiltInTools/BrowserRefresh/HostingStartup.cs @@ -46,6 +46,7 @@ public Action Configure(Action next) app.Map(ApplicationPaths.BrowserRefreshJS, static app => app.UseMiddleware(BrowserScriptMiddleware.GetBrowserRefreshJS())); + // backwards compat only: app.Map(ApplicationPaths.BlazorHotReloadJS, static app => app.UseMiddleware(BrowserScriptMiddleware.GetBlazorHotReloadJS())); }); diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj index 1bcb35c0ad9d..c0074ad0fc3d 100644 --- a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj +++ b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj @@ -11,17 +11,19 @@ + + - - + + + + + + diff --git a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js index 6530cd2c8ae0..e90cd86c7017 100644 --- a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js +++ b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js @@ -44,8 +44,9 @@ setTimeout(async function () { const payload = JSON.parse(message.data); const action = { 'UpdateStaticFile': () => updateStaticFile(payload.path), - 'BlazorHotReloadDeltav1': () => applyBlazorDeltas(payload.sharedSecret, payload.deltas, false), - 'BlazorHotReloadDeltav2': () => applyBlazorDeltas(payload.sharedSecret, payload.deltas, true), + 'BlazorHotReloadDeltav1': () => applyBlazorDeltas_legacy(payload.sharedSecret, payload.deltas, false), + 'BlazorHotReloadDeltav2': () => applyBlazorDeltas_legacy(payload.sharedSecret, payload.deltas, true), + 'BlazorHotReloadDeltav3': () => applyBlazorDeltas(payload.sharedSecret, payload.updateId, payload.deltas, payload.responseLoggingLevel), 'HotReloadDiagnosticsv1': () => displayDiagnostics(payload.diagnostics), 'BlazorRequestApplyUpdateCapabilities': () => getBlazorWasmApplyUpdateCapabilities(false), 'BlazorRequestApplyUpdateCapabilities2': () => getBlazorWasmApplyUpdateCapabilities(true), @@ -95,19 +96,22 @@ setTimeout(async function () { .forEach(e => updateCssElement(e)); } + function getMessageAndStack(error) { + const message = error.message || '' + let messageAndStack = error.stack || message + if (!messageAndStack.includes(message)) { + messageAndStack = message + "\n" + messageAndStack; + } + + return messageAndStack + } + function getBlazorWasmApplyUpdateCapabilities(sendErrorToClient) { let applyUpdateCapabilities; try { applyUpdateCapabilities = window.Blazor._internal.getApplyUpdateCapabilities(); } catch (error) { - const message = error.message || '' - let messageAndStack = error.stack || message - if (!messageAndStack.includes(message)) - { - messageAndStack = message + "\n" + messageAndStack; - } - - applyUpdateCapabilities = sendErrorToClient ? "!" + messageAndStack : ''; + applyUpdateCapabilities = sendErrorToClient ? "!" + getMessageAndStack(error) : ''; } connection.send(applyUpdateCapabilities); } @@ -133,7 +137,7 @@ setTimeout(async function () { styleElement.parentNode.insertBefore(newElement, styleElement.nextSibling); } - async function applyBlazorDeltas(serverSecret, deltas, sendErrorToClient) { + async function applyBlazorDeltas_legacy(serverSecret, deltas, sendErrorToClient) { if (sharedSecret && (serverSecret != sharedSecret.encodedSharedSecret)) { // Validate the shared secret if it was specified. It might be unspecified in older versions of VS // that do not support this feature as yet. @@ -170,6 +174,63 @@ setTimeout(async function () { } } + async function applyBlazorDeltas(serverSecret, updateId, deltas, responseLoggingLevel) { + if (sharedSecret && (serverSecret != sharedSecret.encodedSharedSecret)) { + // Validate the shared secret if it was specified. It might be unspecified in older versions of VS + // that do not support this feature as yet. + throw 'Unable to validate the server. Rejecting apply-update payload.'; + } + + const AgentMessageSeverity_Error = 2 + + let applyError = undefined; + let log = []; + if (window.Blazor?._internal?.applyHotReloadDeltas) { + // Only apply hot reload deltas if Blazor has been initialized. + // It's possible for Blazor to start after the initial page load, so we don't consider skipping this step + // to be a failure. These deltas will get applied later, when Blazor completes initialization. + try { + let wasmDeltas = deltas.map(delta => { + return { + "moduleId": delta.moduleId, + "metadataDelta": delta.metadataDelta, + "ilDelta": delta.ilDelta, + "pdbDelta": delta.pdbDelta, + "updatedTypes": delta.updatedTypes, + }; + }); + + log = window.Blazor._internal.applyHotReloadDeltas(wasmDeltas, responseLoggingLevel); + } catch (error) { + console.warn(error); + applyError = error; + log.push({ "message": getMessageAndStack(error), "severity": AgentMessageSeverity_Error }); + } + } + + try { + let body = JSON.stringify({ + "id": updateId, + "deltas": deltas + }); + + await fetch('/_framework/blazor-hotreload', { method: 'post', headers: { 'content-type': 'application/json' }, body: body }); + } catch (error) { + console.warn(error); + applyError = error; + log.push({ "message": getMessageAndStack(error), "severity": AgentMessageSeverity_Error }); + } + + connection.send(JSON.stringify({ + "success": !applyError, + "log": log + })); + + if (!applyError) { + notifyHotReloadApplied(); + } + } + function displayDiagnostics(diagnostics) { document.querySelectorAll('#dotnet-compile-error').forEach(el => el.remove()); const el = document.body.appendChild(document.createElement('div')); @@ -222,19 +283,6 @@ setTimeout(async function () { } } - function sendDeltaApplied() { - connection.send(new Uint8Array([1]).buffer); - } - - function sendDeltaNotApplied(error) { - if (error) { - let encoder = new TextEncoder() - connection.send(encoder.encode("\0" + error.message + "\0" + error.stack)); - } else { - connection.send(new Uint8Array([0]).buffer); - } - } - async function getSecret(serverKeyString) { if (!serverKeyString || !window.crypto || !window.crypto.subtle) { return null; diff --git a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs b/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs index 36dbbae52846..3451a89e13c2 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs @@ -3,215 +3,193 @@ using System.Collections.Concurrent; using System.Diagnostics; -using System.IO.Pipes; using System.Reflection; -namespace Microsoft.Extensions.HotReload +namespace Microsoft.Extensions.HotReload; + +#if NET +[System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")] +#endif +internal sealed class HotReloadAgent : IDisposable { - internal sealed class HotReloadAgent : IDisposable - { - private const string MetadataUpdaterTypeName = "System.Reflection.Metadata.MetadataUpdater"; - private const string ApplyUpdateMethodName = "ApplyUpdate"; - private const string GetCapabilitiesMethodName = "GetCapabilities"; - - private delegate void ApplyUpdateDelegate(Assembly assembly, ReadOnlySpan metadataDelta, ReadOnlySpan ilDelta, ReadOnlySpan pdbDelta); - - private readonly AgentReporter _reporter = new(); - private readonly NamedPipeClientStream _pipeClient; - private readonly Action _stdOutLog; - private readonly AssemblyLoadEventHandler _assemblyLoad; - private readonly ConcurrentDictionary> _deltas = new(); - private readonly ConcurrentDictionary _appliedAssemblies = new(); - private readonly ApplyUpdateDelegate? _applyUpdate; - private readonly string? _capabilities; - private readonly MetadataUpdateHandlerInvoker _metadataUpdateHandlerInvoker; - - public HotReloadAgent(NamedPipeClientStream pipeClient, Action stdOutLog) - { - _assemblyLoad = OnAssemblyLoad; - _pipeClient = pipeClient; - _stdOutLog = stdOutLog; - _metadataUpdateHandlerInvoker = new(_reporter); + private const string MetadataUpdaterTypeName = "System.Reflection.Metadata.MetadataUpdater"; + private const string ApplyUpdateMethodName = "ApplyUpdate"; + private const string GetCapabilitiesMethodName = "GetCapabilities"; - GetUpdaterMethods(out _applyUpdate, out _capabilities); - AppDomain.CurrentDomain.AssemblyLoad += _assemblyLoad; - } + private delegate void ApplyUpdateDelegate(Assembly assembly, ReadOnlySpan metadataDelta, ReadOnlySpan ilDelta, ReadOnlySpan pdbDelta); - private void GetUpdaterMethods(out ApplyUpdateDelegate? applyUpdate, out string? capabilities) - { - applyUpdate = null; - capabilities = null; + public AgentReporter Reporter { get; } = new(); - var metadataUpdater = Type.GetType(MetadataUpdaterTypeName + ", System.Runtime.Loader", throwOnError: false); - if (metadataUpdater == null) - { - _reporter.Report($"Type not found: {MetadataUpdaterTypeName}", AgentMessageSeverity.Error); - return; - } + private readonly ConcurrentDictionary> _deltas = new(); + private readonly ConcurrentDictionary _appliedAssemblies = new(); + private readonly ApplyUpdateDelegate? _applyUpdate; + private readonly string? _capabilities; + private readonly MetadataUpdateHandlerInvoker _metadataUpdateHandlerInvoker; - var applyUpdateMethod = metadataUpdater.GetMethod(ApplyUpdateMethodName, BindingFlags.Public | BindingFlags.Static, binder: null, [typeof(Assembly), typeof(ReadOnlySpan), typeof(ReadOnlySpan), typeof(ReadOnlySpan)], modifiers: null); - if (applyUpdateMethod == null) - { - _reporter.Report($"{MetadataUpdaterTypeName}.{ApplyUpdateMethodName} not found.", AgentMessageSeverity.Error); - return; - } + public HotReloadAgent() + { + _metadataUpdateHandlerInvoker = new(Reporter); - applyUpdate = (ApplyUpdateDelegate)applyUpdateMethod.CreateDelegate(typeof(ApplyUpdateDelegate)); + GetUpdaterMethodsAndCapabilities(out _applyUpdate, out _capabilities); - var getCapabilities = metadataUpdater.GetMethod(GetCapabilitiesMethodName, BindingFlags.NonPublic | BindingFlags.Static, binder: null, Type.EmptyTypes, modifiers: null); - if (getCapabilities == null) - { - _reporter.Report($"{MetadataUpdaterTypeName}.{GetCapabilitiesMethodName} not found.", AgentMessageSeverity.Error); - return; - } + AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad; + } - try - { - capabilities = getCapabilities.Invoke(obj: null, parameters: null) as string; - } - catch (Exception e) - { - _reporter.Report($"Error retrieving capabilities: {e.Message}", AgentMessageSeverity.Error); - } - } + public void Dispose() + { + AppDomain.CurrentDomain.AssemblyLoad -= OnAssemblyLoad; + } + + private void GetUpdaterMethodsAndCapabilities(out ApplyUpdateDelegate? applyUpdate, out string? capabilities) + { + applyUpdate = null; + capabilities = null; - public async Task ReceiveDeltasAsync() + var metadataUpdater = Type.GetType(MetadataUpdaterTypeName + ", System.Runtime.Loader", throwOnError: false); + if (metadataUpdater == null) { - _reporter.Report("Writing capabilities: " + Capabilities, AgentMessageSeverity.Verbose); + Reporter.Report($"Type not found: {MetadataUpdaterTypeName}", AgentMessageSeverity.Error); + return; + } - var initPayload = new ClientInitializationPayload(Capabilities); - initPayload.Write(_pipeClient); + var applyUpdateMethod = metadataUpdater.GetMethod(ApplyUpdateMethodName, BindingFlags.Public | BindingFlags.Static, binder: null, [typeof(Assembly), typeof(ReadOnlySpan), typeof(ReadOnlySpan), typeof(ReadOnlySpan)], modifiers: null); + if (applyUpdateMethod == null) + { + Reporter.Report($"{MetadataUpdaterTypeName}.{ApplyUpdateMethodName} not found.", AgentMessageSeverity.Error); + return; + } - while (_pipeClient.IsConnected) - { - var update = await UpdatePayload.ReadAsync(_pipeClient, CancellationToken.None); + applyUpdate = (ApplyUpdateDelegate)applyUpdateMethod.CreateDelegate(typeof(ApplyUpdateDelegate)); - _stdOutLog($"ResponseLoggingLevel = {update.ResponseLoggingLevel}"); + var getCapabilities = metadataUpdater.GetMethod(GetCapabilitiesMethodName, BindingFlags.NonPublic | BindingFlags.Static, binder: null, Type.EmptyTypes, modifiers: null); + if (getCapabilities == null) + { + Reporter.Report($"{MetadataUpdaterTypeName}.{GetCapabilitiesMethodName} not found.", AgentMessageSeverity.Error); + return; + } - _reporter.Report("Attempting to apply deltas.", AgentMessageSeverity.Verbose); + try + { + capabilities = getCapabilities.Invoke(obj: null, parameters: null) as string; + } + catch (Exception e) + { + Reporter.Report($"Error retrieving capabilities: {e.Message}", AgentMessageSeverity.Error); + } + } - ApplyDeltas(update.Deltas); + public string Capabilities => _capabilities ?? string.Empty; - _pipeClient.WriteByte(UpdatePayload.ApplySuccessValue); + private void OnAssemblyLoad(object? _, AssemblyLoadEventArgs eventArgs) + { + _metadataUpdateHandlerInvoker.Clear(); - UpdatePayload.WriteLog(_pipeClient, _reporter.GetAndClearLogEntries(update.ResponseLoggingLevel)); - } + var loadedAssembly = eventArgs.LoadedAssembly; + var moduleId = TryGetModuleId(loadedAssembly); + if (moduleId is null) + { + return; } - public string Capabilities => _capabilities ?? string.Empty; - - private void OnAssemblyLoad(object? _, AssemblyLoadEventArgs eventArgs) + if (_deltas.TryGetValue(moduleId.Value, out var updateDeltas) && _appliedAssemblies.TryAdd(loadedAssembly, loadedAssembly)) { - _metadataUpdateHandlerInvoker.Clear(); + // A delta for this specific Module exists and we haven't called ApplyUpdate on this instance of Assembly as yet. + ApplyDeltas(loadedAssembly, updateDeltas); + } + } - var loadedAssembly = eventArgs.LoadedAssembly; - var moduleId = TryGetModuleId(loadedAssembly); - if (moduleId is null) - { - return; - } + public IReadOnlyCollection<(string message, AgentMessageSeverity severity)> GetAndClearLogEntries(ResponseLoggingLevel loggingLevel) + => Reporter.GetAndClearLogEntries(loggingLevel); - if (_deltas.TryGetValue(moduleId.Value, out var updateDeltas) && _appliedAssemblies.TryAdd(loadedAssembly, loadedAssembly)) - { - // A delta for this specific Module exists and we haven't called ApplyUpdate on this instance of Assembly as yet. - ApplyDeltas(loadedAssembly, updateDeltas); - } - } + public void ApplyDeltas(IEnumerable deltas) + { + Debug.Assert(Capabilities.Length > 0); + Debug.Assert(_applyUpdate != null); - public void ApplyDeltas(IReadOnlyList deltas) + foreach (var delta in deltas) { - Debug.Assert(Capabilities.Length > 0); - Debug.Assert(_applyUpdate != null); + Reporter.Report($"Applying delta to module {delta.ModuleId}.", AgentMessageSeverity.Verbose); - for (var i = 0; i < deltas.Count; i++) + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { - var item = deltas[i]; - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + if (TryGetModuleId(assembly) is Guid moduleId && moduleId == delta.ModuleId) { - if (TryGetModuleId(assembly) is Guid moduleId && moduleId == item.ModuleId) - { - _applyUpdate(assembly, item.MetadataDelta, item.ILDelta, pdbDelta: []); - } + _applyUpdate(assembly, delta.MetadataDelta, delta.ILDelta, delta.PdbDelta); } - - // Additionally stash the deltas away so it may be applied to assemblies loaded later. - var cachedDeltas = _deltas.GetOrAdd(item.ModuleId, static _ => new()); - cachedDeltas.Add(item); } - _metadataUpdateHandlerInvoker.Invoke(GetMetadataUpdateTypes(deltas)); + // Additionally stash the deltas away so it may be applied to assemblies loaded later. + var cachedDeltas = _deltas.GetOrAdd(delta.ModuleId, static _ => new()); + cachedDeltas.Add(delta); } - private Type[] GetMetadataUpdateTypes(IReadOnlyList deltas) + _metadataUpdateHandlerInvoker.Invoke(GetMetadataUpdateTypes(deltas)); + } + + private Type[] GetMetadataUpdateTypes(IEnumerable deltas) + { + List? types = null; + + foreach (var delta in deltas) { - List? types = null; + var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => TryGetModuleId(assembly) is Guid moduleId && moduleId == delta.ModuleId); + if (assembly is null) + { + continue; + } - foreach (var delta in deltas) + foreach (var updatedType in delta.UpdatedTypes) { - var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => TryGetModuleId(assembly) is Guid moduleId && moduleId == delta.ModuleId); - if (assembly is null) + // Must be a TypeDef. + Debug.Assert(updatedType >> 24 == 0x02); + + // The type has to be in the manifest module since Hot Reload does not support multi-module assemblies: + try { - continue; + var type = assembly.ManifestModule.ResolveType(updatedType); + types ??= new(); + types.Add(type); } - - foreach (var updatedType in delta.UpdatedTypes) + catch (Exception e) { - // Must be a TypeDef. - Debug.Assert(updatedType >> 24 == 0x02); - - // The type has to be in the manifest module since Hot Reload does not support multi-module assemblies: - try - { - var type = assembly.ManifestModule.ResolveType(updatedType); - types ??= new(); - types.Add(type); - } - catch (Exception e) - { - _reporter.Report($"Failed to load type 0x{updatedType:X8}: {e.Message}", AgentMessageSeverity.Warning); - } + Reporter.Report($"Failed to load type 0x{updatedType:X8}: {e.Message}", AgentMessageSeverity.Warning); } } - - return types?.ToArray() ?? Type.EmptyTypes; } - public void ApplyDeltas(Assembly assembly, IReadOnlyList deltas) - { - Debug.Assert(_applyUpdate != null); + return types?.ToArray() ?? Type.EmptyTypes; + } - try - { - foreach (var item in deltas) - { - _applyUpdate(assembly, item.MetadataDelta, item.ILDelta, ReadOnlySpan.Empty); - } + private void ApplyDeltas(Assembly assembly, IReadOnlyList deltas) + { + Debug.Assert(_applyUpdate != null); - _reporter.Report("Deltas applied.", AgentMessageSeverity.Verbose); - } - catch (Exception ex) + try + { + foreach (var item in deltas) { - _reporter.Report(ex.ToString(), AgentMessageSeverity.Warning); + _applyUpdate(assembly, item.MetadataDelta, item.ILDelta, item.PdbDelta); } - } - public void Dispose() + Reporter.Report("Deltas applied.", AgentMessageSeverity.Verbose); + } + catch (Exception ex) { - AppDomain.CurrentDomain.AssemblyLoad -= _assemblyLoad; + Reporter.Report(ex.ToString(), AgentMessageSeverity.Warning); } + } - private static Guid? TryGetModuleId(Assembly loadedAssembly) + private static Guid? TryGetModuleId(Assembly loadedAssembly) + { + try { - try - { - return loadedAssembly.Modules.FirstOrDefault()?.ModuleVersionId; - } - catch - { - // Assembly.Modules might throw. See https://github.com/dotnet/aspnetcore/issues/33152 - } - - return default; + return loadedAssembly.Modules.FirstOrDefault()?.ModuleVersionId; + } + catch + { + // Assembly.Modules might throw. See https://github.com/dotnet/aspnetcore/issues/33152 } + + return default; } } diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj index 097eb0287927..00265c49cd91 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj @@ -14,6 +14,9 @@ + + + diff --git a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs index 36eeb7f326a5..1988b6a41dab 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs @@ -51,10 +51,27 @@ public static void Initialize() return; } - using var agent = new HotReloadAgent(pipeClient, Log); + using var agent = new HotReloadAgent(); try { - await agent.ReceiveDeltasAsync(); + agent.Reporter.Report("Writing capabilities: " + agent.Capabilities, AgentMessageSeverity.Verbose); + + var initPayload = new ClientInitializationPayload(agent.Capabilities); + initPayload.Write(pipeClient); + + while (pipeClient.IsConnected) + { + var update = await UpdatePayload.ReadAsync(pipeClient, CancellationToken.None); + + Log($"ResponseLoggingLevel = {update.ResponseLoggingLevel}"); + + agent.ApplyDeltas(update.Deltas); + var logEntries = agent.GetAndClearLogEntries(update.ResponseLoggingLevel); + + // response: + pipeClient.WriteByte(UpdatePayload.ApplySuccessValue); + UpdatePayload.WriteLog(pipeClient, logEntries); + } } catch (Exception ex) { diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs new file mode 100644 index 000000000000..8e62d46039d9 --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs @@ -0,0 +1,85 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + + +using System.Buffers; +using System.Net.WebSockets; +using Microsoft.Extensions.Tools.Internal; + +namespace Microsoft.DotNet.Watcher.Tools; + +internal readonly struct BrowserConnection : IAsyncDisposable +{ + private static int s_lastId; + + public WebSocket ClientSocket { get; } + public string? SharedSecret { get; } + public int Id { get; } + public IReporter Reporter { get; } + + public BrowserConnection(WebSocket clientSocket, string? sharedSecret, IReporter reporter) + { + ClientSocket = clientSocket; + SharedSecret = sharedSecret; + Id = Interlocked.Increment(ref s_lastId); + Reporter = new BrowserSpecificReporter(Id, reporter); + + Reporter.Verbose($"Connected to referesh server."); + } + + public async ValueTask DisposeAsync() + { + await ClientSocket.CloseOutputAsync(WebSocketCloseStatus.Empty, null, default); + ClientSocket.Dispose(); + + Reporter.Verbose($"Disconnected."); + } + + internal async ValueTask TrySendMessageAsync(ReadOnlyMemory messageBytes, CancellationToken cancellationToken) + { + try + { + await ClientSocket.SendAsync(messageBytes, WebSocketMessageType.Text, endOfMessage: true, cancellationToken); + } + catch (Exception e) when (e is not OperationCanceledException) + { + Reporter.Verbose($"Failed to send message: {e.Message}"); + return false; + } + + return true; + } + + internal async ValueTask TryReceiveMessageAsync(Action, IReporter> receiver, CancellationToken cancellationToken) + { + var writer = new ArrayBufferWriter(initialCapacity: 1024); + + while (true) + { + ValueWebSocketReceiveResult result; + try + { + result = await ClientSocket.ReceiveAsync(writer.GetMemory(), cancellationToken); + } + catch (Exception e) when (e is not OperationCanceledException) + { + Reporter.Verbose($"Failed to receive response: {e.Message}"); + return false; + } + + if (result.MessageType == WebSocketMessageType.Close) + { + return false; + } + + writer.Advance(result.Count); + if (result.EndOfMessage) + { + break; + } + } + + receiver(writer.WrittenSpan, Reporter); + return true; + } +} diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs index 21d2f2cfce13..caafcf100005 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs @@ -150,7 +150,7 @@ void handler(OutputLine line) // Subsequent iterations (project has been rebuilt and relaunched). // Use refresh server to reload the browser, if available. context.Reporter.Verbose("Reloading browser."); - _ = server.ReloadAsync(cancellationToken); + _ = server.SendReloadMessageAsync(cancellationToken); } } } diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs index c3547bd5b146..dc0e27565646 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs @@ -25,15 +25,15 @@ namespace Microsoft.DotNet.Watcher.Tools /// internal sealed class BrowserRefreshServer : IAsyncDisposable { - private readonly byte[] ReloadMessage = Encoding.UTF8.GetBytes("Reload"); - private readonly byte[] WaitMessage = Encoding.UTF8.GetBytes("Wait"); - private readonly JsonSerializerOptions _jsonSerializerOptions = new(JsonSerializerDefaults.Web); - private readonly List<(WebSocket clientSocket, string? sharedSecret)> _clientSockets = new(); - private readonly RSA _rsa; + private static readonly ReadOnlyMemory s_reloadMessage = Encoding.UTF8.GetBytes("Reload"); + private static readonly ReadOnlyMemory s_waitMessage = Encoding.UTF8.GetBytes("Wait"); + private static readonly JsonSerializerOptions s_jsonSerializerOptions = new(JsonSerializerDefaults.Web); + private readonly List _activeConnections = []; + private readonly RSA _rsa; private readonly IReporter _reporter; private readonly TaskCompletionSource _terminateWebSocket; - private readonly TaskCompletionSource _clientConnected; + private readonly TaskCompletionSource _browserConnected; private readonly string? _environmentHostName; // initialized by StartAsync @@ -48,10 +48,32 @@ public BrowserRefreshServer(EnvironmentOptions options, IReporter reporter) Options = options; _reporter = reporter; _terminateWebSocket = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - _clientConnected = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + _browserConnected = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); _environmentHostName = EnvironmentVariables.AutoReloadWSHostName; } + public async ValueTask DisposeAsync() + { + _rsa.Dispose(); + + BrowserConnection[] connectionsToDispose; + lock (_activeConnections) + { + connectionsToDispose = [.. _activeConnections]; + _activeConnections.Clear(); + } + + foreach (var connection in connectionsToDispose) + { + _reporter.Verbose($"Disconnecting from browser #{connection.Id}."); + await connection.DisposeAsync(); + } + + _refreshServer?.Dispose(); + + _terminateWebSocket.TrySetResult(); + } + public void SetEnvironmentVariables(EnvironmentVariablesBuilder environmentBuilder) { Debug.Assert(_refreshServer != null); @@ -73,7 +95,7 @@ public async ValueTask StartAsync(CancellationToken cancellationToken) var hostName = _environmentHostName ?? "127.0.0.1"; - var supportsTLS = await SupportsTLS(); + var supportsTLS = await SupportsTlsAsync(); _refreshServer = new HostBuilder() .ConfigureWebHost(builder => @@ -91,7 +113,7 @@ public async ValueTask StartAsync(CancellationToken cancellationToken) builder.Configure(app => { app.UseWebSockets(); - app.Run(WebSocketRequest); + app.Run(WebSocketRequestAsync); }); }) .Build(); @@ -129,7 +151,7 @@ private IEnumerable GetServerUrls(IHost server) ]; } - private async Task WebSocketRequest(HttpContext context) + private async Task WebSocketRequestAsync(HttpContext context) { if (!context.WebSockets.IsWebSocketRequest) { @@ -147,8 +169,14 @@ private async Task WebSocketRequest(HttpContext context) } var clientSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol); - _clientSockets.Add((clientSocket, sharedSecret)); - _clientConnected.TrySetResult(); + var connection = new BrowserConnection(clientSocket, sharedSecret, _reporter); + + lock (_activeConnections) + { + _activeConnections.Add(connection); + } + + _browserConnected.TrySetResult(); await _terminateWebSocket.Task; } @@ -157,7 +185,7 @@ private async Task WebSocketRequest(HttpContext context) /// internal void EmulateClientConnected() { - _clientConnected.TrySetResult(); + _browserConnected.TrySetResult(); } public async Task WaitForClientConnectionAsync(CancellationToken cancellationToken) @@ -186,7 +214,7 @@ public async Task WaitForClientConnectionAsync(CancellationToken cancellationTok try { - await _clientConnected.Task.WaitAsync(cancellationToken); + await _browserConnected.Task.WaitAsync(cancellationToken); } finally { @@ -199,127 +227,99 @@ public async Task WaitForClientConnectionAsync(CancellationToken cancellationTok } } - public ValueTask SendJsonSerlialized(TValue value, CancellationToken cancellationToken = default) + private IReadOnlyCollection GetOpenBrowserConnections() { - var jsonSerialized = JsonSerializer.SerializeToUtf8Bytes(value, _jsonSerializerOptions); - return SendMessage(jsonSerialized, cancellationToken); + lock (_activeConnections) + { + return [.. _activeConnections.Where(b => b.ClientSocket.State == WebSocketState.Open)]; + } } - public async ValueTask SendJsonWithSecret(Func valueFactory, CancellationToken cancellationToken = default) + private async ValueTask DisposeClosedBrowserConnectionsAsync() { - try - { - bool messageSent = false; + List? lazyConnectionsToDispose = null; - for (var i = 0; i < _clientSockets.Count; i++) + lock (_activeConnections) + { + var j = 0; + for (var i = 0; i < _activeConnections.Count; i++) { - var (clientSocket, secret) = _clientSockets[i]; - if (clientSocket.State is not WebSocketState.Open) + var connection = _activeConnections[i]; + if (connection.ClientSocket.State == WebSocketState.Open) { - continue; + _activeConnections[j++] = connection; + } + else + { + lazyConnectionsToDispose ??= []; + lazyConnectionsToDispose.Add(connection); } - - var value = valueFactory(secret); - var messageBytes = JsonSerializer.SerializeToUtf8Bytes(value, _jsonSerializerOptions); - - await clientSocket.SendAsync(messageBytes, WebSocketMessageType.Text, endOfMessage: true, cancellationToken); - messageSent = true; } - _reporter.Verbose(messageSent ? "Browser message sent." : "Unable to send message to browser, no socket is open."); - } - catch (TaskCanceledException) - { - _reporter.Verbose("WebSocket connection has been terminated."); - } - catch (Exception ex) - { - _reporter.Verbose($"Refresh server error: {ex}"); + _activeConnections.RemoveRange(j, _activeConnections.Count - j); } - } - public async ValueTask SendMessage(ReadOnlyMemory messageBytes, CancellationToken cancellationToken = default) - { - try + if (lazyConnectionsToDispose != null) { - bool messageSent = false; - - for (var i = 0; i < _clientSockets.Count; i++) + foreach (var connection in lazyConnectionsToDispose) { - var (clientSocket, _) = _clientSockets[i]; - if (clientSocket.State is not WebSocketState.Open) - { - continue; - } - - await clientSocket.SendAsync(messageBytes, WebSocketMessageType.Text, endOfMessage: true, cancellationToken); - messageSent = true; + await connection.DisposeAsync(); } - - _reporter.Verbose(messageSent ? "Browser message sent." : "Unable to send message to browser, no socket is open."); - } - catch (TaskCanceledException) - { - _reporter.Verbose("WebSocket connection has been terminated."); - } - catch (Exception ex) - { - _reporter.Verbose($"Refresh server error: {ex}"); } } - public async ValueTask DisposeAsync() - { - _rsa.Dispose(); + public static ReadOnlyMemory SerializeJson(TValue value) + => JsonSerializer.SerializeToUtf8Bytes(value, s_jsonSerializerOptions); - for (var i = 0; i < _clientSockets.Count; i++) - { - var (clientSocket, _) = _clientSockets[i]; - await clientSocket.CloseOutputAsync(WebSocketCloseStatus.Empty, null, default); - clientSocket.Dispose(); - } + public static TValue DeserializeJson(ReadOnlySpan value) + => JsonSerializer.Deserialize(value, s_jsonSerializerOptions) ?? throw new InvalidDataException("Unexpected null object"); - _refreshServer?.Dispose(); + public ValueTask SendJsonMessageAsync(TValue value, CancellationToken cancellationToken) + => SendAsync(SerializeJson(value), cancellationToken); - _terminateWebSocket.TrySetResult(); - } + public ValueTask SendReloadMessageAsync(CancellationToken cancellationToken) + => SendAsync(s_reloadMessage, cancellationToken); + + public ValueTask SendWaitMessageAsync(CancellationToken cancellationToken) + => SendAsync(s_waitMessage, cancellationToken); + + public ValueTask SendAsync(ReadOnlyMemory messageBytes, CancellationToken cancellationToken) + => SendAndReceiveAsync(request: _ => messageBytes, response: null, cancellationToken); - public async ValueTask ReceiveAsync(Memory buffer, CancellationToken cancellationToken) + public async ValueTask SendAndReceiveAsync( + Func request, + Action, IReporter>? response, + CancellationToken cancellationToken) { - for (int i = 0; i < _clientSockets.Count; i++) + var responded = false; + + foreach (var connection in GetOpenBrowserConnections()) { - var (clientSocket, _) = _clientSockets[i]; + var requestValue = request(connection.SharedSecret); + var requestBytes = requestValue is ReadOnlyMemory bytes ? bytes : SerializeJson(requestValue); - if (clientSocket.State != WebSocketState.Open) + if (!await connection.TrySendMessageAsync(requestBytes, cancellationToken)) { continue; } - try + if (response != null && !await connection.TryReceiveMessageAsync(response, cancellationToken)) { - var result = await clientSocket.ReceiveAsync(buffer, cancellationToken); + continue; + } - if (result.MessageType == WebSocketMessageType.Close) - { - continue; - } + responded = true; + } - return result; - } - catch (Exception ex) - { - _reporter.Verbose($"Refresh server error: {ex}"); - } + if (!responded) + { + _reporter.Verbose($"Failed to receive response from a connected browser."); } - return default; + await DisposeClosedBrowserConnectionsAsync(); } - public ValueTask ReloadAsync(CancellationToken cancellationToken) => SendMessage(ReloadMessage, cancellationToken); - - public ValueTask SendWaitMessageAsync(CancellationToken cancellationToken) => SendMessage(WaitMessage, cancellationToken); - - private async Task SupportsTLS() + private async Task SupportsTlsAsync() { try { @@ -334,18 +334,18 @@ private async Task SupportsTLS() } public ValueTask RefreshBrowserAsync(CancellationToken cancellationToken) - => SendJsonSerlialized(new AspNetCoreHotReloadApplied(), cancellationToken); + => SendJsonMessageAsync(new AspNetCoreHotReloadApplied(), cancellationToken); public ValueTask ReportCompilationErrorsInBrowserAsync(ImmutableArray compilationErrors, CancellationToken cancellationToken) { _reporter.Verbose($"Updating diagnostics in the browser."); if (compilationErrors.IsEmpty) { - return SendJsonSerlialized(new AspNetCoreHotReloadApplied(), cancellationToken); + return SendJsonMessageAsync(new AspNetCoreHotReloadApplied(), cancellationToken); } else { - return SendJsonSerlialized(new HotReloadDiagnostics { Diagnostics = compilationErrors }, cancellationToken); + return SendJsonMessageAsync(new HotReloadDiagnostics { Diagnostics = compilationErrors }, cancellationToken); } } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs b/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs new file mode 100644 index 000000000000..f1bd34cec33d --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs @@ -0,0 +1,11 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.Extensions.HotReload; + +internal enum AgentMessageSeverity : byte +{ + Verbose = 0, + Warning = 1, + Error = 2, +} diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs index 1b9342ed8cf6..58094f6b5197 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs @@ -1,12 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - using System.Buffers; using System.Collections.Immutable; -using System.Diagnostics; -using System.Net.WebSockets; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.Extensions.HotReload; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools @@ -19,7 +17,12 @@ internal sealed class BlazorWebAssemblyDeltaApplier(IReporter reporter, BrowserR private ImmutableArray _cachedCapabilities; private readonly SemaphoreSlim _capabilityRetrievalSemaphore = new(initialCount: 1); - private int _sequenceId; + private int _updateId; + + public override void Dispose() + { + // Do nothing. + } public override void CreateConnection(string namedPipeName, CancellationToken cancellationToken) { @@ -71,32 +74,37 @@ async Task> RetrieveAsync(CancellationToken cancellationT } else { - await browserRefreshServer.SendJsonSerlialized(default(BlazorRequestApplyUpdateCapabilities), cancellationToken); - - // We'll query the browser and ask it send capabilities. - var response = await browserRefreshServer.ReceiveAsync(buffer, cancellationToken); - if (!response.HasValue || !response.Value.EndOfMessage || response.Value.MessageType != WebSocketMessageType.Text) - { - throw new ApplicationException("Unable to connect to the browser refresh server."); - } - - capabilities = Encoding.UTF8.GetString(buffer.AsSpan(0, response.Value.Count)); - - var shouldFallBackToDefaultCapabilities = false; - - // error while fetching capabilities from WASM: - if (capabilities.StartsWith('!')) + string? capabilityString = null; + + await browserRefreshServer.SendAndReceiveAsync( + request: _ => default(JsonGetApplyUpdateCapabilitiesRequest), + response: (value, reporter) => + { + var str = Encoding.UTF8.GetString(value); + if (str.StartsWith('!')) + { + reporter.Verbose($"Exception while reading WASM runtime capabilities: {str[1..]}"); + } + else if (str.Length == 0) + { + reporter.Verbose($"Unable to read WASM runtime capabilities"); + } + else if (capabilityString == null) + { + capabilityString = str; + } + else if (capabilityString != str) + { + reporter.Verbose($"Received different capabilities from different browsers:{Environment.NewLine}'{str}'{Environment.NewLine}'{capabilityString}'"); + } + }, + cancellationToken); + + if (capabilityString != null) { - Reporter.Verbose($"Exception while reading WASM runtime capabilities: {capabilities[1..]}"); - shouldFallBackToDefaultCapabilities = true; + capabilities = capabilityString; } - else if (capabilities.Length == 0) - { - Reporter.Verbose($"Unable to read WASM runtime capabilities"); - shouldFallBackToDefaultCapabilities = true; - } - - if (shouldFallBackToDefaultCapabilities) + else { capabilities = GetDefaultCapabilities(targetFrameworkVersion); Reporter.Verbose($"Falling back to default WASM capabilities: '{capabilities}'"); @@ -144,91 +152,89 @@ public override async Task Apply(ImmutableArray new UpdatePayload - { - SharedSecret = sharedSecret, - Deltas = updates.Select(update => new UpdateDelta - { - SequenceId = _sequenceId++, - ModuleId = update.ModuleId, - MetadataDelta = update.MetadataDelta.ToArray(), - ILDelta = update.ILDelta.ToArray(), - UpdatedTypes = update.UpdatedTypes.ToArray(), - }) - }, cancellationToken); - - bool result = await ReceiveApplyUpdateResult(browserRefreshServer, cancellationToken); + var anySuccess = false; + var anyFailure = false; - return !result ? ApplyStatus.Failed : (applicableUpdates.Count < updates.Length) ? ApplyStatus.SomeChangesApplied : ApplyStatus.AllChangesApplied; - } - - private async Task ReceiveApplyUpdateResult(BrowserRefreshServer browserRefresh, CancellationToken cancellationToken) - { - var buffer = new byte[1]; - - var result = await browserRefresh.ReceiveAsync(buffer, cancellationToken); - if (result is not { MessageType: WebSocketMessageType.Binary }) - { - // A null result indicates no clients are connected. No deltas could have been applied in this state. - Reporter.Verbose("Apply confirmation: No browser is connected"); - return false; - } + // Make sure to send the same update to all browsers, the only difference is the shared secret. - if (result is { Count: 1, EndOfMessage: true }) + var updateId = _updateId++; + var deltas = updates.Select(update => new JsonDelta { - return buffer[0] == 1; - } - - Reporter.Verbose("Browser failed to apply the change and reported error:"); + ModuleId = update.ModuleId, + MetadataDelta = [.. update.MetadataDelta], + ILDelta = [.. update.ILDelta], + PdbDelta = [.. update.PdbDelta], + UpdatedTypes = [.. update.UpdatedTypes], + }).ToArray(); - buffer = new byte[1024]; - var messageStream = new MemoryStream(); + var loggingLevel = Reporter.IsVerbose ? ResponseLoggingLevel.Verbose : ResponseLoggingLevel.WarningsAndErrors; - while (true) - { - result = await browserRefresh.ReceiveAsync(buffer, cancellationToken); - if (result is not { MessageType: WebSocketMessageType.Binary }) + await browserRefreshServer.SendAndReceiveAsync( + request: sharedSecret => new JsonApplyHotReloadDeltasRequest { - Reporter.Verbose("Failed to receive error message"); - break; - } - - messageStream.Write(buffer, 0, result.Value.Count); - - if (result is { EndOfMessage: true }) + SharedSecret = sharedSecret, + UpdateId = updateId, + Deltas = deltas, + ResponseLoggingLevel = (int)loggingLevel + }, + response: (value, reporter) => { - // message and stack trace are separated by '\0' - Reporter.Verbose(Encoding.UTF8.GetString(messageStream.ToArray()).Replace("\0", Environment.NewLine)); - break; - } - } + var data = BrowserRefreshServer.DeserializeJson(value); - return false; - } + if (data.Success) + { + anySuccess = true; + } + else + { + anyFailure = true; + } - public override void Dispose() - { - // Do nothing. + ReportLog(reporter, data.Log.Select(entry => (entry.Message, (AgentMessageSeverity)entry.Severity))); + }, + cancellationToken); + + // If no browser is connected we assume the changes have been applied. + // If at least one browser suceeds we consider the changes successfully applied. + // TODO: + // The refresh server should remember the deltas and apply them to browsers connected in future. + // Currently the changes are remembered on the dev server and sent over there from the browser. + // If no browser is connected the changes are not sent though. + return (!anySuccess && anyFailure) ? ApplyStatus.Failed : (applicableUpdates.Count < updates.Length) ? ApplyStatus.SomeChangesApplied : ApplyStatus.AllChangesApplied; } - private readonly struct UpdatePayload + private readonly struct JsonApplyHotReloadDeltasRequest { - public string Type => "BlazorHotReloadDeltav2"; + public string Type => "BlazorHotReloadDeltav3"; public string? SharedSecret { get; init; } - public IEnumerable Deltas { get; init; } + + public int UpdateId { get; init; } + public JsonDelta[] Deltas { get; init; } + public int ResponseLoggingLevel { get; init; } } - private readonly struct UpdateDelta + private readonly struct JsonDelta { - public int SequenceId { get; init; } - public string ServerId { get; init; } public Guid ModuleId { get; init; } public byte[] MetadataDelta { get; init; } public byte[] ILDelta { get; init; } + public byte[] PdbDelta { get; init; } public int[] UpdatedTypes { get; init; } } - private readonly struct BlazorRequestApplyUpdateCapabilities + private readonly struct JsonApplyDeltasResponse + { + public bool Success { get; init; } + public IEnumerable Log { get; init; } + } + + private readonly struct JsonLogEntry + { + public string Message { get; init; } + public int Severity { get; init; } + } + + private readonly struct JsonGetApplyUpdateCapabilitiesRequest { public string Type => "BlazorRequestApplyUpdateCapabilities2"; } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index 73b3329f8fdb..a3e26556b869 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -101,17 +101,18 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken) _reporter.Report(MessageDescriptor.HotReloadSessionStarted); } - private DeltaApplier CreateDeltaApplier(ProjectGraphNode projectNode, BrowserRefreshServer? browserRefreshServer, IReporter processReporter) - => HotReloadProfileReader.InferHotReloadProfile(projectNode, _reporter) switch + private static DeltaApplier CreateDeltaApplier(HotReloadProfile profile, Version? targetFramework, BrowserRefreshServer? browserRefreshServer, IReporter processReporter) + => profile switch { - HotReloadProfile.BlazorWebAssembly => new BlazorWebAssemblyDeltaApplier(processReporter, browserRefreshServer!, projectNode.GetTargetFrameworkVersion()), - HotReloadProfile.BlazorHosted => new BlazorWebAssemblyHostedDeltaApplier(processReporter, browserRefreshServer!, projectNode.GetTargetFrameworkVersion()), + HotReloadProfile.BlazorWebAssembly => new BlazorWebAssemblyDeltaApplier(processReporter, browserRefreshServer!, targetFramework), + HotReloadProfile.BlazorHosted => new BlazorWebAssemblyHostedDeltaApplier(processReporter, browserRefreshServer!, targetFramework), _ => new DefaultDeltaApplier(processReporter), }; public async Task TrackRunningProjectAsync( ProjectGraphNode projectNode, ProjectOptions projectOptions, + HotReloadProfile profile, string namedPipeName, BrowserRefreshServer? browserRefreshServer, ProcessSpec processSpec, @@ -122,7 +123,8 @@ private DeltaApplier CreateDeltaApplier(ProjectGraphNode projectNode, BrowserRef { var projectPath = projectNode.ProjectInstance.FullPath; - var deltaApplier = CreateDeltaApplier(projectNode, browserRefreshServer, processReporter); + var targetFramework = projectNode.GetTargetFrameworkVersion(); + var deltaApplier = CreateDeltaApplier(profile, targetFramework, browserRefreshServer, processReporter); var processExitedSource = new CancellationTokenSource(); var processCommunicationCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(processExitedSource.Token, cancellationToken); diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs index 0bdceee705ca..80487deeb808 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs @@ -88,6 +88,7 @@ public override async Task Apply(ImmutableArray ReceiveApplyUpdateResult(CancellationToken cancellation return false; } - foreach (var (message, severity) in UpdatePayload.ReadLog(_pipe)) - { - switch (severity) - { - case AgentMessageSeverity.Verbose: - Reporter.Verbose(message, emoji: "🕵️"); - break; - - case AgentMessageSeverity.Error: - Reporter.Error(message); - break; - - case AgentMessageSeverity.Warning: - Reporter.Warn(message, emoji: "⚠"); - break; - - default: - Reporter.Error($"Unexpected message severity: {severity}"); - return false; - } - } - + ReportLog(Reporter, UpdatePayload.ReadLog(_pipe)); return true; } finally diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs index 8dfd06743312..83909a36b693 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs @@ -4,6 +4,7 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.Extensions.HotReload; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools @@ -27,6 +28,27 @@ internal abstract class DeltaApplier(IReporter reporter) : IDisposable public abstract Task Apply(ImmutableArray updates, CancellationToken cancellationToken); public abstract void Dispose(); + + public static void ReportLog(IReporter reporter, IEnumerable<(string message, AgentMessageSeverity severity)> log) + { + foreach (var (message, severity) in log) + { + switch (severity) + { + case AgentMessageSeverity.Error: + reporter.Error(message); + break; + + case AgentMessageSeverity.Warning: + reporter.Warn(message, emoji: "⚠"); + break; + + default: + reporter.Verbose(message, emoji: "🕵️"); + break; + } + } + } } internal enum ApplyStatus diff --git a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs index d5ce198f6518..ca9cb00d0b2c 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs @@ -3,19 +3,6 @@ namespace Microsoft.Extensions.HotReload { - internal enum ResponseLoggingLevel : byte - { - WarningsAndErrors = 0, - Verbose = 1, - } - - internal enum AgentMessageSeverity : byte - { - Verbose = 0, - Warning = 1, - Error = 2, - } - internal readonly struct UpdatePayload(IReadOnlyList deltas, ResponseLoggingLevel responseLoggingLevel) { public const byte ApplySuccessValue = 0; @@ -40,6 +27,7 @@ public async ValueTask WriteAsync(Stream stream, CancellationToken cancellationT binaryWriter.Write(delta.ModuleId.ToString()); await WriteBytesAsync(binaryWriter, delta.MetadataDelta, cancellationToken); await WriteBytesAsync(binaryWriter, delta.ILDelta, cancellationToken); + await WriteBytesAsync(binaryWriter, delta.PdbDelta, cancellationToken); WriteIntArray(binaryWriter, delta.UpdatedTypes); } @@ -104,9 +92,10 @@ public static async ValueTask ReadAsync(Stream stream, Cancellati var moduleId = Guid.Parse(binaryReader.ReadString()); var metadataDelta = await ReadBytesAsync(binaryReader, cancellationToken); var ilDelta = await ReadBytesAsync(binaryReader, cancellationToken); + var pdbDelta = await ReadBytesAsync(binaryReader, cancellationToken); var updatedTypes = ReadIntArray(binaryReader); - deltas[i] = new UpdateDelta(moduleId, metadataDelta: metadataDelta, ilDelta: ilDelta, updatedTypes); + deltas[i] = new UpdateDelta(moduleId, metadataDelta: metadataDelta, ilDelta: ilDelta, pdbDelta: pdbDelta, updatedTypes); } var responseLoggingLevel = (ResponseLoggingLevel)binaryReader.ReadByte(); @@ -163,22 +152,6 @@ static int[] ReadIntArray(BinaryReader binaryReader) } } - internal readonly struct UpdateDelta - { - public Guid ModuleId { get; } - public byte[] MetadataDelta { get; } - public byte[] ILDelta { get; } - public int[] UpdatedTypes { get; } - - public UpdateDelta(Guid moduleId, byte[] metadataDelta, byte[] ilDelta, int[] updatedTypes) - { - ModuleId = moduleId; - MetadataDelta = metadataDelta; - ILDelta = ilDelta; - UpdatedTypes = updatedTypes; - } - } - internal readonly struct ClientInitializationPayload { private const byte Version = 0; diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs index 9185f32044c2..3103124a5a1f 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs @@ -47,6 +47,12 @@ public EnvironmentOptions EnvironmentOptions return null; } + var profile = HotReloadProfileReader.InferHotReloadProfile(projectNode, Reporter); + + // Blazor WASM does not need dotnet applier as all changes are applied in the browser, + // the process being launched is a dev server. + var injectDeltaApplier = profile != HotReloadProfile.BlazorWebAssembly; + var processSpec = new ProcessSpec { Executable = EnvironmentOptions.MuxerPath, @@ -62,10 +68,6 @@ public EnvironmentOptions EnvironmentOptions // Directives: - environmentBuilder.DotNetStartupHookDirective.Add(DeltaApplier.StartupHookPath); - environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetModifiableAssemblies, "debug"); - environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetWatchHotReloadNamedPipeName, namedPipeName); - // Variables: foreach (var (name, value) in projectOptions.LaunchEnvironmentVariables) @@ -84,19 +86,26 @@ public EnvironmentOptions EnvironmentOptions environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatch, "1"); environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatchIteration, (Iteration + 1).ToString(CultureInfo.InvariantCulture)); - // Do not ask agent to log to stdout until https://github.com/dotnet/sdk/issues/40484 is fixed. - // For now we need to set the env variable explicitly when we need to diagnose issue with the agent. - // Build targets might launch a process and read it's stdout. If the agent is loaded into such process and starts logging - // to stdout it might interfere with the expected output. - //if (context.Options.Verbose) - //{ - // environmentBuilder.SetVariable(EnvironmentVariables.Names.HotReloadDeltaClientLogMessages, "1"); - //} - - // TODO: workaround for https://github.com/dotnet/sdk/issues/40484 - var targetPath = projectNode.ProjectInstance.GetPropertyValue("RunCommand"); - environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatchHotReloadTargetProcessPath, targetPath); - Reporter.Verbose($"Target process is '{targetPath}'"); + if (injectDeltaApplier) + { + environmentBuilder.DotNetStartupHookDirective.Add(DeltaApplier.StartupHookPath); + environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetModifiableAssemblies, "debug"); + environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetWatchHotReloadNamedPipeName, namedPipeName); + + // Do not ask agent to log to stdout until https://github.com/dotnet/sdk/issues/40484 is fixed. + // For now we need to set the env variable explicitly when we need to diagnose issue with the agent. + // Build targets might launch a process and read it's stdout. If the agent is loaded into such process and starts logging + // to stdout it might interfere with the expected output. + //if (context.Options.Verbose) + //{ + // environmentBuilder.SetVariable(EnvironmentVariables.Names.HotReloadDeltaClientLogMessages, "1"); + //} + + // TODO: workaround for https://github.com/dotnet/sdk/issues/40484 + var targetPath = projectNode.ProjectInstance.GetPropertyValue("RunCommand"); + environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatchHotReloadTargetProcessPath, targetPath); + Reporter.Verbose($"Target process is '{targetPath}'"); + } var browserRefreshServer = await browserConnector.LaunchOrRefreshBrowserAsync(projectNode, processSpec, environmentBuilder, projectOptions, cancellationToken); environmentBuilder.ConfigureProcess(processSpec); @@ -106,6 +115,7 @@ public EnvironmentOptions EnvironmentOptions return await compilationHandler.TrackRunningProjectAsync( projectNode, projectOptions, + profile, namedPipeName, browserRefreshServer, processSpec, diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs b/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs new file mode 100644 index 000000000000..b8bdb153075c --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs @@ -0,0 +1,10 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.Extensions.HotReload; + +internal enum ResponseLoggingLevel : byte +{ + WarningsAndErrors = 0, + Verbose = 1, +} diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs index 3a6961854987..a5659df6c339 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs @@ -99,7 +99,7 @@ private static async Task HandleBrowserRefresh(BrowserRefreshServer browserRefre // referenced project. var cssFilePath = Path.GetFileNameWithoutExtension(containingProjectPath) + ".css"; var message = new UpdateStaticFileMessage { Path = cssFilePath }; - await browserRefreshServer.SendJsonSerlialized(message, cancellationToken); + await browserRefreshServer.SendJsonMessageAsync(message, cancellationToken); } private readonly struct UpdateStaticFileMessage diff --git a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs index ce53bc8a7ce3..0d768832b923 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs @@ -71,7 +71,7 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList f { reporter.Verbose($"Sending static file update request for asset '{path}'"); var message = JsonSerializer.SerializeToUtf8Bytes(new UpdateStaticFileMessage { Path = path }, s_jsonSerializerOptions); - await request.Key.SendMessage(message, cancellationToken); + await request.Key.SendAsync(message, cancellationToken); } }); diff --git a/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs b/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs new file mode 100644 index 000000000000..a05d91784ba1 --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs @@ -0,0 +1,13 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.Extensions.HotReload; + +internal readonly struct UpdateDelta(Guid moduleId, byte[] metadataDelta, byte[] ilDelta, byte[] pdbDelta, int[] updatedTypes) +{ + public Guid ModuleId { get; } = moduleId; + public byte[] MetadataDelta { get; } = metadataDelta; + public byte[] ILDelta { get; } = ilDelta; + public byte[] PdbDelta { get; } = pdbDelta; + public int[] UpdatedTypes { get; } = updatedTypes; +} diff --git a/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs new file mode 100644 index 000000000000..e709c7cf479d --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs @@ -0,0 +1,28 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Build.Graph; +using Microsoft.DotNet.Watcher.Internal; +using Microsoft.Extensions.Tools.Internal; + +namespace Microsoft.DotNet.Watcher; + +internal sealed class BrowserSpecificReporter(int browserId, IReporter underlyingReporter) : IReporter +{ + private readonly string _prefix = $"[Browser #{browserId}] "; + + public bool IsVerbose + => underlyingReporter.IsVerbose; + + public bool EnableProcessOutputReporting + => false; + + public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) + => throw new InvalidOperationException(); + + public void ReportProcessOutput(OutputLine line) + => throw new InvalidOperationException(); + + public void Report(MessageDescriptor descriptor, string prefix, object?[] args) + => underlyingReporter.Report(descriptor, _prefix + prefix, args); +} diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs index 977253f943a5..8d974e970487 100644 --- a/src/BuiltInTools/dotnet-watch/Program.cs +++ b/src/BuiltInTools/dotnet-watch/Program.cs @@ -7,7 +7,6 @@ using System.Runtime.Loader; using Microsoft.Build.Graph; using Microsoft.Build.Locator; -using Microsoft.CodeAnalysis.ChangeSignature; using Microsoft.DotNet.Watcher.Internal; using Microsoft.DotNet.Watcher.Tools; using Microsoft.Extensions.Tools.Internal; diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs index b214f8ac2ed9..59d3f6dcb488 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs @@ -3,7 +3,6 @@ using System.Text.Json; using Microsoft.AspNetCore.Http; -using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { @@ -12,153 +11,167 @@ public class BlazorWasmHotReloadMiddlewareTest [Fact] public async Task DeltasAreSavedOnPost() { - // Arrange + var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); + var context = new DefaultHttpContext(); context.Request.Method = "post"; - var deltas = new[] + var update = new BlazorWasmHotReloadMiddleware.Update { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], - } + Id = 0, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta1", + PdbDelta = "PDBDelta1", + MetadataDelta = "MetadataDelta1", + UpdatedTypes = [42], + }, + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta2", + PdbDelta = "PDBDelta2", + MetadataDelta = "MetadataDelta2", + UpdatedTypes = [42], + } + ] }; - context.Request.Body = GetJson(deltas); - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); + context.Request.Body = GetJson(update); - // Act await middleware.InvokeAsync(context); - // Assert - AssertDeltas(deltas, middleware.Deltas); - Assert.NotEqual(0, context.Response.Headers["ETag"].Count); + AssertUpdates([update], middleware.Updates); } [Fact] public async Task DuplicateDeltasOnPostAreIgnored() { - // Arrange - var deltas = new[] + var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); + + var updates = new BlazorWasmHotReloadMiddleware.Update[] { - new BlazorWasmHotReloadMiddleware.UpdateDelta + new() { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], + Id = 0, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta1", + PdbDelta = "PDBDelta1", + MetadataDelta = "MetadataDelta1", + UpdatedTypes = [42], + } + ] }, - new BlazorWasmHotReloadMiddleware.UpdateDelta + new() { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], + Id = 1, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta2", + PdbDelta = "PDBDelta2", + MetadataDelta = "MetadataDelta2", + UpdatedTypes = [42], + } + ] } }; + var context = new DefaultHttpContext(); context.Request.Method = "post"; - context.Request.Body = GetJson(deltas); + context.Request.Body = GetJson(updates[0]); - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - - // Act 1 await middleware.InvokeAsync(context); - // Act 2 context = new DefaultHttpContext(); context.Request.Method = "post"; - context.Request.Body = GetJson(deltas); + context.Request.Body = GetJson(updates[1]); await middleware.InvokeAsync(context); // Assert - AssertDeltas(deltas, middleware.Deltas); - Assert.NotEqual(0, context.Response.Headers["ETag"].Count); + AssertUpdates(updates, middleware.Updates); } [Fact] public async Task MultipleDeltaPayloadsCanBeAccepted() { - // Arrange - var deltas = new List + var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); + + var update = new BlazorWasmHotReloadMiddleware.Update() { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], - } + Id = 0, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta1", + PdbDelta = "PDBDelta1", + MetadataDelta = "MetadataDelta1", + UpdatedTypes = [42], + }, + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta2", + PdbDelta = "PDBDelta2", + MetadataDelta = "MetadataDelta2", + UpdatedTypes = [42], + } + ] }; + var context = new DefaultHttpContext(); context.Request.Method = "post"; - context.Request.Body = GetJson(deltas); - - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - - // Act 1 + context.Request.Body = GetJson(update); await middleware.InvokeAsync(context); - // Act 2 - var newDeltas = new[] + var newUpdate = new BlazorWasmHotReloadMiddleware.Update() { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 3, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta3", - MetadataDelta = "MetadataDelta3", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 4, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta4", - MetadataDelta = "MetadataDelta4", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 5, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta5", - MetadataDelta = "MetadataDelta5", - UpdatedTypes = [42], - }, + Id = 1, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta3", + PdbDelta = "PDBDelta3", + MetadataDelta = "MetadataDelta3", + UpdatedTypes = [42], + }, + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta4", + PdbDelta = "PDBDelta4", + MetadataDelta = "MetadataDelta4", + UpdatedTypes = [42], + }, + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta5", + PdbDelta = "PDBDelta5", + MetadataDelta = "MetadataDelta5", + UpdatedTypes = [42], + }, + ] }; context = new DefaultHttpContext(); context.Request.Method = "post"; - context.Request.Body = GetJson(newDeltas); + context.Request.Body = GetJson(newUpdate); await middleware.InvokeAsync(context); - // Assert - deltas.AddRange(newDeltas); - AssertDeltas(deltas, middleware.Deltas); - Assert.NotEqual(0, context.Response.Headers["ETag"].Count); + AssertUpdates([update, newUpdate], middleware.Updates); } [Fact] @@ -185,26 +198,33 @@ public async Task GetReturnsDeltas() var stream = new MemoryStream(); context.Response.Body = stream; var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var deltas = new List + var updates = new List { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta + new() { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], + Id = 0, + Deltas = + [ + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta1", + PdbDelta = "PdbDelta1", + MetadataDelta = "MetadataDelta1", + UpdatedTypes = [42], + }, + new() + { + ModuleId = Guid.NewGuid().ToString(), + ILDelta = "ILDelta2", + PdbDelta = "PdbDelta2", + MetadataDelta = "MetadataDelta2", + UpdatedTypes = [42], + } + ] } }; - middleware.Deltas.AddRange(deltas); + middleware.Updates.AddRange(updates); // Act await middleware.InvokeAsync(context); @@ -212,130 +232,35 @@ public async Task GetReturnsDeltas() // Assert Assert.Equal(200, context.Response.StatusCode); Assert.Equal( - JsonSerializer.SerializeToUtf8Bytes(deltas, new JsonSerializerOptions(JsonSerializerDefaults.Web)), + JsonSerializer.SerializeToUtf8Bytes(updates, new JsonSerializerOptions(JsonSerializerDefaults.Web)), stream.ToArray()); - Assert.NotEqual(0, context.Response.Headers[HeaderNames.ETag].Count); } - [Fact] - public async Task GetReturnsNotModified_IfNoneMatchApplies() + private static void AssertUpdates(IReadOnlyList expected, IReadOnlyList actual) { - // Arrange - var context = new DefaultHttpContext(); - context.Request.Method = "get"; - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var deltas = new List - { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], - } - }; - middleware.Deltas.AddRange(deltas); - - // Act 1 - await middleware.InvokeAsync(context); - var etag = context.Response.Headers[HeaderNames.ETag]; - - // Act 2 - context = new DefaultHttpContext(); - context.Request.Method = "get"; - context.Request.Headers[HeaderNames.IfNoneMatch] = etag; - - await middleware.InvokeAsync(context); - - // Assert 2 - Assert.Equal(StatusCodes.Status304NotModified, context.Response.StatusCode); - } + Assert.Equal(expected.Count, actual.Count); - [Fact] - public async Task GetReturnsUpdatedResults_IfNoneMatchFails() - { - // Arrange - var context = new DefaultHttpContext(); - context.Request.Method = "get"; - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var deltas = new List + for (var u = 0; u < expected.Count; u++) { - new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 0, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta1", - MetadataDelta = "MetadataDelta1", - UpdatedTypes = [42], - }, - new BlazorWasmHotReloadMiddleware.UpdateDelta + var expectedUpdate = expected[u]; + var actualUpdate = actual[u]; + Assert.Equal(expectedUpdate.Id, actualUpdate.Id); + Assert.Equal(expectedUpdate.Deltas.Length, expectedUpdate.Deltas.Length); + + for (var i = 0; i < expectedUpdate.Deltas.Length; i++) { - SequenceId = 1, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta2", - MetadataDelta = "MetadataDelta2", - UpdatedTypes = [42], + Assert.Equal(expectedUpdate.Deltas[i].ILDelta, actualUpdate.Deltas[i].ILDelta); + Assert.Equal(expectedUpdate.Deltas[i].PdbDelta, actualUpdate.Deltas[i].PdbDelta); + Assert.Equal(expectedUpdate.Deltas[i].MetadataDelta, actualUpdate.Deltas[i].MetadataDelta); + Assert.Equal(expectedUpdate.Deltas[i].ModuleId, actualUpdate.Deltas[i].ModuleId); + Assert.Equal(expectedUpdate.Deltas[i].UpdatedTypes, actualUpdate.Deltas[i].UpdatedTypes); } - }; - middleware.Deltas.AddRange(deltas); - - // Act 1 - await middleware.InvokeAsync(context); - var etag = context.Response.Headers[HeaderNames.ETag]; - - // Act 2 - var update = new BlazorWasmHotReloadMiddleware.UpdateDelta - { - SequenceId = 3, - ModuleId = Guid.NewGuid().ToString(), - ILDelta = "ILDelta3", - MetadataDelta = "MetadataDelta3", - UpdatedTypes = [42], - }; - deltas.Add(update); - middleware.Deltas.Add(update); - context = new DefaultHttpContext(); - context.Request.Method = "get"; - context.Request.Headers[HeaderNames.IfNoneMatch] = etag; - var stream = new MemoryStream(); - context.Response.Body = stream; - - await middleware.InvokeAsync(context); - - // Assert 2 - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - Assert.Equal( - JsonSerializer.SerializeToUtf8Bytes(deltas, new JsonSerializerOptions(JsonSerializerDefaults.Web)), - stream.ToArray()); - Assert.NotEqual(etag, context.Response.Headers[HeaderNames.ETag]); - } - - private static void AssertDeltas(IReadOnlyList expected, IReadOnlyList actual) - { - Assert.Equal(expected.Count, actual.Count); - - for (var i = 0; i < expected.Count; i++) - { - Assert.Equal(expected[i].ILDelta, actual[i].ILDelta); - Assert.Equal(expected[i].MetadataDelta, actual[i].MetadataDelta); - Assert.Equal(expected[i].ModuleId, actual[i].ModuleId); - Assert.Equal(expected[i].SequenceId, actual[i].SequenceId); - Assert.Equal(expected[i].UpdatedTypes, actual[i].UpdatedTypes); } } - private Stream GetJson(IReadOnlyList deltas) + private static Stream GetJson(object obj) { - var bytes = JsonSerializer.SerializeToUtf8Bytes(deltas, new JsonSerializerOptions(JsonSerializerDefaults.Web)); + var bytes = JsonSerializer.SerializeToUtf8Bytes(obj, new JsonSerializerOptions(JsonSerializerDefaults.Web)); return new MemoryStream(bytes); } } diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs index c09dd8c64274..1fa4b862b693 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs @@ -492,14 +492,12 @@ public async Task InvokeAsync_AttachesHeadersToResponse() var middleware = new BrowserRefreshMiddleware(async (context) => { - context.Response.ContentType = "application/json"; await context.Response.StartAsync(); await context.Response.WriteAsync("{ }"); }, NullLogger.Instance); - UnsafeBrowserRefreshMiddlewareAccessor.GetSetPrivateDotnetModifiableAssemblies(middleware) = "true"; - UnsafeBrowserRefreshMiddlewareAccessor.GetSetPrivateAspnetcoreBrowserTools(middleware) = "true"; + middleware.Test_SetEnvironment(dotnetModifiableAssemblies: "true", aspnetcoreBrowserTools: "true"); // Act await middleware.InvokeAsync(context); @@ -545,8 +543,7 @@ public async Task InvokeAsync_DoesNotAttachHeaders_WhenAlreadyAttached() await context.Response.WriteAsync("{ }"); }, NullLogger.Instance); - UnsafeBrowserRefreshMiddlewareAccessor.GetSetPrivateDotnetModifiableAssemblies(middleware) = "true"; - UnsafeBrowserRefreshMiddlewareAccessor.GetSetPrivateAspnetcoreBrowserTools(middleware) = "true"; + middleware.Test_SetEnvironment(dotnetModifiableAssemblies: "true", aspnetcoreBrowserTools: "true"); // Act await middleware.InvokeAsync(context); @@ -598,15 +595,6 @@ public async Task InvokeAsync_AddsScriptToThePage() Assert.Equal("

Hello world

", responseContent); } - private static class UnsafeBrowserRefreshMiddlewareAccessor - { - [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_dotnetModifiableAssemblies")] - extern internal static ref string GetSetPrivateDotnetModifiableAssemblies(BrowserRefreshMiddleware middleware); - - [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_aspnetcoreBrowserTools")] - extern internal static ref string GetSetPrivateAspnetcoreBrowserTools(BrowserRefreshMiddleware middleware); - } - private class TestHttpResponseFeature : IHttpResponseFeature, IHttpResponseBodyFeature { private (Func callback, object state)[] _callbacks = []; diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/HostingStartupTest.cs b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/HostingStartupTest.cs index 8e046cc1c3af..5050e4c8dd15 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/HostingStartupTest.cs +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/HostingStartupTest.cs @@ -45,18 +45,32 @@ public async Task GetBlazorHotReloadMiddlewareWorks() [Fact] public async Task PostBlazorHotReloadMiddlewareWorks() { - // Arrange var requestDelegate = GetRequestDelegate(); var context = new DefaultHttpContext(); context.Request.Path = "/_framework/blazor-hotreload"; context.Request.Method = "POST"; - context.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("[]")); - // Act + var updateJson = """ + {"id":0,"deltas":[{"moduleId":"9BBB9BBD-48F0-4EB2-B7A3-956CFC220CC4","metadataDelta":"","ilDelta":"","pdbDelta":"","updatedTypes":[1,2,3]}]} + """; + + context.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes(updateJson)); + await requestDelegate(context); - // Assert Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); + + context.Request.Path = "/_framework/blazor-hotreload"; + context.Request.Method = "GET"; + + var body = new MemoryStream(); + context.Response.Body = body; + + await requestDelegate(context); + + var bodyJson = Encoding.UTF8.GetString(body.ToArray()); + + Assert.Equal($"[{updateJson}]", bodyJson); } [Fact] diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 6e64e9e91dc9..8c46f7e490c2 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -198,6 +198,9 @@ public async Task BlazorWasm() App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); App.AssertOutputContains("dotnet watch ⌚ Launching browser: http://localhost:5000/"); + // shouldn't see any agent messages (agent is not loaded into blazor-devserver): + AssertEx.DoesNotContain("🕵️", App.Process.Output); + var newSource = """ @page "/"

Updated

diff --git a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs index fa4f9060173d..36cd57fc92e4 100644 --- a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs +++ b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs @@ -11,19 +11,20 @@ public class UpdatePayloadTests public async Task UpdatePayload_CanRoundTrip() { var initial = new UpdatePayload( - new[] - { + [ new UpdateDelta( moduleId: Guid.NewGuid(), - ilDelta: new byte[] { 0, 0, 1 }, - metadataDelta: new byte[] { 0, 1, 1 }, - updatedTypes: Array.Empty()), + ilDelta: [0, 0, 1], + metadataDelta: [0, 1, 1], + pdbDelta: [2, 3], + updatedTypes: [5, 4]), new UpdateDelta( moduleId: Guid.NewGuid(), - ilDelta: new byte[] { 1, 0, 0 }, - metadataDelta: new byte[] { 1, 0, 1 }, - updatedTypes: Array.Empty()) - }, + ilDelta: [1, 0, 0], + metadataDelta: [1, 0, 1], + pdbDelta: [7, 8], + updatedTypes: [9]) + ], responseLoggingLevel: ResponseLoggingLevel.Verbose); using var stream = new MemoryStream(); @@ -39,19 +40,20 @@ public async Task UpdatePayload_CanRoundTrip() public async Task UpdatePayload_CanRoundTripUpdatedTypes() { var initial = new UpdatePayload( - new[] - { + [ new UpdateDelta( moduleId: Guid.NewGuid(), - ilDelta: new byte[] { 0, 0, 1 }, - metadataDelta: new byte[] { 0, 1, 1 }, - updatedTypes: new int[] { 60, 74, 22323 }), + ilDelta: [0, 0, 1], + metadataDelta: [0, 1, 1], + pdbDelta: [], + updatedTypes: [60, 74, 22323]), new UpdateDelta( moduleId: Guid.NewGuid(), - ilDelta: new byte[] { 1, 0, 0 }, - metadataDelta: new byte[] { 1, 0, 1 }, - updatedTypes: new int[] { -18 }) - }, + ilDelta: [1, 0, 0], + metadataDelta: [1, 0, 1], + pdbDelta: [], + updatedTypes: [-18]) + ], responseLoggingLevel: ResponseLoggingLevel.WarningsAndErrors); using var stream = new MemoryStream(); @@ -67,14 +69,14 @@ public async Task UpdatePayload_CanRoundTripUpdatedTypes() public async Task UpdatePayload_WithLargeDeltas_CanRoundtrip() { var initial = new UpdatePayload( - new[] - { + [ new UpdateDelta( moduleId: Guid.NewGuid(), - ilDelta: Enumerable.Range(0, 68200).Select(c => (byte)(c%2)).ToArray(), - metadataDelta: new byte[] { 0, 1, 1 }, + ilDelta: Enumerable.Range(0, 68200).Select(c => (byte)(c % 2)).ToArray(), + metadataDelta: [0, 1, 1], + pdbDelta: [], updatedTypes: Array.Empty()) - }, + ], responseLoggingLevel: ResponseLoggingLevel.Verbose); using var stream = new MemoryStream(); From 59c2a0e97990bc6ac57eb1ba7d4c8b1f3a35c770 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 00:53:34 +0000 Subject: [PATCH 274/702] Update dependencies from https://github.com/dotnet/razor build 20241105.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.24554.3 -> To Version 9.0.0-preview.24555.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1fc4d6796b5..baa58318b58b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 + fe3286518d4996e087f131136845cf3af47015cf - + https://github.com/dotnet/razor - 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 + fe3286518d4996e087f131136845cf3af47015cf - + https://github.com/dotnet/razor - 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 + fe3286518d4996e087f131136845cf3af47015cf - + https://github.com/dotnet/razor - 26ca8d1fb521b1c3566a0ccc7f409a45443998f4 + fe3286518d4996e087f131136845cf3af47015cf diff --git a/eng/Versions.props b/eng/Versions.props index bcccdde2499e..3f783d1e4ede 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.5 - 9.0.0-preview.24555.5 - 9.0.0-preview.24555.5 + 9.0.0-preview.24555.7 + 9.0.0-preview.24555.7 + 9.0.0-preview.24555.7 From e40f7ff18947cd30215149c86305c9da982e53dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 01:11:50 +0000 Subject: [PATCH 275/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241105.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.24555.1 -> To Version 9.0.0-beta.24555.2 --- 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 027047d9e16e..ff46e8853247 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce - + https://github.com/dotnet/sourcelink b7fa6e76d524dc33698de18617c7a6f49ce207ce diff --git a/eng/Versions.props b/eng/Versions.props index caca220dcf4f..854e4d67b0d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24555.1 - 9.0.0-beta.24555.1 - 9.0.0-beta.24555.1 - 9.0.0-beta.24555.1 - 9.0.0-beta.24555.1 - 9.0.0-beta.24555.1 + 9.0.0-beta.24555.2 + 9.0.0-beta.24555.2 + 9.0.0-beta.24555.2 + 9.0.0-beta.24555.2 + 9.0.0-beta.24555.2 + 9.0.0-beta.24555.2 From cec1a7eb7d47fa2702337fcab41e4b47e0a9a0b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 01:38:16 +0000 Subject: [PATCH 276/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24551.4 -> To Version 4.13.0-2.24555.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e8582cf5ac4..9c1b83045b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 - + https://github.com/dotnet/roslyn - 33e986c4c814f374e853ddc145dcb73a23a15d2f + f9a33f198df6ddfebbb19b255c9f771f07febf08 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2692a60f45fc..108523c6c4c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 - 4.13.0-2.24555.4 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 + 4.13.0-2.24555.5 From 979e48c4f5d3d2bc8d900866b6e4511285d4ebba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 01:40:42 +0000 Subject: [PATCH 277/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.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.13.0-2.24551.4 -> To Version 4.13.0-2.24555.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 9c1b83045b95..6cd013487837 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e - + https://github.com/dotnet/roslyn - f9a33f198df6ddfebbb19b255c9f771f07febf08 + f97c50e8a5b03d27f5d0da16cc9649e07a9df95e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 108523c6c4c6..22366611c6d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 - 4.13.0-2.24555.5 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 + 4.13.0-2.24555.6 From 6ab067b2d83c9f805423b784b4a0b87f870f0945 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 02:18:08 +0000 Subject: [PATCH 278/702] Update dependencies from https://github.com/dotnet/razor build 20241105.8 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.24554.3 -> To Version 9.0.0-preview.24555.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baa58318b58b..0bdf9095213d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - fe3286518d4996e087f131136845cf3af47015cf + bcb8166b9cc819b74de7b744a3a6be3bc1378f3d - + https://github.com/dotnet/razor - fe3286518d4996e087f131136845cf3af47015cf + bcb8166b9cc819b74de7b744a3a6be3bc1378f3d - + https://github.com/dotnet/razor - fe3286518d4996e087f131136845cf3af47015cf + bcb8166b9cc819b74de7b744a3a6be3bc1378f3d - + https://github.com/dotnet/razor - fe3286518d4996e087f131136845cf3af47015cf + bcb8166b9cc819b74de7b744a3a6be3bc1378f3d diff --git a/eng/Versions.props b/eng/Versions.props index 3f783d1e4ede..272a96e30f39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.7 - 9.0.0-preview.24555.7 - 9.0.0-preview.24555.7 + 9.0.0-preview.24555.8 + 9.0.0-preview.24555.8 + 9.0.0-preview.24555.8 From 3bafbabe1a1d7814e7fd191fbba8d4f203b6b30f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 04:58:11 +0000 Subject: [PATCH 279/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.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.13.0-2.24551.4 -> To Version 4.13.0-2.24555.8 --- 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 6cd013487837..4c0df026f9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f - + https://github.com/dotnet/roslyn - f97c50e8a5b03d27f5d0da16cc9649e07a9df95e + 70b267c657778c4f4729aef53a8b17a2db32ed2f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 22366611c6d7..8c8e75259589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 - 4.13.0-2.24555.6 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 + 4.13.0-2.24555.8 From 72b889ed38ed804348f2296e0eec668c1b43bef9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 05:12:55 +0000 Subject: [PATCH 280/702] Update dependencies from https://github.com/dotnet/roslyn build 20241105.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.13.0-2.24551.4 -> To Version 4.13.0-2.24555.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 4c0df026f9e7..a5aa6ea67b72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 - + https://github.com/dotnet/roslyn - 70b267c657778c4f4729aef53a8b17a2db32ed2f + 338a08452ac6b62e4a62b71ec079147a05c19af7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8c8e75259589..60919ada4c60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 - 4.13.0-2.24555.8 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 + 4.13.0-2.24555.7 From b16879be38d8449d7e0f2ae652c20ac2fecf2f94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 05:19:04 +0000 Subject: [PATCH 281/702] Update dependencies from https://github.com/dotnet/razor build 20241105.11 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.24554.3 -> To Version 9.0.0-preview.24555.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bdf9095213d..80410d52604f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - bcb8166b9cc819b74de7b744a3a6be3bc1378f3d + f3a99f74dff65a685bcd52dcf258c55184f10c60 - + https://github.com/dotnet/razor - bcb8166b9cc819b74de7b744a3a6be3bc1378f3d + f3a99f74dff65a685bcd52dcf258c55184f10c60 - + https://github.com/dotnet/razor - bcb8166b9cc819b74de7b744a3a6be3bc1378f3d + f3a99f74dff65a685bcd52dcf258c55184f10c60 - + https://github.com/dotnet/razor - bcb8166b9cc819b74de7b744a3a6be3bc1378f3d + f3a99f74dff65a685bcd52dcf258c55184f10c60 diff --git a/eng/Versions.props b/eng/Versions.props index 272a96e30f39..695e2d7efd7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.8 - 9.0.0-preview.24555.8 - 9.0.0-preview.24555.8 + 9.0.0-preview.24555.11 + 9.0.0-preview.24555.11 + 9.0.0-preview.24555.11 From 128040052354a0e01af39be5a2d33ab5e071afce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 07:42:21 +0000 Subject: [PATCH 282/702] Update dependencies from https://github.com/dotnet/razor build 20241105.12 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.24554.3 -> To Version 9.0.0-preview.24555.12 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80410d52604f..745fc35196af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f3a99f74dff65a685bcd52dcf258c55184f10c60 + 6e796fe6f1790b4ff3923d2de443789257f696f3 - + https://github.com/dotnet/razor - f3a99f74dff65a685bcd52dcf258c55184f10c60 + 6e796fe6f1790b4ff3923d2de443789257f696f3 - + https://github.com/dotnet/razor - f3a99f74dff65a685bcd52dcf258c55184f10c60 + 6e796fe6f1790b4ff3923d2de443789257f696f3 - + https://github.com/dotnet/razor - f3a99f74dff65a685bcd52dcf258c55184f10c60 + 6e796fe6f1790b4ff3923d2de443789257f696f3 diff --git a/eng/Versions.props b/eng/Versions.props index 695e2d7efd7b..d8dcd6723bf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.11 - 9.0.0-preview.24555.11 - 9.0.0-preview.24555.11 + 9.0.0-preview.24555.12 + 9.0.0-preview.24555.12 + 9.0.0-preview.24555.12 From 867fd6cd3d78f988969c56c97dbe874ab1f600b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 10:37:43 +0000 Subject: [PATCH 283/702] Update dependencies from https://github.com/dotnet/msbuild build 20241106.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24555-01 -> To Version 17.13.0-preview-24556-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42c2832a2509..ac423871cf1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - b7195ce54619126f615001bd4e4115059595a177 + 1723af95bb1140d7e24b9e39a09fc379bb672b7a - + https://github.com/dotnet/msbuild - b7195ce54619126f615001bd4e4115059595a177 + 1723af95bb1140d7e24b9e39a09fc379bb672b7a - + https://github.com/dotnet/msbuild - b7195ce54619126f615001bd4e4115059595a177 + 1723af95bb1140d7e24b9e39a09fc379bb672b7a diff --git a/eng/Versions.props b/eng/Versions.props index 38ac35239f1e..776320f8a4d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24555-03 - 17.13.0-preview-24555-03 + 17.13.0-preview-24556-01 + 17.13.0-preview-24556-01 17.11.4 17.12 From 3fc5636a055a8ab4806b83ccc6cbc99d80246ef6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 11:25:47 +0000 Subject: [PATCH 284/702] Update dependencies from https://github.com/dotnet/templating build 20241106.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.100-rtm.24518.2 -> To Version 9.0.101-servicing.24556.3 --- NuGet.config | 19 +------------------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e87cf77613e..b7da16b0568f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,24 +20,7 @@ - - - - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7b9ce085a8c..fe81961b74cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + b699ff195f37e5039d378be3be64ccf7512df50a - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + b699ff195f37e5039d378be3be64ccf7512df50a - + https://github.com/dotnet/templating - e07a90b4df2f1b41a83064cfa3164611756c3746 + b699ff195f37e5039d378be3be64ccf7512df50a diff --git a/eng/Versions.props b/eng/Versions.props index 52d3c2984355..a36307809d56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,13 +203,13 @@ - 9.0.100 + 9.0.101 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.100-rtm.24518.2 + 9.0.101-servicing.24556.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a95fb3bf4e0f63e376c57818f0850f4f01b6fa3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 13:15:08 +0000 Subject: [PATCH 285/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24555.7 -> To Version 4.13.0-2.24556.1 --- 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 91935d5f9691..79ec211108b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 - + https://github.com/dotnet/roslyn - 338a08452ac6b62e4a62b71ec079147a05c19af7 + cc477f631834a1e3cd54f3a379362a8f0691f3f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3a010cb982ba..41cb2b9b1b08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 - 4.13.0-2.24555.7 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 + 4.13.0-2.24556.1 From da7841edb16f222ab03a5bfec1a4f1dd2a56d179 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 13:41:07 +0000 Subject: [PATCH 286/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24555.7 -> To Version 4.13.0-2.24556.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79ec211108b9..9091bb10ea47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc - + https://github.com/dotnet/roslyn - cc477f631834a1e3cd54f3a379362a8f0691f3f1 + a0dce1daada73c352a9f233a909a72a542ac3ebc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 41cb2b9b1b08..c70b17bb033f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 - 4.13.0-2.24556.1 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 + 4.13.0-2.24556.2 From c3e411538e3a60f2f355ad5196ec8d62d1ba610a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 15:30:39 +0000 Subject: [PATCH 287/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24555.7 -> To Version 4.13.0-2.24556.3 --- 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 9091bb10ea47..fe42227d6038 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f - + https://github.com/dotnet/roslyn - a0dce1daada73c352a9f233a909a72a542ac3ebc + ea688b13ddfab43118c09043bce82f131152cc8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c70b17bb033f..2456a6784e7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 - 4.13.0-2.24556.2 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 + 4.13.0-2.24556.3 From 8e978c8e7f20842faec0708e4437582e449de244 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Wed, 6 Nov 2024 17:22:04 +0100 Subject: [PATCH 288/702] Avoid warning about empty NuGetPackageRoot in wpftmp projects --- .../targets/Microsoft.NET.Sdk.targets | 5 +++-- .../GivenThatWeWantToUseFrameworkRoslyn.cs | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index d8ebcd1db6a9..c2ddf51d2639 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -263,9 +263,10 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="'$(_MicrosoftNetSdkCompilersToolsetPackageRootEmpty)' != 'true' and !Exists('$(RoslynTargetsPath)')" FormatArguments="$(NETCoreSdkVersion)" /> - + + Condition="'$(_MicrosoftNetSdkCompilersToolsetPackageRootEmpty)' == 'true' and !($(MSBuildProjectFile.EndsWith('_wpftmp.csproj')) or $(MSBuildProjectFile.EndsWith('_wpftmp.vbproj')))" /> - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf - + https://github.com/dotnet/roslyn - ea688b13ddfab43118c09043bce82f131152cc8f + 6bf991115532d9115f65947efe5b0f8564cbd0cf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2456a6784e7b..e2e3ebee44df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 - 4.13.0-2.24556.3 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 + 4.13.0-2.24556.4 From e04d87f7241d75dd090e8e8f1e45da3730268c51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 17:03:58 +0000 Subject: [PATCH 290/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241106.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.24555.2 -> To Version 9.0.0-beta.24556.1 --- 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 91935d5f9691..400131951d4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - b7fa6e76d524dc33698de18617c7a6f49ce207ce + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 diff --git a/eng/Versions.props b/eng/Versions.props index 3a010cb982ba..120684e3e8ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24555.2 - 9.0.0-beta.24555.2 - 9.0.0-beta.24555.2 - 9.0.0-beta.24555.2 - 9.0.0-beta.24555.2 - 9.0.0-beta.24555.2 + 9.0.0-beta.24556.1 + 9.0.0-beta.24556.1 + 9.0.0-beta.24556.1 + 9.0.0-beta.24556.1 + 9.0.0-beta.24556.1 + 9.0.0-beta.24556.1 From ac831e8d569f05817a2d0177c8ae2fc8acf5b744 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 20:25:36 +0000 Subject: [PATCH 291/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24555.7 -> To Version 4.13.0-2.24556.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7c33d930ed8..56adfdcc2f5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec - + https://github.com/dotnet/roslyn - 6bf991115532d9115f65947efe5b0f8564cbd0cf + a1f2017258e9bc3d348fd75b531808251abeb8ec https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e2e3ebee44df..1d9b0e8fa351 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 - 4.13.0-2.24556.4 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 + 4.13.0-2.24556.5 From 9527219065b91e677bcffdd7fa80dbce96490a15 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 6 Nov 2024 21:44:18 +0100 Subject: [PATCH 292/702] fix oci image tarball creation --- .../LocalDaemons/DockerCli.cs | 170 ++++- .../ManifestListV2.cs | 3 +- .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 26 +- .../Registry/Registry.cs | 104 ++- .../Resources/Strings.Designer.cs | 681 +++++++----------- .../Resources/Strings.resx | 6 + .../Resources/xlf/Strings.cs.xlf | 10 + .../Resources/xlf/Strings.de.xlf | 10 + .../Resources/xlf/Strings.es.xlf | 10 + .../Resources/xlf/Strings.fr.xlf | 10 + .../Resources/xlf/Strings.it.xlf | 10 + .../Resources/xlf/Strings.ja.xlf | 10 + .../Resources/xlf/Strings.ko.xlf | 10 + .../Resources/xlf/Strings.pl.xlf | 10 + .../Resources/xlf/Strings.pt-BR.xlf | 10 + .../Resources/xlf/Strings.ru.xlf | 10 + .../Resources/xlf/Strings.tr.xlf | 10 + .../Resources/xlf/Strings.zh-Hans.xlf | 10 + .../Resources/xlf/Strings.zh-Hant.xlf | 10 + .../DockerRegistryManager.cs | 44 +- .../EndToEndTests.cs | 130 ++++ 21 files changed, 822 insertions(+), 472 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs index 978dd7618ad7..50c81f127c20 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs @@ -31,6 +31,8 @@ internal sealed class DockerCli private string? _fullCommandPath; #endif + private const string _blobsPath = "blobs/sha256"; + public DockerCli(string? command, ILoggerFactory loggerFactory) { if (!(command == null || @@ -100,8 +102,8 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen } // Create new stream tarball - - await WriteImageToStreamAsync(image, sourceReference, destinationReference, loadProcess.StandardInput.BaseStream, cancellationToken).ConfigureAwait(false); + // We want to be able to export to docker, even oci images. + await WriteDockerImageToStreamAsync(image, sourceReference, destinationReference, loadProcess.StandardInput.BaseStream, cancellationToken).ConfigureAwait(false); cancellationToken.ThrowIfCancellationRequested(); @@ -266,13 +268,53 @@ public static bool IsInsecureRegistry(string registryDomain) #if NET public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, Stream imageStream, CancellationToken cancellationToken) + { + if (image.Manifest.MediaType == SchemaTypes.DockerManifestV2) + { + await WriteDockerImageToStreamAsync(image, sourceReference, destinationReference, imageStream, cancellationToken); + } + else if (image.Manifest.MediaType == SchemaTypes.OciManifestV1) + { + await WriteOciImageToStreamAsync(image, sourceReference, destinationReference, imageStream, cancellationToken); + } + else + { + throw new ArgumentException(Resource.FormatString(nameof(Strings.UnsupportedMediaTypeForTarball), image.Manifest.MediaType)); + } + } + + private static async Task WriteDockerImageToStreamAsync( + BuiltImage image, + SourceImageReference sourceReference, + DestinationImageReference destinationReference, + Stream imageStream, + CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true); - - // Feed each layer tarball into the stream JsonArray layerTarballPaths = new JsonArray(); + await WriteImageLayers(writer, image, sourceReference, d => $"{d.Substring("sha256:".Length)}/layer.tar", cancellationToken, layerTarballPaths) + .ConfigureAwait(false); + + string configTarballPath = $"{image.ImageSha}.json"; + await WriteImageConfig(writer, image, configTarballPath, cancellationToken) + .ConfigureAwait(false); + + // Add manifest + await WriteManifestForDockerImage(writer, destinationReference, configTarballPath, layerTarballPaths, cancellationToken) + .ConfigureAwait(false); + } + + private static async Task WriteImageLayers( + TarWriter writer, + BuiltImage image, + SourceImageReference sourceReference, + Func layerPathFunc, + CancellationToken cancellationToken, + JsonArray? layerTarballPaths = null) + { + cancellationToken.ThrowIfCancellationRequested(); foreach (var d in image.LayerDescriptors) { @@ -283,9 +325,9 @@ public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageRe // Stuff that (uncompressed) tarball into the image tar stream // TODO uncompress!! - string layerTarballPath = $"{d.Digest.Substring("sha256:".Length)}/layer.tar"; + string layerTarballPath = layerPathFunc(d.Digest); await writer.WriteEntryAsync(localPath, layerTarballPath, cancellationToken).ConfigureAwait(false); - layerTarballPaths.Add(layerTarballPath); + layerTarballPaths?.Add(layerTarballPath); } else { @@ -295,21 +337,33 @@ public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageRe sourceReference.Registry?.ToString() ?? "")); } } + } - // add config - string configTarballPath = $"{image.ImageSha}.json"; + private static async Task WriteImageConfig( + TarWriter writer, + BuiltImage image, + string configPath, + CancellationToken cancellationToken) + { cancellationToken.ThrowIfCancellationRequested(); + using (MemoryStream configStream = new MemoryStream(Encoding.UTF8.GetBytes(image.Config))) { - PaxTarEntry configEntry = new(TarEntryType.RegularFile, configTarballPath) + PaxTarEntry configEntry = new(TarEntryType.RegularFile, configPath) { DataStream = configStream }; - await writer.WriteEntryAsync(configEntry, cancellationToken).ConfigureAwait(false); } + } - // Add manifest + private static async Task WriteManifestForDockerImage( + TarWriter writer, + DestinationImageReference destinationReference, + string configTarballPath, + JsonArray layerTarballPaths, + CancellationToken cancellationToken) + { JsonArray tagsNode = new(); foreach (string tag in destinationReference.Tags) { @@ -335,6 +389,100 @@ public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageRe } } + private static async Task WriteOciImageToStreamAsync( + BuiltImage image, + SourceImageReference sourceReference, + DestinationImageReference destinationReference, + Stream imageStream, + CancellationToken cancellationToken) + { + if (destinationReference.Tags.Length > 1) + { + throw new ArgumentException(Resource.FormatString(nameof(Strings.OciImageMultipleTagsNotSupported))); + } + + cancellationToken.ThrowIfCancellationRequested(); + using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true); + + await WriteOciLayout(writer, cancellationToken) + .ConfigureAwait(false); + + await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Substring("sha256:".Length)}", cancellationToken) + .ConfigureAwait(false); + + await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancellationToken) + .ConfigureAwait(false); + + await WriteManifestForOciImage(writer, image, destinationReference, cancellationToken) + .ConfigureAwait(false); + } + + private static async Task WriteOciLayout(TarWriter writer, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + string ociLayoutPath = "oci-layout"; + var ociLayoutContent = "{\"imageLayoutVersion\": \"1.0.0\"}"; + using (MemoryStream ociLayoutStream = new MemoryStream(Encoding.UTF8.GetBytes(ociLayoutContent))) + { + PaxTarEntry layoutEntry = new(TarEntryType.RegularFile, ociLayoutPath) + { + DataStream = ociLayoutStream + }; + await writer.WriteEntryAsync(layoutEntry, cancellationToken).ConfigureAwait(false); + } + } + + private static async Task WriteManifestForOciImage( + TarWriter writer, + BuiltImage image, + DestinationImageReference destinationReference, + CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + string manifestContent = JsonSerializer.SerializeToNode(image.Manifest)!.ToJsonString(); + string manifestDigest = image.Manifest.GetDigest(); + + // 1. add manifest to blobs + string manifestPath = $"{_blobsPath}/{manifestDigest.Substring("sha256:".Length)}"; + using (MemoryStream manifestStream = new MemoryStream(Encoding.UTF8.GetBytes(manifestContent))) + { + PaxTarEntry manifestEntry = new(TarEntryType.RegularFile, manifestPath) + { + DataStream = manifestStream + }; + await writer.WriteEntryAsync(manifestEntry, cancellationToken).ConfigureAwait(false); + } + + cancellationToken.ThrowIfCancellationRequested(); + + // 2. add index.json + var index = new ImageIndexV1 + { + schemaVersion = 2, + mediaType = SchemaTypes.OciImageIndexV1, + manifests = + [ + new PlatformSpecificOciManifest + { + mediaType = SchemaTypes.OciManifestV1, + size = manifestContent.Length, + digest = manifestDigest, + annotations = new Dictionary { { "org.opencontainers.image.ref.name", $"{destinationReference.Repository}:{destinationReference.Tags[0]}" } } + } + ] + }; + using (MemoryStream indexStream = new MemoryStream(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index)!.ToJsonString()))) + { + PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json") + { + DataStream = indexStream + }; + await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false); + } + } + private async ValueTask GetCommandAsync(CancellationToken cancellationToken) { if (_command != null) diff --git a/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs b/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs index b75547d8f166..471f450f42d6 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs @@ -10,5 +10,6 @@ public record struct ManifestListV2(int schemaVersion, string mediaType, Platfor public record struct PlatformInformation(string architecture, string os, string? variant, string[] features, [property: JsonPropertyName("os.version")][field: JsonPropertyName("os.version")] string? version); public record struct PlatformSpecificManifest(string mediaType, long size, string digest, PlatformInformation platform); +public record struct ImageIndexV1(int schemaVersion, string mediaType, PlatformSpecificOciManifest[] manifests); -public record struct ImageIndexV1(int schemaVersion, string mediaType, PlatformSpecificManifest[] manifests); +public record struct PlatformSpecificOciManifest(string mediaType, long size, string digest, PlatformInformation platform, Dictionary annotations); diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt index be51aee20053..1522357b9a11 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -74,8 +74,8 @@ Microsoft.NET.Build.Containers.ManifestListV2.schemaVersion.get -> int Microsoft.NET.Build.Containers.ManifestListV2.schemaVersion.set -> void Microsoft.NET.Build.Containers.ImageIndexV1 Microsoft.NET.Build.Containers.ImageIndexV1.ImageIndexV1() -> void -Microsoft.NET.Build.Containers.ImageIndexV1.ImageIndexV1(int schemaVersion, string! mediaType, Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void -Microsoft.NET.Build.Containers.ImageIndexV1.manifests.get -> Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! +Microsoft.NET.Build.Containers.ImageIndexV1.ImageIndexV1(int schemaVersion, string! mediaType, Microsoft.NET.Build.Containers.PlatformSpecificOciManifest[]! manifests) -> void +Microsoft.NET.Build.Containers.ImageIndexV1.manifests.get -> Microsoft.NET.Build.Containers.PlatformSpecificOciManifest[]! Microsoft.NET.Build.Containers.ImageIndexV1.manifests.set -> void Microsoft.NET.Build.Containers.ImageIndexV1.mediaType.get -> string! Microsoft.NET.Build.Containers.ImageIndexV1.mediaType.set -> void @@ -118,6 +118,19 @@ Microsoft.NET.Build.Containers.PlatformSpecificManifest.PlatformSpecificManifest Microsoft.NET.Build.Containers.PlatformSpecificManifest.PlatformSpecificManifest(string! mediaType, long size, string! digest, Microsoft.NET.Build.Containers.PlatformInformation platform) -> void Microsoft.NET.Build.Containers.PlatformSpecificManifest.size.get -> long Microsoft.NET.Build.Containers.PlatformSpecificManifest.size.set -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.digest.get -> string! +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.digest.set -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.mediaType.get -> string! +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.mediaType.set -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.platform.get -> Microsoft.NET.Build.Containers.PlatformInformation +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.platform.set -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.size.get -> long +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.size.set -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.PlatformSpecificOciManifest() -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.PlatformSpecificOciManifest(string! mediaType, long size, string! digest, Microsoft.NET.Build.Containers.PlatformInformation platform, System.Collections.Generic.Dictionary! annotations) -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.annotations.get -> System.Collections.Generic.Dictionary! +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.annotations.set -> void Microsoft.NET.Build.Containers.Port Microsoft.NET.Build.Containers.Port.Deconstruct(out int Number, out Microsoft.NET.Build.Containers.PortType Type) -> void Microsoft.NET.Build.Containers.Port.Equals(Microsoft.NET.Build.Containers.Port other) -> bool @@ -239,29 +252,36 @@ static Microsoft.NET.Build.Containers.ContainerHelpers.TryParsePort(string? port static readonly Microsoft.NET.Build.Containers.KnownLocalRegistryTypes.SupportedLocalRegistryTypes -> string![]! ~override Microsoft.NET.Build.Containers.PlatformInformation.ToString() -> string ~override Microsoft.NET.Build.Containers.PlatformSpecificManifest.ToString() -> string +~override Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.ToString() -> string static Microsoft.NET.Build.Containers.PlatformInformation.operator !=(Microsoft.NET.Build.Containers.PlatformInformation left, Microsoft.NET.Build.Containers.PlatformInformation right) -> bool static Microsoft.NET.Build.Containers.PlatformSpecificManifest.operator !=(Microsoft.NET.Build.Containers.PlatformSpecificManifest left, Microsoft.NET.Build.Containers.PlatformSpecificManifest right) -> bool +static Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.operator !=(Microsoft.NET.Build.Containers.PlatformSpecificOciManifest left, Microsoft.NET.Build.Containers.PlatformSpecificOciManifest right) -> bool static Microsoft.NET.Build.Containers.PlatformInformation.operator ==(Microsoft.NET.Build.Containers.PlatformInformation left, Microsoft.NET.Build.Containers.PlatformInformation right) -> bool ~override Microsoft.NET.Build.Containers.ManifestConfig.ToString() -> string static Microsoft.NET.Build.Containers.PlatformSpecificManifest.operator ==(Microsoft.NET.Build.Containers.PlatformSpecificManifest left, Microsoft.NET.Build.Containers.PlatformSpecificManifest right) -> bool +static Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.operator ==(Microsoft.NET.Build.Containers.PlatformSpecificOciManifest left, Microsoft.NET.Build.Containers.PlatformSpecificOciManifest right) -> bool override Microsoft.NET.Build.Containers.PlatformInformation.GetHashCode() -> int static Microsoft.NET.Build.Containers.ManifestConfig.operator !=(Microsoft.NET.Build.Containers.ManifestConfig left, Microsoft.NET.Build.Containers.ManifestConfig right) -> bool override Microsoft.NET.Build.Containers.PlatformSpecificManifest.GetHashCode() -> int +override Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.GetHashCode() -> int static Microsoft.NET.Build.Containers.ManifestConfig.operator ==(Microsoft.NET.Build.Containers.ManifestConfig left, Microsoft.NET.Build.Containers.ManifestConfig right) -> bool ~override Microsoft.NET.Build.Containers.PlatformInformation.Equals(object obj) -> bool ~override Microsoft.NET.Build.Containers.Descriptor.ToString() -> string ~override Microsoft.NET.Build.Containers.ManifestLayer.ToString() -> string override Microsoft.NET.Build.Containers.ManifestConfig.GetHashCode() -> int ~override Microsoft.NET.Build.Containers.PlatformSpecificManifest.Equals(object obj) -> bool +~override Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.Equals(object obj) -> bool Microsoft.NET.Build.Containers.PlatformInformation.Equals(Microsoft.NET.Build.Containers.PlatformInformation other) -> bool ~override Microsoft.NET.Build.Containers.ManifestConfig.Equals(object obj) -> bool static Microsoft.NET.Build.Containers.ManifestLayer.operator !=(Microsoft.NET.Build.Containers.ManifestLayer left, Microsoft.NET.Build.Containers.ManifestLayer right) -> bool Microsoft.NET.Build.Containers.PlatformSpecificManifest.Equals(Microsoft.NET.Build.Containers.PlatformSpecificManifest other) -> bool +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.Equals(Microsoft.NET.Build.Containers.PlatformSpecificOciManifest other) -> bool static Microsoft.NET.Build.Containers.Descriptor.operator !=(Microsoft.NET.Build.Containers.Descriptor left, Microsoft.NET.Build.Containers.Descriptor right) -> bool Microsoft.NET.Build.Containers.PlatformInformation.Deconstruct(out string! architecture, out string! os, out string? variant, out string![]! features, out string? version) -> void Microsoft.NET.Build.Containers.ManifestConfig.Equals(Microsoft.NET.Build.Containers.ManifestConfig other) -> bool static Microsoft.NET.Build.Containers.ManifestLayer.operator ==(Microsoft.NET.Build.Containers.ManifestLayer left, Microsoft.NET.Build.Containers.ManifestLayer right) -> bool Microsoft.NET.Build.Containers.PlatformSpecificManifest.Deconstruct(out string! mediaType, out long size, out string! digest, out Microsoft.NET.Build.Containers.PlatformInformation platform) -> void +Microsoft.NET.Build.Containers.PlatformSpecificOciManifest.Deconstruct(out string! mediaType, out long size, out string! digest, out Microsoft.NET.Build.Containers.PlatformInformation platform, out System.Collections.Generic.Dictionary! annotations) -> void Microsoft.NET.Build.Containers.ManifestConfig.Deconstruct(out string! mediaType, out long size, out string! digest) -> void static Microsoft.NET.Build.Containers.Descriptor.operator ==(Microsoft.NET.Build.Containers.Descriptor left, Microsoft.NET.Build.Containers.Descriptor right) -> bool override Microsoft.NET.Build.Containers.ManifestLayer.GetHashCode() -> int @@ -284,4 +304,4 @@ static Microsoft.NET.Build.Containers.ImageIndexV1.operator ==(Microsoft.NET.Bui override Microsoft.NET.Build.Containers.ImageIndexV1.GetHashCode() -> int ~override Microsoft.NET.Build.Containers.ImageIndexV1.Equals(object obj) -> bool Microsoft.NET.Build.Containers.ImageIndexV1.Equals(Microsoft.NET.Build.Containers.ImageIndexV1 other) -> bool -Microsoft.NET.Build.Containers.ImageIndexV1.Deconstruct(out int schemaVersion, out string! mediaType, out Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void \ No newline at end of file +Microsoft.NET.Build.Containers.ImageIndexV1.Deconstruct(out int schemaVersion, out string! mediaType, out Microsoft.NET.Build.Containers.PlatformSpecificOciManifest[]! manifests) -> void \ No newline at end of file diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs index f20b840164b5..956da4416979 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs @@ -15,6 +15,7 @@ namespace Microsoft.NET.Build.Containers; internal interface IManifestPicker { public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier); + public PlatformSpecificOciManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier); } internal sealed class RidGraphManifestPicker : IManifestPicker @@ -35,6 +36,16 @@ public RidGraphManifestPicker(string runtimeIdentifierGraphPath) return ridManifestDict[bestManifestRid]; } + public PlatformSpecificOciManifest? PickBestManifestForRid(IReadOnlyDictionary ridManifestDict, string runtimeIdentifier) + { + var bestManifestRid = GetBestMatchingRid(_runtimeGraph, runtimeIdentifier, ridManifestDict.Keys); + if (bestManifestRid is null) + { + return null; + } + return ridManifestDict[bestManifestRid]; + } + private static string? GetBestMatchingRid(RuntimeGraph runtimeGraph, string runtimeIdentifier, IEnumerable availableRuntimeIdentifiers) { HashSet availableRids = new HashSet(availableRuntimeIdentifiers, StringComparer.Ordinal); @@ -260,6 +271,20 @@ private static IReadOnlyDictionary GetManifest return ridDict; } + private static IReadOnlyDictionary GetManifestsByRid(PlatformSpecificOciManifest[] manifestList) + { + var ridDict = new Dictionary(); + foreach (var manifest in manifestList) + { + if (CreateRidForPlatform(manifest.platform) is { } rid) + { + ridDict.TryAdd(rid, manifest); + } + } + + return ridDict; + } + private static string? CreateRidForPlatform(PlatformInformation platform) { // we only support linux and windows containers explicitly, so anything else we should skip past. @@ -302,13 +327,21 @@ private async Task PickBestImageFromManifestListAsync( { cancellationToken.ThrowIfCancellationRequested(); var ridManifestDict = GetManifestsByRid(manifestList.manifests); - return await PickBestImageFromManifestsAsync( - repositoryName, - reference, - ridManifestDict, - runtimeIdentifier, - manifestPicker, - cancellationToken).ConfigureAwait(false); + if (manifestPicker.PickBestManifestForRid(ridManifestDict, runtimeIdentifier) is PlatformSpecificManifest matchingManifest) + { + return await ReadImageFromManifest( + repositoryName, + reference, + matchingManifest.digest, + matchingManifest.mediaType, + runtimeIdentifier, + ridManifestDict.Keys, + cancellationToken); + } + else + { + throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, ridManifestDict.Keys); + } } private async Task PickBestImageFromImageIndexAsync( @@ -321,42 +354,43 @@ private async Task PickBestImageFromImageIndexAsync( { cancellationToken.ThrowIfCancellationRequested(); var ridManifestDict = GetManifestsByRid(index.manifests); - return await PickBestImageFromManifestsAsync( - repositoryName, - reference, - ridManifestDict, - runtimeIdentifier, - manifestPicker, - cancellationToken).ConfigureAwait(false); + if (manifestPicker.PickBestManifestForRid(ridManifestDict, runtimeIdentifier) is PlatformSpecificOciManifest matchingManifest) + { + return await ReadImageFromManifest( + repositoryName, + reference, + matchingManifest.digest, + matchingManifest.mediaType, + runtimeIdentifier, + ridManifestDict.Keys, + cancellationToken); + } + else + { + throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, ridManifestDict.Keys); + } } - private async Task PickBestImageFromManifestsAsync( + private async Task ReadImageFromManifest( string repositoryName, string reference, - IReadOnlyDictionary knownManifests, + string manifestDigest, + string mediaType, string runtimeIdentifier, - IManifestPicker manifestPicker, + IEnumerable rids, CancellationToken cancellationToken) { - cancellationToken.ThrowIfCancellationRequested(); - if (manifestPicker.PickBestManifestForRid(knownManifests, runtimeIdentifier) is PlatformSpecificManifest matchingManifest) - { - using HttpResponseMessage manifestResponse = await _registryAPI.Manifest.GetAsync(repositoryName, matchingManifest.digest, cancellationToken).ConfigureAwait(false); + using HttpResponseMessage manifestResponse = await _registryAPI.Manifest.GetAsync(repositoryName, manifestDigest, cancellationToken).ConfigureAwait(false); - cancellationToken.ThrowIfCancellationRequested(); - var manifest = await manifestResponse.Content.ReadFromJsonAsync(cancellationToken: cancellationToken).ConfigureAwait(false); - if (manifest is null) throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, knownManifests.Keys); - manifest.KnownDigest = matchingManifest.digest; - return await ReadSingleImageAsync( - repositoryName, - manifest, - matchingManifest.mediaType, - cancellationToken).ConfigureAwait(false); - } - else - { - throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, knownManifests.Keys); - } + cancellationToken.ThrowIfCancellationRequested(); + var manifest = await manifestResponse.Content.ReadFromJsonAsync(cancellationToken: cancellationToken).ConfigureAwait(false); + if (manifest is null) throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, rids); + manifest.KnownDigest = manifestDigest; + return await ReadSingleImageAsync( + repositoryName, + manifest, + mediaType, + cancellationToken).ConfigureAwait(false); } /// diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs index 45607eb642a2..0edd6dbaa53e 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs @@ -8,11 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.NET.Build.Containers.Resources -{ +namespace Microsoft.NET.Build.Containers.Resources { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,886 +22,744 @@ namespace Microsoft.NET.Build.Containers.Resources [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Strings - { - + internal class Strings { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Strings() - { + internal Strings() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if (object.ReferenceEquals(resourceMan, null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.NET.Build.Containers.Resources.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } - + /// /// Looks up a localized string similar to CONTAINER0000: Value for unit test {0}. /// - internal static string _Test - { - get - { + internal static string _Test { + get { return ResourceManager.GetString("_Test", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1002: Request to Amazon Elastic Container Registry failed prematurely. This is often caused when the target repository does not exist in the registry.. /// - internal static string AmazonRegistryFailed - { - get - { + internal static string AmazonRegistryFailed { + get { return ResourceManager.GetString("AmazonRegistryFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2008: Both {0} and {1} were provided, but only one or the other is allowed.. /// - internal static string AmbiguousTags - { - get - { + internal static string AmbiguousTags { + get { return ResourceManager.GetString("AmbiguousTags", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2025: ContainerAppCommandArgs are provided without specifying a ContainerAppCommand.. /// - internal static string AppCommandArgsSetNoAppCommand - { - get - { + internal static string AppCommandArgsSetNoAppCommand { + get { return ResourceManager.GetString("AppCommandArgsSetNoAppCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2026: ContainerAppCommand and ContainerAppCommandArgs must be empty when ContainerAppCommandInstruction is '{0}'.. /// - internal static string AppCommandSetNotUsed - { - get - { + internal static string AppCommandSetNotUsed { + get { return ResourceManager.GetString("AppCommandSetNotUsed", resourceCulture); } } - + /// /// Looks up a localized string similar to local archive at '{0}'. /// - internal static string ArchiveRegistry_PushInfo - { - get - { + internal static string ArchiveRegistry_PushInfo { + get { return ResourceManager.GetString("ArchiveRegistry_PushInfo", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2022: The base image has an entrypoint that will be overwritten to start the application. Set ContainerAppCommandInstruction to 'Entrypoint' if this is desired. To preserve the base image entrypoint, set ContainerAppCommandInstruction to 'DefaultArgs'.. /// - internal static string BaseEntrypointOverwritten - { - get - { + internal static string BaseEntrypointOverwritten { + get { return ResourceManager.GetString("BaseEntrypointOverwritten", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2009: Could not parse {0}: {1}. /// - internal static string BaseImageNameParsingFailed - { - get - { + internal static string BaseImageNameParsingFailed { + get { return ResourceManager.GetString("BaseImageNameParsingFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2020: {0} does not specify a registry and will be pulled from Docker Hub. Please prefix the name with the image registry, for example: '{1}/<image>'.. /// - internal static string BaseImageNameRegistryFallback - { - get - { + internal static string BaseImageNameRegistryFallback { + get { return ResourceManager.GetString("BaseImageNameRegistryFallback", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2013: {0} had spaces in it, replacing with dashes.. /// - internal static string BaseImageNameWithSpaces - { - get - { + internal static string BaseImageNameWithSpaces { + get { return ResourceManager.GetString("BaseImageNameWithSpaces", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1011: Couldn't find matching base image for {0} that matches RuntimeIdentifier {1}.. /// - internal static string BaseImageNotFound - { - get - { + internal static string BaseImageNotFound { + get { return ResourceManager.GetString("BaseImageNotFound", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1001: Failed to upload blob using {0}; received status code '{1}'.. /// - internal static string BlobUploadFailed - { - get - { + internal static string BlobUploadFailed { + get { return ResourceManager.GetString("BlobUploadFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to Pushed image '{0}' to {1}.. /// - internal static string ContainerBuilder_ImageUploadedToLocalDaemon - { - get - { + internal static string ContainerBuilder_ImageUploadedToLocalDaemon { + get { return ResourceManager.GetString("ContainerBuilder_ImageUploadedToLocalDaemon", resourceCulture); } } - + /// /// Looks up a localized string similar to Pushed image '{0}' to registry '{1}'.. /// - internal static string ContainerBuilder_ImageUploadedToRegistry - { - get - { + internal static string ContainerBuilder_ImageUploadedToRegistry { + get { return ResourceManager.GetString("ContainerBuilder_ImageUploadedToRegistry", resourceCulture); } } - + /// /// Looks up a localized string similar to Building image '{0}' with tags '{1}' on top of base image '{2}'.. /// - internal static string ContainerBuilder_StartBuildingImage - { - get - { + internal static string ContainerBuilder_StartBuildingImage { + get { return ResourceManager.GetString("ContainerBuilder_StartBuildingImage", resourceCulture); } } - + + /// + /// Looks up a localized string similar to CONTAINER3001: Failed creating {0} process.. + /// + internal static string ContainerRuntimeProcessCreationFailed { + get { + return ResourceManager.GetString("ContainerRuntimeProcessCreationFailed", resourceCulture); + } + } + /// /// Looks up a localized string similar to CONTAINER1007: Could not deserialize token from JSON.. /// - internal static string CouldntDeserializeJsonToken - { - get - { + internal static string CouldntDeserializeJsonToken { + get { return ResourceManager.GetString("CouldntDeserializeJsonToken", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2012: Could not recognize registry '{0}'.. /// - internal static string CouldntRecognizeRegistry - { - get - { + internal static string CouldntRecognizeRegistry { + get { return ResourceManager.GetString("CouldntRecognizeRegistry", resourceCulture); } } - + /// /// Looks up a localized string similar to local registry via '{0}'. /// - internal static string DockerCli_PushInfo - { - get - { + internal static string DockerCli_PushInfo { + get { return ResourceManager.GetString("DockerCli_PushInfo", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER3002: Failed to get docker info({0})\n{1}\n{2}. /// - internal static string DockerInfoFailed - { - get - { + internal static string DockerInfoFailed { + get { return ResourceManager.GetString("DockerInfoFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER3002: Failed to get docker info: {0}. /// - internal static string DockerInfoFailed_Ex - { - get - { + internal static string DockerInfoFailed_Ex { + get { return ResourceManager.GetString("DockerInfoFailed_Ex", resourceCulture); } } - - /// - /// Looks up a localized string similar to CONTAINER3001: Failed creating {0} process.. - /// - internal static string ContainerRuntimeProcessCreationFailed - { - get - { - return ResourceManager.GetString("ContainerRuntimeProcessCreationFailed", resourceCulture); - } - } - + /// /// Looks up a localized string similar to CONTAINER4006: Property '{0}' is empty or contains whitespace and will be ignored.. /// - internal static string EmptyOrWhitespacePropertyIgnored - { - get - { + internal static string EmptyOrWhitespacePropertyIgnored { + get { return ResourceManager.GetString("EmptyOrWhitespacePropertyIgnored", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER4004: Items '{0}' contain empty item(s) which will be ignored.. /// - internal static string EmptyValuesIgnored - { - get - { + internal static string EmptyValuesIgnored { + get { return ResourceManager.GetString("EmptyValuesIgnored", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2023: A ContainerEntrypoint and ContainerAppCommandArgs are provided. ContainerAppInstruction must be set to configure how the application is started. Valid instructions are {0}.. /// - internal static string EntrypointAndAppCommandArgsSetNoAppCommandInstruction - { - get - { + internal static string EntrypointAndAppCommandArgsSetNoAppCommandInstruction { + get { return ResourceManager.GetString("EntrypointAndAppCommandArgsSetNoAppCommandInstruction", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2024: ContainerEntrypointArgs are provided without specifying a ContainerEntrypoint.. /// - internal static string EntrypointArgsSetNoEntrypoint - { - get - { + internal static string EntrypointArgsSetNoEntrypoint { + get { return ResourceManager.GetString("EntrypointArgsSetNoEntrypoint", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2029: ContainerEntrypointArgsSet are provided. Change to use ContainerAppCommandArgs for arguments that must always be set, or ContainerDefaultArgs for arguments that can be overridden when the container is created.. /// - internal static string EntrypointArgsSetPreferAppCommandArgs - { - get - { + internal static string EntrypointArgsSetPreferAppCommandArgs { + get { return ResourceManager.GetString("EntrypointArgsSetPreferAppCommandArgs", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2028: ContainerEntrypoint can not be combined with ContainerAppCommandInstruction '{0}'.. /// - internal static string EntrypointConflictAppCommand - { - get - { + internal static string EntrypointConflictAppCommand { + get { return ResourceManager.GetString("EntrypointConflictAppCommand", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2027: A ContainerEntrypoint is provided. ContainerAppInstruction must be set to configure how the application is started. Valid instructions are {0}.. /// - internal static string EntrypointSetNoAppCommandInstruction - { - get - { + internal static string EntrypointSetNoAppCommandInstruction { + get { return ResourceManager.GetString("EntrypointSetNoAppCommandInstruction", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1008: Failed retrieving credentials for "{0}": {1}. /// - internal static string FailedRetrievingCredentials - { - get - { + internal static string FailedRetrievingCredentials { + get { return ResourceManager.GetString("FailedRetrievingCredentials", resourceCulture); } } - + /// - /// Looks up a localized string similar to CONTAINER2030: GenerateLabels was disabled but GenerateDigestLabel was enabled - no digest label will be created. + /// Looks up a localized string similar to CONTAINER2030: GenerateLabels was disabled but GenerateDigestLabel was enabled - no digest label will be created.. /// - internal static string GenerateDigestLabelWithoutGenerateLabels - { - get - { + internal static string GenerateDigestLabelWithoutGenerateLabels { + get { return ResourceManager.GetString("GenerateDigestLabelWithoutGenerateLabels", resourceCulture); } } - + /// /// Looks up a localized string similar to No host object detected.. /// - internal static string HostObjectNotDetected - { - get - { + internal static string HostObjectNotDetected { + get { return ResourceManager.GetString("HostObjectNotDetected", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1009: Failed to load image from local registry. stdout: {0}. /// - internal static string ImageLoadFailed - { - get - { + internal static string ImageLoadFailed { + get { return ResourceManager.GetString("ImageLoadFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1010: Pulling images from local registry is not supported.. /// - internal static string ImagePullNotSupported - { - get - { + internal static string ImagePullNotSupported { + get { return ResourceManager.GetString("ImagePullNotSupported", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.. /// - internal static string InvalidEnvVar - { - get - { + internal static string InvalidEnvVar { + get { return ResourceManager.GetString("InvalidEnvVar", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2005: The inferred image name '{0}' contains entirely invalid characters. The valid characters for an image name are alphanumeric characters, -, /, or _, and the image name must start with an alphanumeric character.. /// - internal static string InvalidImageName_EntireNameIsInvalidCharacters - { - get - { + internal static string InvalidImageName_EntireNameIsInvalidCharacters { + get { return ResourceManager.GetString("InvalidImageName_EntireNameIsInvalidCharacters", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2005: The first character of the image name '{0}' must be a lowercase letter or a digit and all characters in the name must be an alphanumeric character, -, /, or _.. /// - internal static string InvalidImageName_NonAlphanumericStartCharacter - { - get - { + internal static string InvalidImageName_NonAlphanumericStartCharacter { + get { return ResourceManager.GetString("InvalidImageName_NonAlphanumericStartCharacter", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port number '{0}'. ContainerPort items must have an Include value that is an integer, and a Type value that is either 'tcp' or 'udp'.. /// - internal static string InvalidPort_Number - { - get - { + internal static string InvalidPort_Number { + get { return ResourceManager.GetString("InvalidPort_Number", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port number '{0}' and an invalid port type '{1}'. ContainerPort items must have an Include value that is an integer, and a Type value that is either 'tcp' or 'udp'.. /// - internal static string InvalidPort_NumberAndType - { - get - { + internal static string InvalidPort_NumberAndType { + get { return ResourceManager.GetString("InvalidPort_NumberAndType", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port type '{0}'. ContainerPort items must have an Include value that is an integer, and a Type value that is either 'tcp' or 'udp'.. /// - internal static string InvalidPort_Type - { - get - { + internal static string InvalidPort_Type { + get { return ResourceManager.GetString("InvalidPort_Type", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2018: Invalid SDK prerelease version '{0}' - only 'rc' and 'preview' are supported.. /// - internal static string InvalidSdkPrereleaseVersion - { - get - { + internal static string InvalidSdkPrereleaseVersion { + get { return ResourceManager.GetString("InvalidSdkPrereleaseVersion", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2019: Invalid SDK semantic version '{0}'.. /// - internal static string InvalidSdkVersion - { - get - { + internal static string InvalidSdkVersion { + get { return ResourceManager.GetString("InvalidSdkVersion", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2007: Invalid {0} provided: {1}. Image tags must be alphanumeric, underscore, hyphen, or period.. /// - internal static string InvalidTag - { - get - { + internal static string InvalidTag { + get { return ResourceManager.GetString("InvalidTag", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2010: Invalid {0} provided: {1}. {0} must be a semicolon-delimited list of valid image tags. Image tags must be alphanumeric, underscore, hyphen, or period.. /// - internal static string InvalidTags - { - get - { + internal static string InvalidTags { + get { return ResourceManager.GetString("InvalidTags", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1003: Token response had neither token nor access_token.. /// - internal static string InvalidTokenResponse - { - get - { + internal static string InvalidTokenResponse { + get { return ResourceManager.GetString("InvalidTokenResponse", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER4005: Item '{0}' contains items without metadata 'Value', and they will be ignored.. /// - internal static string ItemsWithoutMetadata - { - get - { + internal static string ItemsWithoutMetadata { + get { return ResourceManager.GetString("ItemsWithoutMetadata", resourceCulture); } } - + /// /// Looks up a localized string similar to Error while reading daemon config: {0}. /// - internal static string LocalDocker_FailedToGetConfig - { - get - { + internal static string LocalDocker_FailedToGetConfig { + get { return ResourceManager.GetString("LocalDocker_FailedToGetConfig", resourceCulture); } } - + /// /// Looks up a localized string similar to The daemon server reported errors: {0}. /// - internal static string LocalDocker_LocalDaemonErrors - { - get - { + internal static string LocalDocker_LocalDaemonErrors { + get { return ResourceManager.GetString("LocalDocker_LocalDaemonErrors", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1012: The local registry is not available, but pushing to a local registry was requested.. /// - internal static string LocalRegistryNotAvailable - { - get - { + internal static string LocalRegistryNotAvailable { + get { return ResourceManager.GetString("LocalRegistryNotAvailable", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2004: Unable to download layer with descriptor '{0}' from registry '{1}' because it does not exist.. /// - internal static string MissingLinkToRegistry - { - get - { + internal static string MissingLinkToRegistry { + get { return ResourceManager.GetString("MissingLinkToRegistry", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2016: ContainerPort item '{0}' does not specify the port number. Please ensure the item's Include is a port number, for example '<ContainerPort Include="80" />'. /// - internal static string MissingPortNumber - { - get - { + internal static string MissingPortNumber { + get { return ResourceManager.GetString("MissingPortNumber", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1004: No RequestUri specified.. /// - internal static string NoRequestUriSpecified - { - get - { + internal static string NoRequestUriSpecified { + get { return ResourceManager.GetString("NoRequestUriSpecified", resourceCulture); } } - + /// /// Looks up a localized string similar to '{0}' was not a valid container image name, it was normalized to '{1}'. /// - internal static string NormalizedContainerName - { - get - { + internal static string NormalizedContainerName { + get { return ResourceManager.GetString("NormalizedContainerName", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Unable to create tarball for oci image with multiple tags.. + /// + internal static string OciImageMultipleTagsNotSupported { + get { + return ResourceManager.GetString("OciImageMultipleTagsNotSupported", resourceCulture); + } + } + /// /// Looks up a localized string similar to CONTAINER2011: {0} '{1}' does not exist. /// - internal static string PublishDirectoryDoesntExist - { - get - { + internal static string PublishDirectoryDoesntExist { + get { return ResourceManager.GetString("PublishDirectoryDoesntExist", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploaded config to registry.. /// - internal static string Registry_ConfigUploaded - { - get - { + internal static string Registry_ConfigUploaded { + get { return ResourceManager.GetString("Registry_ConfigUploaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploading config to registry at blob '{0}',. /// - internal static string Registry_ConfigUploadStarted - { - get - { + internal static string Registry_ConfigUploadStarted { + get { return ResourceManager.GetString("Registry_ConfigUploadStarted", resourceCulture); } } - + /// /// Looks up a localized string similar to Layer '{0}' already exists.. /// - internal static string Registry_LayerExists - { - get - { + internal static string Registry_LayerExists { + get { return ResourceManager.GetString("Registry_LayerExists", resourceCulture); } } - + /// /// Looks up a localized string similar to Finished uploading layer '{0}' to '{1}'.. /// - internal static string Registry_LayerUploaded - { - get - { + internal static string Registry_LayerUploaded { + get { return ResourceManager.GetString("Registry_LayerUploaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploading layer '{0}' to '{1}'.. /// - internal static string Registry_LayerUploadStarted - { - get - { + internal static string Registry_LayerUploadStarted { + get { return ResourceManager.GetString("Registry_LayerUploadStarted", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploaded manifest to '{0}'.. /// - internal static string Registry_ManifestUploaded - { - get - { + internal static string Registry_ManifestUploaded { + get { return ResourceManager.GetString("Registry_ManifestUploaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploading manifest to registry '{0}' as blob '{1}'.. /// - internal static string Registry_ManifestUploadStarted - { - get - { + internal static string Registry_ManifestUploadStarted { + get { return ResourceManager.GetString("Registry_ManifestUploadStarted", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploaded tag '{0}' to '{1}'.. /// - internal static string Registry_TagUploaded - { - get - { + internal static string Registry_TagUploaded { + get { return ResourceManager.GetString("Registry_TagUploaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Uploading tag '{0}' to '{1}'.. /// - internal static string Registry_TagUploadStarted - { - get - { + internal static string Registry_TagUploadStarted { + get { return ResourceManager.GetString("Registry_TagUploadStarted", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1017: Unable to communicate with the registry '{0}'.. /// - internal static string RegistryOperationFailed - { - get - { + internal static string RegistryOperationFailed { + get { return ResourceManager.GetString("RegistryOperationFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1013: Failed to push to the output registry: {0}. /// - internal static string RegistryOutputPushFailed - { - get - { + internal static string RegistryOutputPushFailed { + get { return ResourceManager.GetString("RegistryOutputPushFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1014: Manifest pull failed.. /// - internal static string RegistryPullFailed - { - get - { + internal static string RegistryPullFailed { + get { return ResourceManager.GetString("RegistryPullFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1005: Registry push failed; received status code '{0}'.. /// - internal static string RegistryPushFailed - { - get - { + internal static string RegistryPushFailed { + get { return ResourceManager.GetString("RegistryPushFailed", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1015: Unable to access the repository '{0}' at tag '{1}' in the registry '{2}'. Please confirm that this name and tag are present in the registry.. /// - internal static string RepositoryNotFound - { - get - { + internal static string RepositoryNotFound { + get { return ResourceManager.GetString("RepositoryNotFound", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER4003: Required '{0}' items contain empty items.. /// - internal static string RequiredItemsContainsEmptyItems - { - get - { + internal static string RequiredItemsContainsEmptyItems { + get { return ResourceManager.GetString("RequiredItemsContainsEmptyItems", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER4002: Required '{0}' items were not set.. /// - internal static string RequiredItemsNotSet - { - get - { + internal static string RequiredItemsNotSet { + get { return ResourceManager.GetString("RequiredItemsNotSet", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER4001: Required property '{0}' was not set or empty.. /// - internal static string RequiredPropertyNotSetOrEmpty - { - get - { + internal static string RequiredPropertyNotSetOrEmpty { + get { return ResourceManager.GetString("RequiredPropertyNotSetOrEmpty", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1006: Too many retries, stopping.. /// - internal static string TooManyRetries - { - get - { + internal static string TooManyRetries { + get { return ResourceManager.GetString("TooManyRetries", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER1016: Unable to access the repository '{0}' in the registry '{1}'. Please confirm your credentials are correct and that you have access to this repository and registry.. /// - internal static string UnableToAccessRepository - { - get - { + internal static string UnableToAccessRepository { + get { return ResourceManager.GetString("UnableToAccessRepository", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2021: Unknown AppCommandInstruction '{0}'. Valid instructions are {1}.. /// - internal static string UnknownAppCommandInstruction - { - get - { + internal static string UnknownAppCommandInstruction { + get { return ResourceManager.GetString("UnknownAppCommandInstruction", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2002: Unknown local registry type '{0}'. Valid local container registry types are {1}.. /// - internal static string UnknownLocalRegistryType - { - get - { + internal static string UnknownLocalRegistryType { + get { return ResourceManager.GetString("UnknownLocalRegistryType", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2003: The manifest for {0}:{1} from registry {2} was an unknown type: {3}. Please raise an issue at https://github.com/dotnet/sdk-container-builds/issues with this message.. /// - internal static string UnknownMediaType - { - get - { + internal static string UnknownMediaType { + get { return ResourceManager.GetString("UnknownMediaType", resourceCulture); } } - + /// /// Looks up a localized string similar to CONTAINER2001: Unrecognized mediaType '{0}'.. /// - internal static string UnrecognizedMediaType - { - get - { + internal static string UnrecognizedMediaType { + get { return ResourceManager.GetString("UnrecognizedMediaType", resourceCulture); } } + + /// + /// Looks up a localized string similar to Unable to create tarball for mediaType '{0}'.. + /// + internal static string UnsupportedMediaTypeForTarball { + get { + return ResourceManager.GetString("UnsupportedMediaTypeForTarball", resourceCulture); + } + } } } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx index 97764561ee6b..f25119f51fd4 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx @@ -241,6 +241,12 @@ CONTAINER2004: Unable to download layer with descriptor '{0}' from registry '{1}' because it does not exist. {StrBegin="CONTAINER2004: "} + + Unable to create tarball for oci image with multiple tags. + + + Unable to create tarball for mediaType '{0}'. + CONTAINER2016: ContainerPort item '{0}' does not specify the port number. Please ensure the item's Include is a port number, for example '<ContainerPort Include="80" />' {StrBegin="CONTAINER2016: "} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf index a7ab528afa57..625eab883915 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf @@ -257,6 +257,11 @@ '{0}' nebyl platný název image kontejneru, byl normalizován na '{1}' + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' neexistuje. @@ -377,6 +382,11 @@ CONTAINER2001: Nerozpoznaný typ mediaType '{0}'. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: Hodnota pro {0}testu jednotek diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf index ca0c0bc89860..6249a6147f07 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf @@ -257,6 +257,11 @@ „{0}“ war kein gültiger Containerimagename, er wurde zu „{1}“ normalisiert. + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} „{1}“ ist nicht vorhanden. @@ -377,6 +382,11 @@ CONTAINER2001: Unbekannter mediaType „{0}“. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: Wert für Komponententest {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf index aa6aa5811e9e..d2efae9ef3da 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf @@ -257,6 +257,11 @@ "{0}" no era un nombre de imagen de contenedor válido, se normalizó a "{1}" + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} "{1}" no existe @@ -377,6 +382,11 @@ CONTAINER2001: mediaType "{0}" no reconocido. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: Valor de la prueba unitaria {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf index a187efdabcfe..42802ae171c9 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf @@ -257,6 +257,11 @@ '{0}' n’était pas un nom d’image conteneur valide, il a été normalisé pour '{1}' + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' n’existe pas @@ -377,6 +382,11 @@ CONTAINER2001: '{0}' mediaType non reconnu. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000 : valeur du {0} de test unitaire diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf index 221d1e81045b..7223f8af5cc2 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf @@ -257,6 +257,11 @@ '{0}' non è un nome di immagine contenitore valido, è stato normalizzato in '{1}' + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' non esiste @@ -377,6 +382,11 @@ CONTAINER2001: mediaType '{0}' non riconosciuto. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: valore per unit test {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf index 777153a9a363..450d8ae75014 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf @@ -257,6 +257,11 @@ '{0}' は有効なコンテナー イメージ名ではありませんでした。'{1}' に正規化されました + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' が存在しません @@ -377,6 +382,11 @@ CONTAINER2001: 認識されない mediaType '{0}' です。 {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: 単体テスト {0} の値 diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf index d0d124c24860..e0738ef570c3 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf @@ -257,6 +257,11 @@ '{0}'은(는) 유효한 컨테이너 이미지 이름이 아닙니다. '{1}'(으)로 정규화되었습니다. + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}'이(가) 존재하지 않습니다. @@ -377,6 +382,11 @@ CONTAINER2001: 미디어 유형 '{0}'을(를) 인식할 수 없습니다. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: 단위 테스트 값 {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf index e3c49fb635fe..52cf4c885809 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf @@ -257,6 +257,11 @@ Nazwa „{0}” nie była prawidłową nazwą obrazu kontenera, została znormalizowana do „{1}” + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} „{1}” nie istnieje @@ -377,6 +382,11 @@ CONTAINER2001: nierozpoznany typ nośnika „{0}”. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: wartość testu jednostkowego{0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf index 6eddb9edf822..924b5f101b46 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf @@ -257,6 +257,11 @@ '{0}' não era um nome de imagem de contêiner válido, foi normalizado para '{1}' + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' não existe @@ -377,6 +382,11 @@ CONTAINER2001: MediaType não reconhecido '{0}'. {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: Valor para teste de unidade {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf index 43493637de2d..25f88cbf8fd7 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf @@ -257,6 +257,11 @@ "{0}" не является допустимым именем образа контейнера, оно нормализовано до "{1}" + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} "{1}" не существует @@ -377,6 +382,11 @@ CONTAINER2001: нераспознанный тип мультимедиа "{0}". {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: значение для модульного теста {0} diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf index 861c53cf7423..4c6caf1e6dbb 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf @@ -257,6 +257,11 @@ '{0}', geçerli bir kapsayıcı görüntüsü adı değildi, '{1}' olarak normalleştirildi + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' yok @@ -377,6 +382,11 @@ CONTAINER2001: Tanınmayan mediaType ('{0}'). {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: Birim testi ({0}) değeri diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf index db2a708c4b70..175a9084fc20 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf @@ -257,6 +257,11 @@ “{0}”不是有效的容器映像名称，已规范化为“{1}” + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} {1} 不存在 @@ -377,6 +382,11 @@ CONTAINER2001: 无法识别 mediaType“{0}”。 {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: 单元测试 {0} 的值 diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf index 70ff889b2f3f..0333461575af 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf @@ -257,6 +257,11 @@ '{0}' 不是有效的容器映像名稱，已標準化為 '{1}' + + Unable to create tarball for oci image with multiple tags. + Unable to create tarball for oci image with multiple tags. + + CONTAINER2011: {0} '{1}' does not exist CONTAINER2011: {0} '{1}' 不存在 @@ -377,6 +382,11 @@ CONTAINER2001: 無法辨識的 mediaType '{0}'。 {StrBegin="CONTAINER2001: "} + + Unable to create tarball for mediaType '{0}'. + Unable to create tarball for mediaType '{0}'. + + CONTAINER0000: Value for unit test {0} CONTAINER0000: 單元測試 {0} 的值 diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index 253c44653a85..0c7a906114ea 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -11,7 +11,9 @@ public class DockerRegistryManager { public const string RuntimeBaseImage = "dotnet/runtime"; public const string AspNetBaseImage = "dotnet/aspnet"; + public const string Nginx = "library/nginx"; public const string BaseImageSource = "mcr.microsoft.com"; + public const string LibraryImageSourse = "docker.io"; public const string Net6ImageTag = "6.0"; public const string Net7ImageTag = "7.0"; public const string Net8ImageTag = "8.0"; @@ -23,7 +25,12 @@ public class DockerRegistryManager internal class SameArchManifestPicker : IManifestPicker { - public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) + public PlatformSpecificManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) + { + return manifestList.Values.SingleOrDefault(m => m.platform.os == "linux" && m.platform.architecture == "amd64"); + } + + public PlatformSpecificOciManifest? PickBestManifestForRid(IReadOnlyDictionary manifestList, string runtimeIdentifier) { return manifestList.Values.SingleOrDefault(m => m.platform.os == "linux" && m.platform.architecture == "amd64"); } @@ -33,7 +40,8 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu { using TestLoggerFactory loggerFactory = new(testOutput); - if (!new DockerCli(loggerFactory).IsAvailable()) { + if (!new DockerCli(loggerFactory).IsAvailable()) + { throw new InvalidOperationException("Docker is not available, tests cannot run"); } @@ -43,7 +51,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu int spawnRegistryDelay = 1000; //ms StringBuilder failureReasons = new(); - var pullRegistry = new Registry(BaseImageSource, logger, RegistryMode.Pull); + var mcrPullRegistry = new Registry(BaseImageSource, logger, RegistryMode.Pull); var pushRegistry = new Registry(LocalRegistry, logger, RegistryMode.Push); for (int spawnRegistryAttempt = 1; spawnRegistryAttempt <= spawnRegistryMaxRetry; spawnRegistryAttempt++) @@ -70,13 +78,13 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu string dotnetdll = System.Reflection.Assembly.GetExecutingAssembly().Location; var ridjson = Path.Combine(Path.GetDirectoryName(dotnetdll)!, "RuntimeIdentifierGraph.json"); - var image = await pullRegistry.GetImageManifestAsync(RuntimeBaseImage, tag, "linux-x64", new SameArchManifestPicker(), CancellationToken.None); - var source = new SourceImageReference(pullRegistry, RuntimeBaseImage, tag); - var dest = new DestinationImageReference(pushRegistry, RuntimeBaseImage, [tag]); - logger.LogInformation($"Pushing image for {BaseImageSource}/{RuntimeBaseImage}:{tag}"); - await pushRegistry.PushAsync(image.Build(), source, dest, CancellationToken.None); - logger.LogInformation($"Pushed image for {BaseImageSource}/{RuntimeBaseImage}:{tag}"); + await PullFromRemoteRegistryThenPushToLocalRegistry(mcrPullRegistry, pushRegistry, BaseImageSource, RuntimeBaseImage, tag, logger); } + + var nginxTag = "latest"; + var librPullRegistry = new Registry(LibraryImageSourse, logger, RegistryMode.Pull); + await PullFromRemoteRegistryThenPushToLocalRegistry(librPullRegistry, pushRegistry, LibraryImageSourse, Nginx, nginxTag, logger); + return; } catch (Exception ex) @@ -92,7 +100,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu { ContainerCli.StopCommand(testOutput, s_registryContainerId).Execute(); } - catch(Exception ex2) + catch (Exception ex2) { logger.LogError(ex2, "Failed to stop the registry {id}.", s_registryContainerId); } @@ -106,6 +114,22 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu throw new InvalidOperationException($"The registry was not loaded after {spawnRegistryMaxRetry} retries. {failureReasons}"); } + private static async Task PullFromRemoteRegistryThenPushToLocalRegistry( + Registry remoteRegistry, + Registry localRegistry, + string imageSource, + string repositoryName, + string tag, + ILogger logger) + { + var image = await remoteRegistry.GetImageManifestAsync(repositoryName, tag, "linux-x64", new SameArchManifestPicker(), CancellationToken.None); + var source = new SourceImageReference(remoteRegistry, repositoryName, tag); + var dest = new DestinationImageReference(localRegistry, repositoryName, [tag]); + logger.LogInformation($"Pushing image for {imageSource}/{repositoryName}:{tag}"); + await localRegistry.PushAsync(image.Build(), source, dest, CancellationToken.None); + logger.LogInformation($"Pushed image for {imageSource}/{repositoryName}:{tag}"); + } + public static void ShutdownDockerRegistry(ITestOutputHelper testOutput) { if (s_registryContainerId != null) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index efe6ddcd039f..98641dbcdbfb 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Formats.Tar; using System.Runtime.CompilerServices; using Microsoft.DotNet.Cli.Utils; using Microsoft.NET.Build.Containers.LocalDaemons; @@ -174,6 +175,135 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() .Execute() .Should().Pass(); } + + CheckForDockerTarballStructure(archiveFile); + } + + private void CheckForDockerTarballStructure(string tarball) + { + var layers = new HashSet(); + int configJson = 0; + int manifestJsonCount = 0; + + using (FileStream fs = new FileStream(tarball, FileMode.Open, FileAccess.Read)) + using (var tarReader = new TarReader(fs)) + { + var entry = tarReader.GetNextEntry(); + + while (entry is not null) + { + if (entry.Name == "manifest.json") + { + manifestJsonCount++; + } + else if (entry.Name.EndsWith(".json")) + { + configJson++; + } + else if (entry.Name.EndsWith("/layer.tar")) + { + layers.Add(entry.Name); + } + else + { + Assert.Fail($"Unexpected entry in tarball: {entry.Name}"); + } + + entry = tarReader.GetNextEntry(); + } + } + + Assert.Equal(1, manifestJsonCount); + Assert.Equal(1, configJson); + Assert.NotEmpty(layers); + } + + [DockerAvailableFact] + public async Task ApiEndToEndOciImageWithArchiveWritingAndLoad() + { + ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndOciImageWithArchiveWritingAndLoad)); + + // Build the image + + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); + + ImageBuilder imageBuilder = await registry.GetImageManifestAsync( + DockerRegistryManager.Nginx, + "latest", + "linux-x64", + ToolsetUtils.RidGraphManifestPicker, + cancellationToken: default).ConfigureAwait(false); + Assert.NotNull(imageBuilder); + + BuiltImage builtImage = imageBuilder.Build(); + + // Write the image to disk + var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, + nameof(ApiEndToEndWithArchiveWritingAndLoad), "nginx.tar.gz"); + var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net7ImageTag); + var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), ["latest"]); + + await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); + + Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); + + // Docker cannot load an OCI image, so we check for Podman + if (ContainerCli.IsPodman) + { + // Load the archive + ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) + .Execute() + .Should().Pass(); + + // Run the image + foreach (string tag in destinationReference.Tags) + { + ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") + .Execute() + .Should().Pass(); + } + } + + CheckForOciTarballStructure(archiveFile); + } + + private void CheckForOciTarballStructure(string tarball) + { + var blobs = new HashSet(); + int ociLayoutCount = 0; + int indexJsonCount = 0; + + using (FileStream fs = new FileStream(tarball, FileMode.Open, FileAccess.Read)) + using (var tarReader = new TarReader(fs)) + { + var entry = tarReader.GetNextEntry(); + + while (entry is not null) + { + if (entry.Name == "oci-layout") + { + ociLayoutCount++; + } + else if (entry.Name == "index.json") + { + indexJsonCount++; + } + else if (entry.Name.StartsWith("blobs/sha256/")) + { + blobs.Add(entry.Name); + } + else + { + Assert.Fail($"Unexpected entry in tarball: {entry.Name}"); + } + + entry = tarReader.GetNextEntry(); + } + } + + Assert.Equal(1, ociLayoutCount); + Assert.Equal(1, indexJsonCount); + Assert.NotEmpty(blobs); } private string BuildLocalApp([CallerMemberName] string testName = "TestName", string tfm = ToolsetInfo.CurrentTargetFramework, string rid = "linux-x64") From 81ad184083e37178c8176262952c4ec1a9d646ff Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 6 Nov 2024 22:02:14 +0100 Subject: [PATCH 293/702] catch ArgumentException in CreateNewImage --- .../Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 834bae6529f4..7655a05a9464 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -235,6 +235,10 @@ private async Task PushToLocalRegistryAsync(BuiltImage builtImage, SourceImageRe telemetry.LogLocalLoadError(); Log.LogErrorFromException(dle, showStackTrace: false); } + catch (ArgumentException argEx) + { + Log.LogErrorFromException(argEx, showStackTrace: false); + } } private async Task PushToRemoteRegistryAsync(BuiltImage builtImage, SourceImageReference sourceImageReference, From 4d792434f257bcf2737787c315c0c0d638f7c09f Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 6 Nov 2024 22:41:24 +0100 Subject: [PATCH 294/702] improve tests --- .../EndToEndTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 98641dbcdbfb..077c66d31c98 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -181,7 +181,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() private void CheckForDockerTarballStructure(string tarball) { - var layers = new HashSet(); + var layersCount = 0; int configJson = 0; int manifestJsonCount = 0; @@ -202,7 +202,7 @@ private void CheckForDockerTarballStructure(string tarball) } else if (entry.Name.EndsWith("/layer.tar")) { - layers.Add(entry.Name); + layersCount++; } else { @@ -215,7 +215,7 @@ private void CheckForDockerTarballStructure(string tarball) Assert.Equal(1, manifestJsonCount); Assert.Equal(1, configJson); - Assert.NotEmpty(layers); + Assert.True(layersCount > 0); } [DockerAvailableFact] @@ -269,7 +269,7 @@ public async Task ApiEndToEndOciImageWithArchiveWritingAndLoad() private void CheckForOciTarballStructure(string tarball) { - var blobs = new HashSet(); + int blobsCount = 0; int ociLayoutCount = 0; int indexJsonCount = 0; @@ -290,7 +290,7 @@ private void CheckForOciTarballStructure(string tarball) } else if (entry.Name.StartsWith("blobs/sha256/")) { - blobs.Add(entry.Name); + blobsCount++; } else { @@ -303,7 +303,7 @@ private void CheckForOciTarballStructure(string tarball) Assert.Equal(1, ociLayoutCount); Assert.Equal(1, indexJsonCount); - Assert.NotEmpty(blobs); + Assert.True(blobsCount > 0); } private string BuildLocalApp([CallerMemberName] string testName = "TestName", string tfm = ToolsetInfo.CurrentTargetFramework, string rid = "linux-x64") From a35510e9e814508b41a6c82b761567186df065d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 22:50:48 +0000 Subject: [PATCH 295/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.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.13.0-2.24555.7 -> To Version 4.13.0-2.24556.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 56adfdcc2f5b..1ffa294e569d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e - + https://github.com/dotnet/roslyn - a1f2017258e9bc3d348fd75b531808251abeb8ec + 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1d9b0e8fa351..70541ada7315 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 - 4.13.0-2.24556.5 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 + 4.13.0-2.24556.6 From 97ee1eb15f3f0849206646375249417929491e38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Nov 2024 23:19:42 +0000 Subject: [PATCH 296/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.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.13.0-2.24555.7 -> To Version 4.13.0-2.24556.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 1ffa294e569d..05072a8be8f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6dcaa8d887951003c56332dc40be6af56dd40c69 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 - + https://github.com/dotnet/roslyn - 4fe8bebdac8b0eb7a76960f65a43b43ce362c75e + 4039bc393d1f795a600e50e5691608a4ba60f575 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 70541ada7315..df43e6641f7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 - 4.13.0-2.24556.6 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 + 4.13.0-2.24556.7 From e9d3120197d4091b46fc7ebb896de6f97c23a494 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 01:04:01 +0000 Subject: [PATCH 297/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241106.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.24556.1 -> To Version 9.0.0-beta.24556.2 --- 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 75c7ed57c5b6..f8ac2250688a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink 474ceee2ae8a35d35692586f1a8a0f84fe55f572 diff --git a/eng/Versions.props b/eng/Versions.props index 19abbb68ec9e..45182d7a82df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24556.1 - 9.0.0-beta.24556.1 - 9.0.0-beta.24556.1 - 9.0.0-beta.24556.1 - 9.0.0-beta.24556.1 - 9.0.0-beta.24556.1 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 From 8c5af64ffd178103ef34826279baa40bf0c341c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 01:28:21 +0000 Subject: [PATCH 298/702] Update dependencies from https://github.com/dotnet/fsharp build 20241106.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24555.1 -> To Version 9.0.200-beta.24556.3 --- 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 75c7ed57c5b6..af88c73ccf98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 1723af95bb1140d7e24b9e39a09fc379bb672b7a - + https://github.com/dotnet/fsharp - 6d6e689c213288b47f0bd042fc8d27f135246808 + a29b58f3f6309eecd8df6d7d12f93e99ce0d665d - + https://github.com/dotnet/fsharp - 6d6e689c213288b47f0bd042fc8d27f135246808 + a29b58f3f6309eecd8df6d7d12f93e99ce0d665d diff --git a/eng/Versions.props b/eng/Versions.props index 19abbb68ec9e..57cbad7f65d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24555.1 + 13.9.200-beta.24556.3 From 68f3afd4aaaac084e1d880310a48c0e174c34bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Wed, 6 Nov 2024 17:57:40 -0800 Subject: [PATCH 299/702] Build (#44631) --- .../Aspire/AspireServiceFactory.cs | 12 +- .../dotnet-watch/Browser/BrowserConnector.cs | 4 +- .../dotnet-watch/CommandLineOptions.cs | 178 +++++++++++------- .../dotnet-watch/Filters/BuildEvaluator.cs | 2 +- .../IRuntimeProcessLauncherFactory.cs | 2 +- .../dotnet-watch/HotReload/ProjectLauncher.cs | 2 +- .../dotnet-watch/HotReloadDotNetWatcher.cs | 2 +- .../Internal/MsBuildFileSetFactory.cs | 16 +- src/BuiltInTools/dotnet-watch/Program.cs | 6 +- .../dotnet-watch/ProjectOptions.cs | 2 +- .../dotnet-watch/dotnet-watch.csproj | 6 +- src/Cli/dotnet/OptionForwardingExtensions.cs | 8 +- src/Cli/dotnet/Parser.cs | 6 +- src/Cli/dotnet/dotnet.csproj | 2 + .../WatchNoDepsApp/WatchNoDepsApp.csproj | 2 + .../CommandLineOptionsTests.cs | 62 ++++-- .../HotReload/CompilationHandlerTests.cs | 3 +- .../HotReload/RuntimeProcessLauncherTests.cs | 2 +- .../MsBuildFileSetFactoryTest.cs | 6 +- .../Utilities/MockFileSetFactory.cs | 3 +- .../Utilities/TestRuntimeProcessLauncher.cs | 2 +- .../Watch/DotNetWatcherTests.cs | 1 + test/dotnet-watch.Tests/Watch/ProgramTests.cs | 86 ++++++++- 23 files changed, 283 insertions(+), 132 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs index 753d6dd66cfb..77f472fa9b25 100644 --- a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs @@ -34,7 +34,7 @@ private readonly struct Session(string dcpId, string sessionId, RunningProject r private readonly ProjectLauncher _projectLauncher; private readonly AspireServerService _service; - private readonly IReadOnlyList<(string name, string value)> _buildProperties; + private readonly IReadOnlyList _buildArguments; /// /// Lock to access: @@ -47,10 +47,10 @@ private readonly struct Session(string dcpId, string sessionId, RunningProject r private int _sessionIdDispenser; private volatile bool _isDisposed; - public SessionManager(ProjectLauncher projectLauncher, IReadOnlyList<(string name, string value)> buildProperties) + public SessionManager(ProjectLauncher projectLauncher, IReadOnlyList buildArguments) { _projectLauncher = projectLauncher; - _buildProperties = buildProperties; + _buildArguments = buildArguments; _service = new AspireServerService( this, @@ -239,7 +239,7 @@ private ProjectOptions GetProjectOptions(ProjectLaunchRequest projectLaunchInfo) IsRootProject = false, ProjectPath = projectLaunchInfo.ProjectPath, WorkingDirectory = _projectLauncher.EnvironmentOptions.WorkingDirectory, // TODO: Should DCP protocol specify? - BuildProperties = _buildProperties, // TODO: Should DCP protocol specify? + BuildArguments = _buildArguments, // TODO: Should DCP protocol specify? Command = "run", CommandArguments = arguments, LaunchEnvironmentVariables = projectLaunchInfo.Environment?.Select(kvp => (kvp.Key, kvp.Value)).ToArray() ?? [], @@ -255,8 +255,8 @@ private ProjectOptions GetProjectOptions(ProjectLaunchRequest projectLaunchInfo) public static readonly AspireServiceFactory Instance = new(); public const string AppHostProjectCapability = "Aspire"; - public IRuntimeProcessLauncher? TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList<(string name, string value)> buildProperties) + public IRuntimeProcessLauncher? TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList buildArguments) => projectNode.GetCapabilities().Contains(AppHostProjectCapability) - ? new SessionManager(projectLauncher, buildProperties) + ? new SessionManager(projectLauncher, buildArguments) : null; } diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs index caafcf100005..994f29c0c9f8 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs @@ -223,9 +223,9 @@ private bool CanLaunchBrowser(DotNetWatchContext context, ProjectGraphNode proje return false; } - if (projectOptions.Command != "run") + if (!CommandLineOptions.IsCodeExecutionCommand(projectOptions.Command)) { - reporter.Verbose("Browser refresh is only supported for run commands."); + reporter.Verbose($"Command '{projectOptions.Command}' does not support browser refresh."); return false; } diff --git a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs index 497fb41c3b66..ff305bc270c2 100644 --- a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs +++ b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs @@ -7,8 +7,11 @@ using System.CommandLine.Parsing; using System.Data; using System.Diagnostics; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Tools.Run; using Microsoft.DotNet.Watcher.Tools; using Microsoft.Extensions.Tools.Internal; +using NuGet.Common; namespace Microsoft.DotNet.Watcher; @@ -16,44 +19,18 @@ internal sealed class CommandLineOptions { public const string DefaultCommand = "run"; - private static readonly ImmutableArray s_knownCommands = - [ - "add", - "build", - "build-server", - "clean", - "format", - "help", - "list", - "msbuild", - "new", - "nuget", - "pack", - "publish", - "remove", - "restore", - "run", - "sdk", - "solution", - "store", - "test", - "tool", - "vstest", - "workload" - ]; - public bool List { get; init; } required public GlobalOptions GlobalOptions { get; init; } public string? ProjectPath { get; init; } public string? TargetFramework { get; init; } - public IReadOnlyList<(string name, string value)>? BuildProperties { get; init; } public bool NoLaunchProfile { get; init; } public string? LaunchProfileName { get; init; } public string? ExplicitCommand { get; init; } public required IReadOnlyList CommandArguments { get; init; } + public required IReadOnlyList BuildArguments { get; init; } public string Command => ExplicitCommand ?? DefaultCommand; @@ -90,12 +67,10 @@ internal sealed class CommandLineOptions var longProjectOption = new CliOption("--project") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; var launchProfileOption = new CliOption("--launch-profile", "-lp") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; var noLaunchProfileOption = new CliOption("--no-launch-profile") { Hidden = true }; - var targetFrameworkOption = new CliOption("--framework", "-f") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; - var propertyOption = new CliOption("--property") { Hidden = true, Arity = ArgumentArity.OneOrMore, AllowMultipleArgumentsPerToken = false }; var rootCommand = new CliRootCommand(Resources.Help) { - Directives = { new EnvironmentVariablesDirective() } + Directives = { new EnvironmentVariablesDirective() }, }; foreach (var watchOption in watchOptions) @@ -107,8 +82,6 @@ internal sealed class CommandLineOptions rootCommand.Options.Add(shortProjectOption); rootCommand.Options.Add(launchProfileOption); rootCommand.Options.Add(noLaunchProfileOption); - rootCommand.Options.Add(targetFrameworkOption); - rootCommand.Options.Add(propertyOption); // We process all tokens that do not match any of the above options // to find the subcommand (the first unmatched token preceding "--") @@ -125,16 +98,33 @@ internal sealed class CommandLineOptions { Output = output, Error = output, + + // To match dotnet command line parsing (see https://github.com/dotnet/sdk/blob/4712b35b94f2ad672e69ec35097cf86fc16c2e5e/src/Cli/dotnet/Parser.cs#L169): + EnablePosixBundling = false, }; + // parse without forwarded options first: var parseResult = rootCommand.Parse(args, cliConfig); - if (parseResult.Errors.Any()) + if (ReportErrors(parseResult, reporter)) { - foreach (var error in parseResult.Errors) - { - reporter.Error(error.Message); - } + errorCode = 1; + return null; + } + + // determine subcommand: + var explicitCommand = TryGetSubcommand(parseResult); + var command = explicitCommand ?? RunCommandParser.GetCommand(); + var buildOptions = command.Options.Where(o => o is IForwardedOption); + + foreach (var buildOption in buildOptions) + { + rootCommand.Options.Add(buildOption); + } + // reparse with forwarded options: + parseResult = rootCommand.Parse(args, cliConfig); + if (ReportErrors(parseResult, reporter)) + { errorCode = 1; return null; } @@ -158,6 +148,12 @@ internal sealed class CommandLineOptions } } + var commandArguments = GetCommandArguments(parseResult, watchOptions, explicitCommand); + + // We assume that forwarded options, if any, are intended for dotnet build. + var buildArguments = buildOptions.Select(option => ((IForwardedOption)option).GetForwardingFunction()(parseResult)).SelectMany(args => args).ToArray(); + var targetFrameworkOption = (CliOption?)buildOptions.SingleOrDefault(option => option.Name == "--framework"); + return new() { List = parseResult.GetValue(listOption), @@ -169,32 +165,21 @@ internal sealed class CommandLineOptions Verbose = parseResult.GetValue(verboseOption), }, - CommandArguments = GetCommandArguments(parseResult, watchOptions, out var explicitCommand), - ExplicitCommand = explicitCommand, + CommandArguments = commandArguments, + ExplicitCommand = explicitCommand?.Name, ProjectPath = projectValue, LaunchProfileName = parseResult.GetValue(launchProfileOption), NoLaunchProfile = parseResult.GetValue(noLaunchProfileOption), - TargetFramework = parseResult.GetValue(targetFrameworkOption), - BuildProperties = ParseBuildProperties(parseResult.GetValue(propertyOption) ?? []).ToArray(), + BuildArguments = buildArguments, + TargetFramework = targetFrameworkOption != null ? parseResult.GetValue(targetFrameworkOption) : null, }; - - // Parses name=value pairs passed to --property. Skips invalid input. - // We don't report error here as it will be reported by dotnet run. - static IEnumerable<(string key, string value)> ParseBuildProperties(string[] properties) - => from property in properties - let index = property.IndexOf('=') - where index >= 0 - let name = property[..index].Trim() - let value = property[(index + 1)..] - where name is not [] - select (name, value); } private static IReadOnlyList GetCommandArguments( ParseResult parseResult, IReadOnlyList watchOptions, - out string? explicitCommand) + CliCommand? explicitCommand) { var arguments = new List(); @@ -211,6 +196,16 @@ private static IReadOnlyList GetCommandArguments( { arguments.Add(optionResult.IdentifierToken.Value); } + else if (optionResult.Option.Name == "--property") + { + foreach (var token in optionResult.Tokens) + { + // While dotnet-build allows "/p Name=Value", dotnet-msbuild does not. + // Any command that forwards args to dotnet-msbuild will fail if we don't use colon. + // See https://github.com/dotnet/sdk/issues/44655. + arguments.Add($"{optionResult.IdentifierToken.Value}:{token.Value}"); + } + } else { foreach (var token in optionResult.Tokens) @@ -228,33 +223,66 @@ private static IReadOnlyList GetCommandArguments( var dashDashIndex = IndexOf(parseResult.Tokens, t => t.Value == "--"); var unmatchedTokensBeforeDashDash = parseResult.UnmatchedTokens.Count - (dashDashIndex >= 0 ? parseResult.Tokens.Count - dashDashIndex - 1 : 0); - explicitCommand = null; + var seenCommand = false; var dashDashInserted = false; for (int i = 0; i < parseResult.UnmatchedTokens.Count; i++) { var token = parseResult.UnmatchedTokens[i]; - // command token can't follow "--" - if (i < unmatchedTokensBeforeDashDash && explicitCommand == null && s_knownCommands.Contains(token)) + if (i < unmatchedTokensBeforeDashDash && !seenCommand && token == explicitCommand?.Name) { - explicitCommand = token; + seenCommand = true; + continue; } - else - { - if (!dashDashInserted && i >= unmatchedTokensBeforeDashDash) - { - arguments.Add("--"); - dashDashInserted = true; - } - arguments.Add(token); + if (!dashDashInserted && i >= unmatchedTokensBeforeDashDash) + { + arguments.Add("--"); + dashDashInserted = true; } + + arguments.Add(token); } return arguments; } + private static CliCommand? TryGetSubcommand(ParseResult parseResult) + { + // Assuming that all tokens after "--" are unmatched: + var dashDashIndex = IndexOf(parseResult.Tokens, t => t.Value == "--"); + var unmatchedTokensBeforeDashDash = parseResult.UnmatchedTokens.Count - (dashDashIndex >= 0 ? parseResult.Tokens.Count - dashDashIndex - 1 : 0); + + var knownCommandsByName = Parser.Subcommands.ToDictionary(keySelector: c => c.Name, elementSelector: c => c); + + for (int i = 0; i < unmatchedTokensBeforeDashDash; i++) + { + // command token can't follow "--" + if (knownCommandsByName.TryGetValue(parseResult.UnmatchedTokens[i], out var explicitCommand)) + { + return explicitCommand; + } + } + + return null; + } + + private static bool ReportErrors(ParseResult parseResult, IReporter reporter) + { + if (parseResult.Errors.Any()) + { + foreach (var error in parseResult.Errors) + { + reporter.Error(error.Message); + } + + return true; + } + + return false; + } + private static int IndexOf(IReadOnlyList list, Func predicate) { for (var i = 0; i < list.Count; i++) @@ -274,12 +302,30 @@ public ProjectOptions GetProjectOptions(string projectPath, string workingDirect IsRootProject = true, ProjectPath = projectPath, WorkingDirectory = workingDirectory, - BuildProperties = BuildProperties ?? [], Command = Command, CommandArguments = CommandArguments, LaunchEnvironmentVariables = [], LaunchProfileName = LaunchProfileName, NoLaunchProfile = NoLaunchProfile, + BuildArguments = BuildArguments, TargetFramework = TargetFramework, }; + + // Parses name=value pairs passed to --property. Skips invalid input. + public static IEnumerable<(string key, string value)> ParseBuildProperties(IEnumerable arguments) + => from argument in arguments + let colon = argument.IndexOf(':') + where colon >= 0 && argument[0..colon] is "--property" or "-property" or "/property" or "/p" or "-p" or "--p" + let eq = argument.IndexOf('=', colon) + where eq >= 0 + let name = argument[(colon + 1)..eq].Trim() + let value = argument[(eq + 1)..] + where name is not [] + select (name, value); + + /// + /// Returns true if the command executes the code of the target project. + /// + public static bool IsCodeExecutionCommand(string commandName) + => commandName is "run" or "test"; } diff --git a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs index 3221f60278f2..3ff411fe0145 100644 --- a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs +++ b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs @@ -30,7 +30,7 @@ public IReadOnlyList GetProcessArguments(int iteration) { if (!context.EnvironmentOptions.SuppressMSBuildIncrementalism && iteration > 0 && - context.RootProjectOptions.Command is "run" or "test") + CommandLineOptions.IsCodeExecutionCommand(context.RootProjectOptions.Command)) { if (RequiresRevaluation) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs index e805e1c3652f..0c23cfe00975 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs @@ -12,5 +12,5 @@ namespace Microsoft.DotNet.Watcher; /// internal interface IRuntimeProcessLauncherFactory { - public IRuntimeProcessLauncher? TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList<(string name, string value)> buildProperties); + public IRuntimeProcessLauncher? TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList buildArguments); } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs index 3103124a5a1f..44ce6ccee578 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs @@ -58,7 +58,7 @@ public EnvironmentOptions EnvironmentOptions Executable = EnvironmentOptions.MuxerPath, WorkingDirectory = projectOptions.WorkingDirectory, OnOutput = onOutput, - Arguments = build || projectOptions.Command is not ("run" or "test") + Arguments = build || !CommandLineOptions.IsCodeExecutionCommand(projectOptions.Command) ? [projectOptions.Command, .. projectOptions.CommandArguments] : [projectOptions.Command, "--no-build", .. projectOptions.CommandArguments] }; diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 513c6b0548b0..14d4fe3bf3af 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -105,7 +105,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke var rootProjectNode = evaluationResult.ProjectGraph.GraphRoots.Single(); - runtimeProcessLauncher = runtimeProcessLauncherFactory?.TryCreate(rootProjectNode, projectLauncher, rootProjectOptions.BuildProperties); + runtimeProcessLauncher = runtimeProcessLauncherFactory?.TryCreate(rootProjectNode, projectLauncher, rootProjectOptions.BuildArguments); if (runtimeProcessLauncher != null) { var launcherEnvironment = runtimeProcessLauncher.GetEnvironmentVariables(); diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs index 85405a76f4a7..52e82d3a73ce 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs @@ -20,8 +20,7 @@ namespace Microsoft.DotNet.Watcher.Tools /// internal class MSBuildFileSetFactory( string rootProjectFile, - string? targetFramework, - IReadOnlyList<(string name, string value)> buildProperties, + IEnumerable buildArguments, EnvironmentOptions environmentOptions, IReporter reporter) { @@ -170,7 +169,7 @@ private IReadOnlyList GetMSBuildArguments(string watchListFilePath) arguments.Add("/bl:DotnetWatch.GenerateWatchList.binlog"); } - arguments.AddRange(buildProperties.Select(p => $"/p:{p.name}={p.value}")); + arguments.AddRange(buildArguments); // Set dotnet-watch reserved properties after the user specified propeties, // so that the former take precedence. @@ -180,11 +179,6 @@ private IReadOnlyList GetMSBuildArguments(string watchListFilePath) arguments.Add("/p:DotNetWatchContentFiles=false"); } - if (targetFramework != null) - { - arguments.Add("/p:TargetFramework=" + targetFramework); - } - arguments.Add("/p:_DotNetWatchListFile=" + watchListFilePath); arguments.Add("/p:DotNetWatchBuild=true"); // extensibility point for users arguments.Add("/p:DesignTimeBuild=true"); // don't do expensive things @@ -215,12 +209,8 @@ private static string FindTargetsFile() internal ProjectGraph? TryLoadProjectGraph(bool projectGraphRequired) { var globalOptions = new Dictionary(); - if (targetFramework != null) - { - globalOptions.Add("TargetFramework", targetFramework); - } - foreach (var (name, value) in buildProperties) + foreach (var (name, value) in CommandLineOptions.ParseBuildProperties(buildArguments)) { globalOptions[name] = value; } diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs index 8d974e970487..b41f0ab2e32a 100644 --- a/src/BuiltInTools/dotnet-watch/Program.cs +++ b/src/BuiltInTools/dotnet-watch/Program.cs @@ -171,8 +171,7 @@ internal Watcher CreateWatcher(IRuntimeProcessLauncherFactory? runtimeProcessLau var fileSetFactory = new MSBuildFileSetFactory( rootProjectOptions.ProjectPath, - rootProjectOptions.TargetFramework, - rootProjectOptions.BuildProperties, + rootProjectOptions.BuildArguments, environmentOptions, reporter); @@ -210,8 +209,7 @@ private async Task ListFilesAsync(CancellationToken cancellationToken) { var fileSetFactory = new MSBuildFileSetFactory( rootProjectOptions.ProjectPath, - rootProjectOptions.TargetFramework, - rootProjectOptions.BuildProperties, + rootProjectOptions.BuildArguments, environmentOptions, reporter); diff --git a/src/BuiltInTools/dotnet-watch/ProjectOptions.cs b/src/BuiltInTools/dotnet-watch/ProjectOptions.cs index 1e231f807eb1..ffb840f76a9e 100644 --- a/src/BuiltInTools/dotnet-watch/ProjectOptions.cs +++ b/src/BuiltInTools/dotnet-watch/ProjectOptions.cs @@ -9,7 +9,7 @@ internal sealed record ProjectOptions public required string ProjectPath { get; init; } public required string WorkingDirectory { get; init; } public required string? TargetFramework { get; init; } - public required IReadOnlyList<(string name, string value)> BuildProperties { get; init; } + public required IReadOnlyList BuildArguments { get; init; } public required bool NoLaunchProfile { get; init; } public required string? LaunchProfileName { get; init; } diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 299353a7fb71..17311445ab1e 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -16,10 +16,6 @@ false - - - - @@ -45,6 +41,8 @@ + + Hide(this CliOption option) return option; } + internal static Dictionary> HelpDescriptionCustomizations = new(); + public static CliOption WithHelpDescription(this CliOption option, CliCommand command, string helpText) { - if (Parser.HelpDescriptionCustomizations.ContainsKey(option)) + if (HelpDescriptionCustomizations.ContainsKey(option)) { - Parser.HelpDescriptionCustomizations[option].Add(command, helpText); + HelpDescriptionCustomizations[option].Add(command, helpText); } else { - Parser.HelpDescriptionCustomizations.Add(option, new Dictionary() { { command, helpText } }); + HelpDescriptionCustomizations.Add(option, new Dictionary() { { command, helpText } }); } return option; diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs index 08936d61ba95..04374a3e44ea 100644 --- a/src/Cli/dotnet/Parser.cs +++ b/src/Cli/dotnet/Parser.cs @@ -22,8 +22,6 @@ public static class Parser Directives = { new DiagramDirective(), new SuggestDirective(), new EnvironmentVariablesDirective() } }; - internal static Dictionary> HelpDescriptionCustomizations = new(); - public static readonly CliCommand InstallSuccessCommand = InternalReportinstallsuccessCommandParser.GetCommand(); // Subcommands @@ -224,11 +222,11 @@ private DotnetHelpBuilder(int maxWidth = int.MaxValue) : base(maxWidth) { } private static void SetHelpCustomizations(HelpBuilder builder) { - foreach (var option in HelpDescriptionCustomizations.Keys) + foreach (var option in OptionForwardingExtensions.HelpDescriptionCustomizations.Keys) { Func descriptionCallback = (HelpContext context) => { - foreach (var (command, helpText) in HelpDescriptionCustomizations[option]) + foreach (var (command, helpText) in OptionForwardingExtensions.HelpDescriptionCustomizations[option]) { if (context.ParseResult.CommandResult.Command.Equals(command)) { diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 8a8018447c21..58cefd4e6ba6 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -123,6 +123,8 @@ + + diff --git a/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj b/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj index b22b7a420622..25ae2984a550 100644 --- a/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj +++ b/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj @@ -13,6 +13,8 @@ actually an important failure, so don't error out here. --> CS9057 + + true diff --git a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs index 00b40547dcc5..425a2ec5d6d1 100644 --- a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs +++ b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs @@ -52,15 +52,15 @@ public void HelpArgs(string[] args) } [Theory] - [InlineData("P=V", "P", "V")] - [InlineData("P==", "P", "=")] - [InlineData("P=A=B", "P", "A=B")] - [InlineData(" P\t = V ", "P", " V ")] - [InlineData("P=", "P", "")] + [InlineData("-p:P=V", "P", "V")] + [InlineData("-p:P==", "P", "=")] + [InlineData("-p:P=A=B", "P", "A=B")] + [InlineData("-p: P\t = V ", "P", " V ")] + [InlineData("-p:P=", "P", "")] public void BuildProperties_Valid(string argValue, string name, string value) { - var options = VerifyOptions(["--property", argValue]); - Assert.Equal([(name, value)], options.BuildProperties); + var properties = CommandLineOptions.ParseBuildProperties([argValue]); + AssertEx.SequenceEqual([(name, value)], properties); } [Theory] @@ -68,10 +68,10 @@ public void BuildProperties_Valid(string argValue, string name, string value) [InlineData("=P3")] [InlineData("=")] [InlineData("==")] - public void BuildProperties_Invalid(string value) + public void BuildProperties_Invalid(string argValue) { - var options = VerifyOptions(["--property", value]); - Assert.Empty(options.BuildProperties); + var properties = CommandLineOptions.ParseBuildProperties([argValue]); + AssertEx.SequenceEqual([], properties); } [Fact] @@ -290,9 +290,9 @@ public void OptionsSpecifiedBeforeOrAfterRun(bool afterRun) Assert.Equal("P", options.ProjectPath); Assert.Equal("F", options.TargetFramework); - Assert.Equal([("P1", "V1"), ("P2", "V2")], options.BuildProperties); + Assert.Equal(["-property:TargetFramework=F", "--property:P1=V1", "--property:P2=V2"], options.BuildArguments); - Assert.Equal(["--project", "P", "--framework", "F", "--property", "P1=V1", "--property", "P2=V2"], options.CommandArguments); + Assert.Equal(["--project", "P", "--framework", "F", "--property:P1=V1", "--property:P2=V2"], options.CommandArguments); } public enum ArgPosition @@ -341,10 +341,10 @@ public void OptionDuplicates_Allowed_Bool( public void MultiplePropertyValues() { var options = VerifyOptions(["--property", "P1=V1", "run", "--property", "P2=V2"]); - AssertEx.SequenceEqual(["P1=V1", "P2=V2"], options.BuildProperties.Select(p => $"{p.name}={p.value}")); + AssertEx.SequenceEqual(["--property:P1=V1", "--property:P2=V2"], options.BuildArguments); // options must be repeated since --property does not support multiple args - AssertEx.SequenceEqual(["--property", "P1=V1", "--property", "P2=V2"], options.CommandArguments); + AssertEx.SequenceEqual(["--property:P1=V1", "--property:P2=V2"], options.CommandArguments); } [Theory] @@ -408,5 +408,39 @@ public void ShortFormForLaunchProfileArgumentWorks() var options = VerifyOptions(["-lp", "CustomLaunchProfile"]); Assert.Equal("CustomLaunchProfile", options.LaunchProfileName); } + + /// + /// Validates that options that the "run" command forwards to "build" command are forwarded by dotnet-watch. + /// + [Theory] + [InlineData(new[] { "--configuration", "release" }, new[] { "-property:Configuration=release" })] + [InlineData(new[] { "--framework", "net9.0" }, new[] { "-property:TargetFramework=net9.0" })] + [InlineData(new[] { "--runtime", "arm64" }, new[] { "-property:RuntimeIdentifier=arm64","-property:_CommandLineDefinedRuntimeIdentifier=true" })] + [InlineData(new[] { "--property", "b=1" }, new[] { "--property:b=1" })] + [InlineData(new[] { "--interactive" }, new[] { "-property:NuGetInteractive=true" })] + [InlineData(new[] { "--no-restore" }, new[] { "-restore:false" })] + [InlineData(new[] { "--sc" }, new[] { "-property:SelfContained=True", "-property:_CommandLineDefinedSelfContained=true"})] + [InlineData(new[] { "--self-contained" }, new[] { "-property:SelfContained=True", "-property:_CommandLineDefinedSelfContained=true" })] + [InlineData(new[] { "--no-self-contained" }, new[] { "-property:SelfContained=False","-property:_CommandLineDefinedSelfContained=true"})] + [InlineData(new[] { "--verbosity", "q" }, new[] { "-verbosity:q" })] + [InlineData(new[] { "--arch", "arm", "--os", "win" }, new[] { "-property:RuntimeIdentifier=win-arm" })] + [InlineData(new[] { "--disable-build-servers" }, new[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })] + public void ForwardedBuildOptions(string[] args, string[] buildArgs) + { + var options = VerifyOptions(["run", .. args]); + AssertEx.SequenceEqual(buildArgs, options.BuildArguments); + } + + [Fact] + public void ForwardedBuildOptions_ArtifactsPath() + { + var path = TestContext.Current.TestAssetsDirectory; + + var args = new[] { "--artifacts-path", path }; + var buildArgs = new[] { @"-property:ArtifactsPath=" + path }; + + var options = VerifyOptions(["run", .. args]); + AssertEx.SequenceEqual(buildArgs, options.BuildArguments); + } } } diff --git a/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs b/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs index 7c6bf4f191bd..a61609ad77e3 100644 --- a/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs +++ b/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs @@ -25,8 +25,7 @@ public async Task ReferenceOutputAssembly_False() var factory = new MSBuildFileSetFactory( rootProjectFile: options.ProjectPath, - targetFramework: null, - buildProperties: [], + buildArguments: [], environmentOptions: new EnvironmentOptions(Environment.CurrentDirectory, "dotnet"), reporter); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index d6fbbbfd6079..9c5cc5f1fb0c 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -24,7 +24,7 @@ private static async Task Launch(string projectPath, TestRuntime IsRootProject = false, ProjectPath = projectPath, WorkingDirectory = workingDirectory, - BuildProperties = [], + BuildArguments = [], Command = "run", CommandArguments = ["--project", projectPath], LaunchEnvironmentVariables = [], diff --git a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs index 41b03dbd8876..901cf1c65196 100644 --- a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs +++ b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs @@ -336,7 +336,7 @@ public async Task ProjectReferences_Graph() var output = new List(); _reporter.OnProcessOutput += line => output.Add(line.Content); - var filesetFactory = new MSBuildFileSetFactory(projectA, targetFramework: null, buildProperties: [("_DotNetWatchTraceOutput", "true")], options, _reporter); + var filesetFactory = new MSBuildFileSetFactory(projectA, buildArguments: ["/p:_DotNetWatchTraceOutput=true"], options, _reporter); var result = await filesetFactory.TryCreateAsync(requireProjectGraph: null, CancellationToken.None); Assert.NotNull(result); @@ -397,7 +397,7 @@ public async Task MsbuildOutput() var output = new List(); _reporter.OnProcessOutput += line => output.Add($"{(line.IsError ? "[stderr]" : "[stdout]")} {line.Content}"); - var factory = new MSBuildFileSetFactory(project1Path, targetFramework: null, buildProperties: [], options, _reporter); + var factory = new MSBuildFileSetFactory(project1Path, buildArguments: [], options, _reporter); var result = await factory.TryCreateAsync(requireProjectGraph: null, CancellationToken.None); Assert.Null(result); @@ -416,7 +416,7 @@ private async Task Evaluate(string projectPath) MuxerPath: MuxerPath, WorkingDirectory: Path.GetDirectoryName(projectPath)!); - var factory = new MSBuildFileSetFactory(projectPath, targetFramework: null, buildProperties: [], options, _reporter); + var factory = new MSBuildFileSetFactory(projectPath, buildArguments: [], options, _reporter); var result = await factory.TryCreateAsync(requireProjectGraph: null, CancellationToken.None); Assert.NotNull(result); return result; diff --git a/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs b/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs index 0fa8f0d6aa9b..6222a5db348e 100644 --- a/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs +++ b/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs @@ -7,8 +7,7 @@ namespace Microsoft.DotNet.Watcher.Tools; internal class MockFileSetFactory() : MSBuildFileSetFactory( rootProjectFile: "test.csproj", - targetFramework: null, - buildProperties: [], + buildArguments: [], new EnvironmentOptions(Environment.CurrentDirectory, "dotnet"), NullReporter.Singleton) { diff --git a/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs b/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs index 35e8fc249c56..df5b334163b3 100644 --- a/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs +++ b/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs @@ -11,7 +11,7 @@ internal class TestRuntimeProcessLauncher(ProjectLauncher projectLauncher) : IRu { public class Factory(Action? initialize = null) : IRuntimeProcessLauncherFactory { - public IRuntimeProcessLauncher TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList<(string name, string value)> buildProperties) + public IRuntimeProcessLauncher TryCreate(ProjectGraphNode projectNode, ProjectLauncher projectLauncher, IReadOnlyList buildArguments) { var service = new TestRuntimeProcessLauncher(projectLauncher); initialize?.Invoke(service); diff --git a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs index 3635cb163001..fb64fbad9567 100644 --- a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs +++ b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; +using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tests { diff --git a/test/dotnet-watch.Tests/Watch/ProgramTests.cs b/test/dotnet-watch.Tests/Watch/ProgramTests.cs index 39c31719ea74..0dcc2a850e0f 100644 --- a/test/dotnet-watch.Tests/Watch/ProgramTests.cs +++ b/test/dotnet-watch.Tests/Watch/ProgramTests.cs @@ -214,7 +214,7 @@ public async Task TestCommand_MultiTargeting() var testAsset = TestAssets.CopyTestAsset("XunitMulti") .WithSource(); - App.Start(testAsset, ["--verbose", "--framework", ToolsetInfo.CurrentTargetFramework, "test", "--list-tests", "/p:VSTestUseMSBuildOutput=false"]); + App.Start(testAsset, ["--verbose", "test", "--framework", ToolsetInfo.CurrentTargetFramework, "--list-tests", "/p:VSTestUseMSBuildOutput=false"]); await App.AssertOutputLineEquals("The following Tests are available:"); await App.AssertOutputLineEquals(" TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp"); @@ -228,7 +228,89 @@ public async Task BuildCommand() App.Start(testAsset, ["--verbose", "--property", "TestProperty=123", "build", "/t:TestTarget"]); - await App.AssertOutputLine(line => line.Contains("warning : The value of property is '123'", StringComparison.Ordinal)); + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + // evaluation affected by -c option: + Assert.Contains("TestProperty", App.Process.Output.Single(line => line.Contains("/t:GenerateWatchList"))); + + App.AssertOutputContains("dotnet watch ⌚ Command 'build' does not support Hot Reload."); + App.AssertOutputContains("dotnet watch ⌚ Command 'build' does not support browser refresh."); + App.AssertOutputContains("warning : The value of property is '123'"); + } + + [Fact] + public async Task MSBuildCommand() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + App.Start(testAsset, ["--verbose", "/p:TestProperty=123", "msbuild", "/t:TestTarget"]); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + // TestProperty is not passed to evaluation since msbuild command doesn't include it in forward options: + Assert.DoesNotContain("TestProperty", App.Process.Output.Single(line => line.Contains("/t:GenerateWatchList"))); + + App.AssertOutputContains("dotnet watch ⌚ Command 'msbuild' does not support Hot Reload."); + App.AssertOutputContains("dotnet watch ⌚ Command 'msbuild' does not support browser refresh."); + App.AssertOutputContains("warning : The value of property is '123'"); + } + + [Fact] + public async Task PackCommand() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + App.Start(testAsset, ["--verbose", "pack", "-c", "Release"]); + + var packagePath = Path.Combine(testAsset.Path, "bin", "Release", "WatchNoDepsApp.1.0.0.nupkg"); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + // evaluation affected by -c option: + Assert.Contains("-property:Configuration=Release", App.Process.Output.Single(line => line.Contains("/t:GenerateWatchList"))); + + App.AssertOutputContains("dotnet watch ⌚ Command 'pack' does not support Hot Reload."); + App.AssertOutputContains("dotnet watch ⌚ Command 'pack' does not support browser refresh."); + App.AssertOutputContains($"Successfully created package '{packagePath}'"); + } + + [Fact] + public async Task PublishCommand() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + App.Start(testAsset, ["--verbose", "publish", "-c", "Release"]); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + // evaluation affected by -c option: + Assert.Contains("-property:Configuration=Release", App.Process.Output.Single(line => line.Contains("/t:GenerateWatchList"))); + + App.AssertOutputContains("dotnet watch ⌚ Command 'publish' does not support Hot Reload."); + App.AssertOutputContains("dotnet watch ⌚ Command 'publish' does not support browser refresh."); + + App.AssertOutputContains(Path.Combine("Release", ToolsetInfo.CurrentTargetFramework, "publish")); + } + + [Fact] + public async Task FormatCommand() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + App.DotnetWatchArgs.Clear(); + App.Start(testAsset, ["--verbose", "format", "--verbosity", "detailed"]); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + App.AssertOutputContains("dotnet watch ⌚ Command 'format' does not support Hot Reload."); + App.AssertOutputContains("dotnet watch ⌚ Command 'format' does not support browser refresh."); + + App.AssertOutputContains("format --verbosity detailed"); + App.AssertOutputContains("Format complete in"); } [Fact] From 1fb03b8e9700cb5b16bba85dbccd2a67bebbbae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 06:09:54 +0000 Subject: [PATCH 300/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24556.7 -> To Version 4.13.0-2.24556.9 --- 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 007b289caaa8..6c02c36f70b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6d6e689c213288b47f0bd042fc8d27f135246808 - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d - + https://github.com/dotnet/roslyn - 4039bc393d1f795a600e50e5691608a4ba60f575 + 96b307163f171bd4ed66e24353ac64fef3a6167d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a871ab063590..bba044ec4a58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 - 4.13.0-2.24556.7 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 + 4.13.0-2.24556.9 From 485684af98a4736a15f0e456f9b0ff64efc01886 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 06:45:24 +0000 Subject: [PATCH 301/702] Update dependencies from https://github.com/dotnet/roslyn build 20241106.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24556.7 -> To Version 4.13.0-2.24556.10 --- 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 6c02c36f70b8..4738b2a21f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 6d6e689c213288b47f0bd042fc8d27f135246808 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn - 96b307163f171bd4ed66e24353ac64fef3a6167d + b0b8e0fe16f29a602422fa93e6366521437a4188 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bba044ec4a58..27ecfdcabf67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 - 4.13.0-2.24556.9 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 + 4.13.0-2.24556.10 From c4f39690d29216154e5baee1141cf175e3195ab4 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 7 Nov 2024 11:15:36 +0100 Subject: [PATCH 302/702] check for BuiltImage.ManifestMediaType instead of BuiltImage.Manifest.MediaType as it can be null --- .../Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs index 50c81f127c20..7e779e9ec3c0 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs @@ -269,11 +269,11 @@ public static bool IsInsecureRegistry(string registryDomain) #if NET public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, Stream imageStream, CancellationToken cancellationToken) { - if (image.Manifest.MediaType == SchemaTypes.DockerManifestV2) + if (image.ManifestMediaType == SchemaTypes.DockerManifestV2) { await WriteDockerImageToStreamAsync(image, sourceReference, destinationReference, imageStream, cancellationToken); } - else if (image.Manifest.MediaType == SchemaTypes.OciManifestV1) + else if (image.ManifestMediaType == SchemaTypes.OciManifestV1) { await WriteOciImageToStreamAsync(image, sourceReference, destinationReference, imageStream, cancellationToken); } From aa67ae3ff0b2066a9d8c91062ac6e6e966711a3d Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 7 Nov 2024 11:22:30 +0100 Subject: [PATCH 303/702] change tests --- .../DockerRegistryManager.cs | 31 +--- .../EndToEndTests.cs | 138 +++++++++--------- 2 files changed, 77 insertions(+), 92 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index 0c7a906114ea..da189af4e6df 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -11,9 +11,7 @@ public class DockerRegistryManager { public const string RuntimeBaseImage = "dotnet/runtime"; public const string AspNetBaseImage = "dotnet/aspnet"; - public const string Nginx = "library/nginx"; public const string BaseImageSource = "mcr.microsoft.com"; - public const string LibraryImageSourse = "docker.io"; public const string Net6ImageTag = "6.0"; public const string Net7ImageTag = "7.0"; public const string Net8ImageTag = "8.0"; @@ -51,7 +49,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu int spawnRegistryDelay = 1000; //ms StringBuilder failureReasons = new(); - var mcrPullRegistry = new Registry(BaseImageSource, logger, RegistryMode.Pull); + var pullRegistry = new Registry(BaseImageSource, logger, RegistryMode.Pull); var pushRegistry = new Registry(LocalRegistry, logger, RegistryMode.Push); for (int spawnRegistryAttempt = 1; spawnRegistryAttempt <= spawnRegistryMaxRetry; spawnRegistryAttempt++) @@ -78,13 +76,14 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu string dotnetdll = System.Reflection.Assembly.GetExecutingAssembly().Location; var ridjson = Path.Combine(Path.GetDirectoryName(dotnetdll)!, "RuntimeIdentifierGraph.json"); - await PullFromRemoteRegistryThenPushToLocalRegistry(mcrPullRegistry, pushRegistry, BaseImageSource, RuntimeBaseImage, tag, logger); + var image = await pullRegistry.GetImageManifestAsync(RuntimeBaseImage, tag, "linux-x64", new SameArchManifestPicker(), CancellationToken.None); + var source = new SourceImageReference(pullRegistry, RuntimeBaseImage, tag); + var dest = new DestinationImageReference(pushRegistry, RuntimeBaseImage, [tag]); + logger.LogInformation($"Pushing image for {BaseImageSource}/{RuntimeBaseImage}:{tag}"); + await pushRegistry.PushAsync(image.Build(), source, dest, CancellationToken.None); + logger.LogInformation($"Pushed image for {BaseImageSource}/{RuntimeBaseImage}:{tag}"); } - var nginxTag = "latest"; - var librPullRegistry = new Registry(LibraryImageSourse, logger, RegistryMode.Pull); - await PullFromRemoteRegistryThenPushToLocalRegistry(librPullRegistry, pushRegistry, LibraryImageSourse, Nginx, nginxTag, logger); - return; } catch (Exception ex) @@ -114,22 +113,6 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu throw new InvalidOperationException($"The registry was not loaded after {spawnRegistryMaxRetry} retries. {failureReasons}"); } - private static async Task PullFromRemoteRegistryThenPushToLocalRegistry( - Registry remoteRegistry, - Registry localRegistry, - string imageSource, - string repositoryName, - string tag, - ILogger logger) - { - var image = await remoteRegistry.GetImageManifestAsync(repositoryName, tag, "linux-x64", new SameArchManifestPicker(), CancellationToken.None); - var source = new SourceImageReference(remoteRegistry, repositoryName, tag); - var dest = new DestinationImageReference(localRegistry, repositoryName, [tag]); - logger.LogInformation($"Pushing image for {imageSource}/{repositoryName}:{tag}"); - await localRegistry.PushAsync(image.Build(), source, dest, CancellationToken.None); - logger.LogInformation($"Pushed image for {imageSource}/{repositoryName}:{tag}"); - } - public static void ShutdownDockerRegistry(ITestOutputHelper testOutput) { if (s_registryContainerId != null) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 077c66d31c98..c1914306d08c 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -130,7 +130,35 @@ public async Task ApiEndToEndWithLocalLoad() [DockerAvailableFact] public async Task ApiEndToEndWithArchiveWritingAndLoad() { - ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad)); + var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, + nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz"); + + // Build the image + (BuiltImage builtImage, SourceImageReference sourceReference, DestinationImageReference destinationReference) = + await BuildDockerImageWithArciveDestinationAsync(archiveFile, ["latest", "1.0"], nameof(ApiEndToEndWithArchiveWritingAndLoad)); + + // Write the image to disk + await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); + + Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); + + // Load the archive + ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) + .Execute() + .Should().Pass(); + + // Run the image + foreach (string tag in destinationReference.Tags) + { + ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") + .Execute() + .Should().Pass(); + } + } + + private async Task<(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference)> BuildDockerImageWithArciveDestinationAsync(string archiveFile, string[] tags, string testName) + { + ILogger logger = _loggerFactory.CreateLogger(testName); string publishDirectory = BuildLocalApp(tfm: "net8.0"); // Build the image @@ -154,32 +182,55 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() BuiltImage builtImage = imageBuilder.Build(); // Write the image to disk - var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, - nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz"); var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net7ImageTag); - var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), new[] { "latest", "1.0" }); + var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), tags); - await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); + return (builtImage, sourceReference, destinationReference); + } + + [DockerAvailableFact] + public async Task TarballsHaveCorrectStructure() + { + var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, + nameof(TarballsHaveCorrectStructure), "app.tar.gz"); + + // 1. Create docker image and write it to a tarball + (BuiltImage dockerImage, SourceImageReference sourceReference, DestinationImageReference destinationReference) = + await BuildDockerImageWithArciveDestinationAsync(archiveFile, ["latest"], nameof(TarballsHaveCorrectStructure)); + await destinationReference.LocalRegistry!.LoadAsync(dockerImage, sourceReference, destinationReference, default).ConfigureAwait(false); + Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); - // Load the archive - ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) - .Execute() - .Should().Pass(); + CheckDockerTarballStructure(archiveFile); - // Run the image - foreach (string tag in destinationReference.Tags) - { - ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") - .Execute() - .Should().Pass(); - } + // 2. Convert the docker image to an OCI image and write it to a tarball + BuiltImage ociImage = ConvertToOciImage(dockerImage); + + await destinationReference.LocalRegistry!.LoadAsync(ociImage, sourceReference, destinationReference, default).ConfigureAwait(false); + + Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); - CheckForDockerTarballStructure(archiveFile); + CheckOciTarballStructure(archiveFile); } - private void CheckForDockerTarballStructure(string tarball) + private BuiltImage ConvertToOciImage(BuiltImage builtImage) + { + // Convert the image to an OCI image + var ociImage = new BuiltImage + { + Config = builtImage.Config, + ImageDigest = builtImage.ImageDigest, + ImageSha = builtImage.ImageSha, + ImageSize = builtImage.ImageSize, + Manifest = builtImage.Manifest, + ManifestMediaType = SchemaTypes.OciManifestV1, + }; + + return ociImage; + } + + private void CheckDockerTarballStructure(string tarball) { var layersCount = 0; int configJson = 0; @@ -218,56 +269,7 @@ private void CheckForDockerTarballStructure(string tarball) Assert.True(layersCount > 0); } - [DockerAvailableFact] - public async Task ApiEndToEndOciImageWithArchiveWritingAndLoad() - { - ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndOciImageWithArchiveWritingAndLoad)); - - // Build the image - - Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); - - ImageBuilder imageBuilder = await registry.GetImageManifestAsync( - DockerRegistryManager.Nginx, - "latest", - "linux-x64", - ToolsetUtils.RidGraphManifestPicker, - cancellationToken: default).ConfigureAwait(false); - Assert.NotNull(imageBuilder); - - BuiltImage builtImage = imageBuilder.Build(); - - // Write the image to disk - var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, - nameof(ApiEndToEndWithArchiveWritingAndLoad), "nginx.tar.gz"); - var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net7ImageTag); - var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), ["latest"]); - - await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); - - Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); - - // Docker cannot load an OCI image, so we check for Podman - if (ContainerCli.IsPodman) - { - // Load the archive - ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) - .Execute() - .Should().Pass(); - - // Run the image - foreach (string tag in destinationReference.Tags) - { - ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") - .Execute() - .Should().Pass(); - } - } - - CheckForOciTarballStructure(archiveFile); - } - - private void CheckForOciTarballStructure(string tarball) + private void CheckOciTarballStructure(string tarball) { int blobsCount = 0; int ociLayoutCount = 0; From 013c777772d01605a7b8fbf0dc21001ed1d441a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 10:40:06 +0000 Subject: [PATCH 304/702] Update dependencies from https://github.com/dotnet/msbuild build 20241107.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24556-01 -> To Version 17.13.0-preview-24557-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78e71f33c4f9..38478e95c3be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 1723af95bb1140d7e24b9e39a09fc379bb672b7a + 8a5384d8a85ed6e74b55789e42c5383f45591b71 - + https://github.com/dotnet/msbuild - 1723af95bb1140d7e24b9e39a09fc379bb672b7a + 8a5384d8a85ed6e74b55789e42c5383f45591b71 - + https://github.com/dotnet/msbuild - 1723af95bb1140d7e24b9e39a09fc379bb672b7a + 8a5384d8a85ed6e74b55789e42c5383f45591b71 diff --git a/eng/Versions.props b/eng/Versions.props index 74d23a58e16a..3387b2a4619a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24556-01 - 17.13.0-preview-24556-01 + 17.13.0-preview-24557-01 + 17.13.0-preview-24557-01 17.11.4 17.12 From 717a30d8e5778f612006fb5c5a19bd1f54a0ea19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 10:56:30 +0000 Subject: [PATCH 305/702] Update dependencies from https://github.com/dotnet/razor build 20241107.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24555.12 -> To Version 9.0.0-preview.24557.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78e71f33c4f9..56c8021ef1f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 6e796fe6f1790b4ff3923d2de443789257f696f3 + 390aced03bc51b264c0a5ad7d3f1803bcc83f85e - + https://github.com/dotnet/razor - 6e796fe6f1790b4ff3923d2de443789257f696f3 + 390aced03bc51b264c0a5ad7d3f1803bcc83f85e - + https://github.com/dotnet/razor - 6e796fe6f1790b4ff3923d2de443789257f696f3 + 390aced03bc51b264c0a5ad7d3f1803bcc83f85e - + https://github.com/dotnet/razor - 6e796fe6f1790b4ff3923d2de443789257f696f3 + 390aced03bc51b264c0a5ad7d3f1803bcc83f85e diff --git a/eng/Versions.props b/eng/Versions.props index 74d23a58e16a..7fe73ad25183 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24555.12 - 9.0.0-preview.24555.12 - 9.0.0-preview.24555.12 + 9.0.0-preview.24557.1 + 9.0.0-preview.24557.1 + 9.0.0-preview.24557.1 From ee3029bd6dd202c5cf99db194b1b764ea1207507 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 7 Nov 2024 12:53:27 +0100 Subject: [PATCH 306/702] fix test --- .../EndToEndTests.cs | 73 +++++++++++-------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index c1914306d08c..46350b66ecb0 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -130,35 +130,7 @@ public async Task ApiEndToEndWithLocalLoad() [DockerAvailableFact] public async Task ApiEndToEndWithArchiveWritingAndLoad() { - var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, - nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz"); - - // Build the image - (BuiltImage builtImage, SourceImageReference sourceReference, DestinationImageReference destinationReference) = - await BuildDockerImageWithArciveDestinationAsync(archiveFile, ["latest", "1.0"], nameof(ApiEndToEndWithArchiveWritingAndLoad)); - - // Write the image to disk - await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); - - Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); - - // Load the archive - ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) - .Execute() - .Should().Pass(); - - // Run the image - foreach (string tag in destinationReference.Tags) - { - ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") - .Execute() - .Should().Pass(); - } - } - - private async Task<(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference)> BuildDockerImageWithArciveDestinationAsync(string archiveFile, string[] tags, string testName) - { - ILogger logger = _loggerFactory.CreateLogger(testName); + ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad)); string publishDirectory = BuildLocalApp(tfm: "net8.0"); // Build the image @@ -182,10 +154,27 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() BuiltImage builtImage = imageBuilder.Build(); // Write the image to disk + var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory, + nameof(ApiEndToEndWithArchiveWritingAndLoad), "app.tar.gz"); var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net7ImageTag); - var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), tags); + var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), new[] { "latest", "1.0" }); - return (builtImage, sourceReference, destinationReference); + await destinationReference.LocalRegistry!.LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false); + + Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})"); + + // Load the archive + ContainerCli.LoadCommand(_testOutput, "--input", archiveFile) + .Execute() + .Should().Pass(); + + // Run the image + foreach (string tag in destinationReference.Tags) + { + ContainerCli.RunCommand(_testOutput, "--rm", "--tty", $"{NewImageName()}:{tag}") + .Execute() + .Should().Pass(); + } } [DockerAvailableFact] @@ -214,6 +203,28 @@ public async Task TarballsHaveCorrectStructure() CheckOciTarballStructure(archiveFile); } + private async Task<(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference)> BuildDockerImageWithArciveDestinationAsync(string archiveFile, string[] tags, string testName) + { + ILogger logger = _loggerFactory.CreateLogger(testName); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); + + ImageBuilder imageBuilder = await registry.GetImageManifestAsync( + DockerRegistryManager.RuntimeBaseImage, + DockerRegistryManager.Net8ImageTag, + "linux-x64", + ToolsetUtils.RidGraphManifestPicker, + cancellationToken: default).ConfigureAwait(false); + Assert.NotNull(imageBuilder); + + BuiltImage builtImage = imageBuilder.Build(); + + // Write the image to disk + var sourceReference = new SourceImageReference(registry, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net7ImageTag); + var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archiveFile), NewImageName(), tags); + + return (builtImage, sourceReference, destinationReference); + } + private BuiltImage ConvertToOciImage(BuiltImage builtImage) { // Convert the image to an OCI image From 5173b34cbb13fb838e416b15562e915119d0a215 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 12:25:17 +0000 Subject: [PATCH 307/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.58 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.57 -> To Version 6.13.0-preview.1.58 --- 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 78e71f33c4f9..b5386f0e2907 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 - + https://github.com/nuget/nuget.client - b34beb6039fba765b922a4b7d654a8cacb04185b + 5042f474c1ecee0b976788b939b16c707b1bc6a4 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 74d23a58e16a..6b0418a872dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 - 6.13.0-preview.1.57 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 + 6.13.0-preview.1.58 From 5487a2b06df986a3866af39cc0db9daa7b323247 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 12:46:13 +0000 Subject: [PATCH 308/702] Update dependencies from https://github.com/dotnet/razor build 20241107.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24555.12 -> To Version 9.0.0-preview.24557.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56c8021ef1f9..8d15be9692cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 390aced03bc51b264c0a5ad7d3f1803bcc83f85e + 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 - + https://github.com/dotnet/razor - 390aced03bc51b264c0a5ad7d3f1803bcc83f85e + 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 - + https://github.com/dotnet/razor - 390aced03bc51b264c0a5ad7d3f1803bcc83f85e + 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 - + https://github.com/dotnet/razor - 390aced03bc51b264c0a5ad7d3f1803bcc83f85e + 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 diff --git a/eng/Versions.props b/eng/Versions.props index 7fe73ad25183..21fa613d8dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.1 - 9.0.0-preview.24557.1 - 9.0.0-preview.24557.1 + 9.0.0-preview.24557.2 + 9.0.0-preview.24557.2 + 9.0.0-preview.24557.2 From 7de92f578c180f2b4fb91491388bbf9f10653a5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 13:43:09 +0000 Subject: [PATCH 309/702] 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 0150b4922bf088f1f5930dc4c47b4cc91040b595 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 13:50:10 +0000 Subject: [PATCH 310/702] Update dependencies from https://github.com/dotnet/templating build 20241106.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.404-servicing.24517.2 -> To Version 8.0.405-servicing.24556.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4588c6226f8c..9bab978d676c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 971247aee6f2..4ae564213fcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f + 5e0f79406f0f3a907ceff031514624670a0401b3 - + https://github.com/dotnet/templating - ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f + 5e0f79406f0f3a907ceff031514624670a0401b3 - + https://github.com/dotnet/templating - ee7a2c8f1e87ae0d16050d5d87ee52767f8d4f1f + 5e0f79406f0f3a907ceff031514624670a0401b3 diff --git a/eng/Versions.props b/eng/Versions.props index 4c18ec859882..65f9b8bbb598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.404 + 8.0.405 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.404-servicing.24517.2 + 8.0.405-servicing.24556.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3489c87d07dcc23cfbad8bc0f541c54acdfa0166 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 13:51:44 +0000 Subject: [PATCH 311/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241106.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.24554.2 -> To Version 9.0.0-beta.24556.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 e7b9ce085a8c..d2522de903d7 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 - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 - + https://github.com/dotnet/sourcelink - 30158dbab8aa11592c27561d9710cd7e5239ea3c + 474ceee2ae8a35d35692586f1a8a0f84fe55f572 diff --git a/eng/Versions.props b/eng/Versions.props index 52d3c2984355..48c6e4e14bf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 - 9.0.0-beta.24554.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 + 9.0.0-beta.24556.2 From 1c769b17e1b5a948eaaa9fb8bbf82217cb449d3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 15:53:29 +0000 Subject: [PATCH 312/702] Update dependencies from https://github.com/dotnet/msbuild build 20241107.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24556-01 -> To Version 17.13.0-preview-24557-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38478e95c3be..07cf784160c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 8a5384d8a85ed6e74b55789e42c5383f45591b71 + a607ce7dc76db067889c253bb9557a821f364cee - + https://github.com/dotnet/msbuild - 8a5384d8a85ed6e74b55789e42c5383f45591b71 + a607ce7dc76db067889c253bb9557a821f364cee - + https://github.com/dotnet/msbuild - 8a5384d8a85ed6e74b55789e42c5383f45591b71 + a607ce7dc76db067889c253bb9557a821f364cee diff --git a/eng/Versions.props b/eng/Versions.props index 3387b2a4619a..77bf28341c3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24557-01 - 17.13.0-preview-24557-01 + 17.13.0-preview-24557-02 + 17.13.0-preview-24557-02 17.11.4 17.12 From dc655d1427950c7713baf4136eea050b19687fa6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 16:24:33 +0000 Subject: [PATCH 313/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241107.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.24556.2 -> To Version 9.0.0-beta.24557.1 --- 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 78e71f33c4f9..e56acca8b5ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 diff --git a/eng/Versions.props b/eng/Versions.props index 74d23a58e16a..a4348316aff9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 + 9.0.0-beta.24557.1 + 9.0.0-beta.24557.1 + 9.0.0-beta.24557.1 + 9.0.0-beta.24557.1 + 9.0.0-beta.24557.1 + 9.0.0-beta.24557.1 From 26c1289ed2480d020c3a1a4f8b0d417347ed4bcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 16:57:12 +0000 Subject: [PATCH 314/702] Update dependencies from https://github.com/dotnet/fsharp build 20241107.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24556.3 -> To Version 9.0.200-beta.24557.4 --- 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 78e71f33c4f9..1059b766c819 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 1723af95bb1140d7e24b9e39a09fc379bb672b7a - + https://github.com/dotnet/fsharp - a29b58f3f6309eecd8df6d7d12f93e99ce0d665d + 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/fsharp - a29b58f3f6309eecd8df6d7d12f93e99ce0d665d + 970483121932c4cad0c3bf346077393121cddfe9 diff --git a/eng/Versions.props b/eng/Versions.props index 74d23a58e16a..949b2168d9b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24556.3 + 13.9.200-beta.24557.4 From 940607866e1a932554a272f0710f19cb18493ef8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:59:41 -0600 Subject: [PATCH 315/702] [release/9.0.2xx] Allow ProjectReferences to not have the _GetRequiredWorkloads Target (#44701) Co-authored-by: Chet Husk Co-authored-by: Chet Husk --- .../Microsoft.NET.Sdk.ImportWorkloads.targets | 7 +++++-- .../ProjectWithEsProjReference/App.csproj | 10 ++++++++++ .../ProjectWithEsProjReference/Lib.esproj | 1 + .../package-lock.json | 13 +++++++++++++ .../ProjectWithEsProjReference/package.json | 11 +++++++++++ .../GivenDotnetWorkloadRestore.cs | 18 ++++++++++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj create mode 100644 test/TestAssets/TestProjects/ProjectWithEsProjReference/Lib.esproj create mode 100644 test/TestAssets/TestProjects/ProjectWithEsProjReference/package-lock.json create mode 100644 test/TestAssets/TestProjects/ProjectWithEsProjReference/package.json diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.ImportWorkloads.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.ImportWorkloads.targets index 85a407989e7a..a1596a8bf2d4 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.ImportWorkloads.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.ImportWorkloads.targets @@ -42,14 +42,17 @@ Copyright (c) .NET Foundation. All rights reserved. + need to be set to "true" to avoid requiring restore (which would likely fail if the required workloads aren't already installed). + In addition, since this is a target that is called on potentially-unsupported project types like esproj, we need to not fail + if the Target is missing. --> + RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;TargetFrameworks" + SkipNonexistentTargets="true" > diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj b/test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj new file mode 100644 index 000000000000..520fa8e675c7 --- /dev/null +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj @@ -0,0 +1,10 @@ + + + + net9.0 + + + + + + diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/Lib.esproj b/test/TestAssets/TestProjects/ProjectWithEsProjReference/Lib.esproj new file mode 100644 index 000000000000..b20505a4fe4a --- /dev/null +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/Lib.esproj @@ -0,0 +1 @@ + diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/package-lock.json b/test/TestAssets/TestProjects/ProjectWithEsProjReference/package-lock.json new file mode 100644 index 000000000000..0a695be0ca8e --- /dev/null +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "lib", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "lib", + "version": "1.0.0", + "license": "MIT" + } + } +} diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/package.json b/test/TestAssets/TestProjects/ProjectWithEsProjReference/package.json new file mode 100644 index 000000000000..2bb37a370104 --- /dev/null +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/package.json @@ -0,0 +1,11 @@ +{ + "name": "lib", + "version": "1.0.0", + "description": "A test project to verify .NET SDK compatibility for workload restore and non-Managed projects", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT" +} \ No newline at end of file diff --git a/test/dotnet-workload-restore.Tests/GivenDotnetWorkloadRestore.cs b/test/dotnet-workload-restore.Tests/GivenDotnetWorkloadRestore.cs index e76f6d5616ae..eabc6de3b5cc 100644 --- a/test/dotnet-workload-restore.Tests/GivenDotnetWorkloadRestore.cs +++ b/test/dotnet-workload-restore.Tests/GivenDotnetWorkloadRestore.cs @@ -10,6 +10,7 @@ public GivenDotnetWorkloadRestore(ITestOutputHelper log) : base(log) } public static string DcProjAssetName = "SolutionWithAppAndDcProj"; + public static string TransitiveReferenceNoWorkloadsAssetName = "ProjectWithEsProjReference"; [Fact] public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() @@ -27,4 +28,21 @@ public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() // if we did try to restore the dcproj in this TestAsset we would fail, so passing means we didn't! .Pass(); } + + [Fact] + public void ProjectsThatDoNotSupportWorkloadsAndAreTransitivelyReferencedDoNotBreakTheBuild() + { + var projectPath = + _testAssetsManager + .CopyTestAsset(TransitiveReferenceNoWorkloadsAssetName) + .WithSource() + .Path; + + new DotnetWorkloadCommand(Log, "restore") + .WithWorkingDirectory(projectPath) + .Execute() + .Should() + // if we did try to restore the esproj in this TestAsset we would fail, so passing means we didn't! + .Pass(); + } } From 64ddb8a9a1ad2eec034714d8fb8a98c6dc818361 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 19:56:24 +0000 Subject: [PATCH 316/702] Update dependencies from https://github.com/dotnet/razor build 20241107.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24555.12 -> To Version 9.0.0-preview.24557.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d15be9692cd..b04403a89b19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 + c382522edc9015ec282a6657160ecd59a2d2e095 - + https://github.com/dotnet/razor - 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 + c382522edc9015ec282a6657160ecd59a2d2e095 - + https://github.com/dotnet/razor - 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 + c382522edc9015ec282a6657160ecd59a2d2e095 - + https://github.com/dotnet/razor - 40d2a6f1e6824831cfec8d4f7a6cef268dceec16 + c382522edc9015ec282a6657160ecd59a2d2e095 diff --git a/eng/Versions.props b/eng/Versions.props index 21fa613d8dae..98ab145a57bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.2 - 9.0.0-preview.24557.2 - 9.0.0-preview.24557.2 + 9.0.0-preview.24557.4 + 9.0.0-preview.24557.4 + 9.0.0-preview.24557.4 From cdceae3dadf9e49127a8fae5b1dc093bd947bb39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 20:40:06 +0000 Subject: [PATCH 317/702] Update dependencies from https://github.com/dotnet/razor build 20241107.5 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.24555.12 -> To Version 9.0.0-preview.24557.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b04403a89b19..35c2527c1719 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - c382522edc9015ec282a6657160ecd59a2d2e095 + cdd0fdc87f252585d98cc1c4e683a0850f15d72e - + https://github.com/dotnet/razor - c382522edc9015ec282a6657160ecd59a2d2e095 + cdd0fdc87f252585d98cc1c4e683a0850f15d72e - + https://github.com/dotnet/razor - c382522edc9015ec282a6657160ecd59a2d2e095 + cdd0fdc87f252585d98cc1c4e683a0850f15d72e - + https://github.com/dotnet/razor - c382522edc9015ec282a6657160ecd59a2d2e095 + cdd0fdc87f252585d98cc1c4e683a0850f15d72e diff --git a/eng/Versions.props b/eng/Versions.props index 98ab145a57bd..ef3c46690fb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.4 - 9.0.0-preview.24557.4 - 9.0.0-preview.24557.4 + 9.0.0-preview.24557.5 + 9.0.0-preview.24557.5 + 9.0.0-preview.24557.5 From 427ca54c1117675319390361eb96095684e38181 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 21:47:25 +0000 Subject: [PATCH 318/702] Update dependencies from https://github.com/dotnet/msbuild build 20241107.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24556-01 -> To Version 17.13.0-preview-24557-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07cf784160c0..f50f7d47cb62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - a607ce7dc76db067889c253bb9557a821f364cee + ec950be12ea4906b7c32a5a0bb794269ac3f5035 - + https://github.com/dotnet/msbuild - a607ce7dc76db067889c253bb9557a821f364cee + ec950be12ea4906b7c32a5a0bb794269ac3f5035 - + https://github.com/dotnet/msbuild - a607ce7dc76db067889c253bb9557a821f364cee + ec950be12ea4906b7c32a5a0bb794269ac3f5035 diff --git a/eng/Versions.props b/eng/Versions.props index 77bf28341c3c..6fda0be85ded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24557-02 - 17.13.0-preview-24557-02 + 17.13.0-preview-24557-03 + 17.13.0-preview-24557-03 17.11.4 17.12 From d3ea54d090ac3bccde5cf5e8b333f32e90ab6d11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 22:03:04 +0000 Subject: [PATCH 319/702] Update dependencies from https://github.com/dotnet/msbuild build 20241107.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24556-01 -> To Version 17.13.0-preview-24557-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f50f7d47cb62..1ab077b56c91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - ec950be12ea4906b7c32a5a0bb794269ac3f5035 + 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 - + https://github.com/dotnet/msbuild - ec950be12ea4906b7c32a5a0bb794269ac3f5035 + 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 - + https://github.com/dotnet/msbuild - ec950be12ea4906b7c32a5a0bb794269ac3f5035 + 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 diff --git a/eng/Versions.props b/eng/Versions.props index 6fda0be85ded..a2ec83d6e5f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24557-03 - 17.13.0-preview-24557-03 + 17.13.0-preview-24557-04 + 17.13.0-preview-24557-04 17.11.4 17.12 From 55667ae4ccf28c349bd2957ded26b56018cca6f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 22:57:48 +0000 Subject: [PATCH 320/702] Update dependencies from https://github.com/dotnet/razor build 20241107.6 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24557.5 -> To Version 9.0.0-preview.24557.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9d7392f48cb..f3b354bda2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - cdd0fdc87f252585d98cc1c4e683a0850f15d72e + 78bafebff28bde85413ae13bec479190dabe1cba - + https://github.com/dotnet/razor - cdd0fdc87f252585d98cc1c4e683a0850f15d72e + 78bafebff28bde85413ae13bec479190dabe1cba - + https://github.com/dotnet/razor - cdd0fdc87f252585d98cc1c4e683a0850f15d72e + 78bafebff28bde85413ae13bec479190dabe1cba - + https://github.com/dotnet/razor - cdd0fdc87f252585d98cc1c4e683a0850f15d72e + 78bafebff28bde85413ae13bec479190dabe1cba diff --git a/eng/Versions.props b/eng/Versions.props index 12544a095740..3b85beb654ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.5 - 9.0.0-preview.24557.5 - 9.0.0-preview.24557.5 + 9.0.0-preview.24557.6 + 9.0.0-preview.24557.6 + 9.0.0-preview.24557.6 From 4c727cdc949dd90c174e027df7d88e91484f32a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Nov 2024 23:57:08 +0000 Subject: [PATCH 321/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24556.10 -> To Version 4.13.0-2.24557.1 --- 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 8e4a8cb7e8b9..6238080bf8e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,41 +93,41 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 - + https://github.com/dotnet/roslyn b0b8e0fe16f29a602422fa93e6366521437a4188 diff --git a/eng/Versions.props b/eng/Versions.props index d6abd4dfa82e..cc6cffa0915d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 - 4.13.0-2.24556.10 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 + 4.13.0-2.24557.1 From 042a92ca91c2500dc895d31e4b080e378d25ca7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 19:01:35 -0600 Subject: [PATCH 322/702] [release/9.0.1xx] improve SDK incremental builds by not running crossgen on inner loop builds (#44726) Co-authored-by: Chet Husk --- build.cmd | 2 ++ build.sh | 2 ++ src/Installer/redist-installer/targets/GenerateLayout.targets | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index 44e859e0e9f1..132cbefcda29 100644 --- a/build.cmd +++ b/build.cmd @@ -4,7 +4,9 @@ echo %* | findstr /C:"-pack" >nul if %errorlevel%==0 ( set PackInstaller= ) else ( + REM disable crossgen for inner-loop builds to save a ton of time set PackInstaller=/p:PackInstaller=false + set DISABLE_CROSSGEN=true ) powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %*" exit /b %ErrorLevel% diff --git a/build.sh b/build.sh index 26fd3fae9c2d..0d8b76aca39e 100755 --- a/build.sh +++ b/build.sh @@ -9,6 +9,8 @@ done ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )" if [[ "$@" != *"-pack"* ]]; then + # disable crossgen for inner-loop builds to save a ton of time + export DISABLE_CROSSGEN=true packInstallerFlag="/p:PackInstaller=false" else packInstallerFlag= diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets index 7693c24fb416..ad1bb400bfb1 100644 --- a/src/Installer/redist-installer/targets/GenerateLayout.targets +++ b/src/Installer/redist-installer/targets/GenerateLayout.targets @@ -627,7 +627,7 @@ + BeforeTargets="AfterBuild" > From 52c378f38517ba361108d6af7bba6ebaa148ca8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 01:18:21 +0000 Subject: [PATCH 323/702] Update dependencies from https://github.com/dotnet/razor build 20241107.8 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.24557.5 -> To Version 9.0.0-preview.24557.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3b354bda2b9..5ea5d20f3748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 78bafebff28bde85413ae13bec479190dabe1cba + 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 - + https://github.com/dotnet/razor - 78bafebff28bde85413ae13bec479190dabe1cba + 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 - + https://github.com/dotnet/razor - 78bafebff28bde85413ae13bec479190dabe1cba + 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 - + https://github.com/dotnet/razor - 78bafebff28bde85413ae13bec479190dabe1cba + 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 diff --git a/eng/Versions.props b/eng/Versions.props index 3b85beb654ba..bdd5fb9c9a9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.6 - 9.0.0-preview.24557.6 - 9.0.0-preview.24557.6 + 9.0.0-preview.24557.8 + 9.0.0-preview.24557.8 + 9.0.0-preview.24557.8 From 65b28d384b1fde885653f78a03b5cddd9df14fb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 01:20:16 +0000 Subject: [PATCH 324/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241107.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.24557.1 -> To Version 9.0.0-beta.24557.2 --- 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 8e4a8cb7e8b9..a5ce03ebc60f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink 02c795c78776db6051730c33d80324228d602255 diff --git a/eng/Versions.props b/eng/Versions.props index d6abd4dfa82e..ea4d813825a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24557.1 - 9.0.0-beta.24557.1 - 9.0.0-beta.24557.1 - 9.0.0-beta.24557.1 - 9.0.0-beta.24557.1 - 9.0.0-beta.24557.1 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 From 41eef4c0b61ec1d7a1894766fd235a52dfa56889 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 02:51:38 +0000 Subject: [PATCH 325/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24557.1 -> To Version 4.13.0-2.24557.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6238080bf8e0..fa810a7792ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e - + https://github.com/dotnet/roslyn - b0b8e0fe16f29a602422fa93e6366521437a4188 + b9f70334602fe8d167ad21c4449b44758f13266e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index cc6cffa0915d..ecdfd7ec3e50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 - 4.13.0-2.24557.1 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 + 4.13.0-2.24557.2 From f011f94df4ba04ae3db6765bf9b32aa5b7e6f2a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 02:52:04 +0000 Subject: [PATCH 326/702] Update dependencies from https://github.com/dotnet/razor build 20241107.9 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.24557.5 -> To Version 9.0.0-preview.24557.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ea5d20f3748..27b31c491cd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 + 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 - + https://github.com/dotnet/razor - 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 + 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 - + https://github.com/dotnet/razor - 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 + 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 - + https://github.com/dotnet/razor - 62b6d9bd305ef062e50a75b6c4bfc9cd69eec317 + 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 diff --git a/eng/Versions.props b/eng/Versions.props index bdd5fb9c9a9b..52f73a23ec2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.8 - 9.0.0-preview.24557.8 - 9.0.0-preview.24557.8 + 9.0.0-preview.24557.9 + 9.0.0-preview.24557.9 + 9.0.0-preview.24557.9 From c7ade46591bd7400576012072d4c3a14e80b5c4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 05:14:55 +0000 Subject: [PATCH 327/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24557.1 -> To Version 4.13.0-2.24557.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa810a7792ce..8d520d97c68d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 - + https://github.com/dotnet/roslyn - b9f70334602fe8d167ad21c4449b44758f13266e + 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ecdfd7ec3e50..f072551e9c17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 - 4.13.0-2.24557.2 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 + 4.13.0-2.24557.4 From 593f53d4a523fc2f57cd55872b30c1a1f0942288 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 05:19:45 +0000 Subject: [PATCH 328/702] Update dependencies from https://github.com/dotnet/razor build 20241107.11 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.24557.5 -> To Version 9.0.0-preview.24557.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27b31c491cd9..0fbf64259c3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 + 121b129b01629399f3a9a4f99050511991addf67 - + https://github.com/dotnet/razor - 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 + 121b129b01629399f3a9a4f99050511991addf67 - + https://github.com/dotnet/razor - 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 + 121b129b01629399f3a9a4f99050511991addf67 - + https://github.com/dotnet/razor - 34cacfab073ff59eb27ff48eb7bc642fa1f74f26 + 121b129b01629399f3a9a4f99050511991addf67 diff --git a/eng/Versions.props b/eng/Versions.props index 52f73a23ec2d..9bcd1ee5fdc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.9 - 9.0.0-preview.24557.9 - 9.0.0-preview.24557.9 + 9.0.0-preview.24557.11 + 9.0.0-preview.24557.11 + 9.0.0-preview.24557.11 From d8c90f996e8daa4151d846923bc44d99a453c231 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 06:07:58 +0000 Subject: [PATCH 329/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24557.1 -> To Version 4.13.0-2.24557.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d520d97c68d..d09dd567176a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 - + https://github.com/dotnet/roslyn - 87d48bc700ae6b0e8d8bd204dbba7e47b2aa4c49 + 868ce771e159c702061d0de9f0e42701a4736416 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f072551e9c17..bd256add4c0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 - 4.13.0-2.24557.4 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 + 4.13.0-2.24557.5 From 168d333b1dacf16a49c526ad1b490390563b254e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 08:44:12 +0000 Subject: [PATCH 330/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.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.13.0-2.24557.5 -> To Version 4.13.0-2.24557.8 --- 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 06022b799cb6..02c41dfad739 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 - + https://github.com/dotnet/roslyn - 868ce771e159c702061d0de9f0e42701a4736416 + 8fd7f94b052e88f2360cd0b6e81f75220fad8771 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 117903ff1ed9..3a0cbe7b3e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 - 4.13.0-2.24557.5 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 + 4.13.0-2.24557.8 From 85d7113d28e464a21ff90845ab60fd48ae1101e1 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Fri, 8 Nov 2024 10:22:51 +0100 Subject: [PATCH 331/702] Fix a typo in a comment --- .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index c2ddf51d2639..6fa4bc2d0782 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -264,7 +264,7 @@ Copyright (c) .NET Foundation. All rights reserved. FormatArguments="$(NETCoreSdkVersion)" /> + WPF temp projects are ignored (it's known their NuGetPackageRoot is empty and user cannot fix that anyway). --> From df7b2b631262907af1403fa7243eefa42f7a155f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 11:10:53 +0000 Subject: [PATCH 332/702] Update dependencies from https://github.com/dotnet/fsharp build 20241107.7 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24557.4 -> To Version 9.0.200-beta.24557.7 --- 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 5844f573b3ec..e627cf4b0c65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 - + https://github.com/dotnet/fsharp - 970483121932c4cad0c3bf346077393121cddfe9 + 4d2390a9946c2de06cf35475c888bcdddf3fbb07 - + https://github.com/dotnet/fsharp - 970483121932c4cad0c3bf346077393121cddfe9 + 4d2390a9946c2de06cf35475c888bcdddf3fbb07 diff --git a/eng/Versions.props b/eng/Versions.props index ddf96d73fb29..90b36b193055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24557.4 + 13.9.200-beta.24557.7 From 310dae7327d61436a15a49f88010a1be07f70918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 11:19:52 +0000 Subject: [PATCH 333/702] Update dependencies from https://github.com/dotnet/msbuild build 20241108.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24557-04 -> To Version 17.13.0-preview-24558-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5844f573b3ec..5d1b4b10fea6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 + ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 - + https://github.com/dotnet/msbuild - 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 + ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 - + https://github.com/dotnet/msbuild - 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 + ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 diff --git a/eng/Versions.props b/eng/Versions.props index ddf96d73fb29..72f11230a2f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24557-04 - 17.13.0-preview-24557-04 + 17.13.0-preview-24558-01 + 17.13.0-preview-24558-01 17.11.4 17.12 From a8e180b560550bb0958f500932f5e790b0eaf452 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 12:24:59 +0000 Subject: [PATCH 334/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.60 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.58 -> To Version 6.13.0-preview.1.60 --- 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 5844f573b3ec..728a1ecfb216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd - + https://github.com/nuget/nuget.client - 5042f474c1ecee0b976788b939b16c707b1bc6a4 + 4f24d6d51798557a1c54b4aad71389a08af94cfd https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ddf96d73fb29..c7333b900619 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 - 6.13.0-preview.1.58 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 + 6.13.0-preview.1.60 From 4a58104686be87d3a3cc1259926ca45c55fec72f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 12:53:51 +0000 Subject: [PATCH 335/702] Update dependencies from https://github.com/dotnet/fsharp build 20241108.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24557.4 -> To Version 9.0.200-beta.24558.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 e627cf4b0c65..4bd0844b7a71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 - + https://github.com/dotnet/fsharp - 4d2390a9946c2de06cf35475c888bcdddf3fbb07 + 005de12e29fb6ccf48c57eb5026d629458322d34 - + https://github.com/dotnet/fsharp - 4d2390a9946c2de06cf35475c888bcdddf3fbb07 + 005de12e29fb6ccf48c57eb5026d629458322d34 diff --git a/eng/Versions.props b/eng/Versions.props index 90b36b193055..5a7128ea375f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24557.7 + 13.9.200-beta.24558.2 From c2e04bc194fff2a8460ec952443cb943f98bec32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 13:47:26 +0000 Subject: [PATCH 336/702] Update dependencies from https://github.com/dotnet/roslyn build 20241107.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24554.3 -> To Version 4.12.0-3.24557.3 --- 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 0976748935b7..6e4a24c231ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 - + https://github.com/dotnet/roslyn - 26920eb85c829675ba662ad6db36a17dc591638d + b6341b01321e4dc9c4455bed5ea84edd729d6082 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 62c025541320..8bfb7eef4cd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 - 4.12.0-3.24554.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 + 4.12.0-3.24557.3 From cd618a15bcc506f56b771df47c2de7947266650e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 13:47:52 +0000 Subject: [PATCH 337/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241107.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.24556.2 -> To Version 9.0.0-beta.24557.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 0976748935b7..4c573bafb25e 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 - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 - + https://github.com/dotnet/sourcelink - 474ceee2ae8a35d35692586f1a8a0f84fe55f572 + 02c795c78776db6051730c33d80324228d602255 diff --git a/eng/Versions.props b/eng/Versions.props index 62c025541320..d3f1b95be4a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 - 9.0.0-beta.24556.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 + 9.0.0-beta.24557.2 From bdcd018a8a8df287ad9bdc052e70680e7096dbb0 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:01:57 -0600 Subject: [PATCH 338/702] Update Source-Build SDK Diff Tests Baselines and Exclusions (#44739) --- .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt index 5431c38274d3..d10fb0eca178 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt @@ -20,7 +20,7 @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/|msft # Intentional - explicitly excluded from source-build # netfx tooling and tasks, not building in source-build - https://github.com/dotnet/source-build/issues/3514 -./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/net472/|msft +./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/netframework/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/|msft @@ -30,11 +30,11 @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/net472/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/netframework/|msft # vstest localization is disabled in Linux builds - https://github.com/dotnet/source-build/issues/3517 ./sdk/x.y.z/*/Microsoft.CodeCoverage.IO.resources.dll|msft From 2ac0f25afac09ccc44dfedacceab98e6875ad799 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 16:14:41 +0000 Subject: [PATCH 339/702] Update dependencies from https://github.com/dotnet/test-templates build 20241108.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24555.1 -> To Version 1.1.0-rtm.24558.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 5844f573b3ec..2ef7bfa37668 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 1ab4caea85ef1ccdb735be3e8a908f4728daf624 + 37e5097eeb9196aadfbbde131f58a5df63476f93 - + https://github.com/dotnet/test-templates - 1ab4caea85ef1ccdb735be3e8a908f4728daf624 + 37e5097eeb9196aadfbbde131f58a5df63476f93 diff --git a/eng/Versions.props b/eng/Versions.props index ddf96d73fb29..82984fc353a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24555.1 + 1.1.0-rtm.24558.1 From d394d82f7cb12d6c6a02d3bab25bf0f2723d645d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 16:14:42 +0000 Subject: [PATCH 340/702] Update dependencies from https://github.com/dotnet/test-templates build 20241108.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24555.1 -> To Version 1.1.0-rtm.24558.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 0976748935b7..f48f96822fcb 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 - 1ab4caea85ef1ccdb735be3e8a908f4728daf624 + 37e5097eeb9196aadfbbde131f58a5df63476f93 - + https://github.com/dotnet/test-templates - 1ab4caea85ef1ccdb735be3e8a908f4728daf624 + 37e5097eeb9196aadfbbde131f58a5df63476f93 diff --git a/eng/Versions.props b/eng/Versions.props index 62c025541320..18674e3ef0d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24555.1 + 1.1.0-rtm.24558.1 From cb63f1589d2973100ef3ec7e1a31f66831629ce4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 16:24:25 +0000 Subject: [PATCH 341/702] Update dependencies from https://github.com/dotnet/msbuild build 20241108.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24557-04 -> To Version 17.13.0-preview-24558-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d1b4b10fea6..bf0eb4afb667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 + e4f527b8f8807345382bab5b5f1fe70ba6190cd0 - + https://github.com/dotnet/msbuild - ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 + e4f527b8f8807345382bab5b5f1fe70ba6190cd0 - + https://github.com/dotnet/msbuild - ebe99e24c12fc7e2ea2b2f71f0b0cd040cddd0a1 + e4f527b8f8807345382bab5b5f1fe70ba6190cd0 diff --git a/eng/Versions.props b/eng/Versions.props index 72f11230a2f2..de8a2c3f9e79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24558-01 - 17.13.0-preview-24558-01 + 17.13.0-preview-24558-02 + 17.13.0-preview-24558-02 17.11.4 17.12 From 64b7b03d4e49db1c9855fe4cc29b40c48d349409 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 16:36:03 +0000 Subject: [PATCH 342/702] Update dependencies from https://github.com/dotnet/fsharp build 20241108.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24557.4 -> To Version 9.0.200-beta.24558.3 --- 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 4bd0844b7a71..c8104196c442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 36a5f6a629b2eb70e2c7593a5b2d24d1bc8ffb60 - + https://github.com/dotnet/fsharp - 005de12e29fb6ccf48c57eb5026d629458322d34 + 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 - + https://github.com/dotnet/fsharp - 005de12e29fb6ccf48c57eb5026d629458322d34 + 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 diff --git a/eng/Versions.props b/eng/Versions.props index 5a7128ea375f..cf10b7832953 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24558.2 + 13.9.200-beta.24558.3 From 4d8e178e5284f61cd211b47281f11403bc339432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 18:55:07 +0000 Subject: [PATCH 343/702] Update dependencies from https://github.com/dotnet/msbuild build 20241108.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24557-04 -> To Version 17.13.0-preview-24558-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf0eb4afb667..1f5b8b1cd737 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - e4f527b8f8807345382bab5b5f1fe70ba6190cd0 + 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 - + https://github.com/dotnet/msbuild - e4f527b8f8807345382bab5b5f1fe70ba6190cd0 + 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 - + https://github.com/dotnet/msbuild - e4f527b8f8807345382bab5b5f1fe70ba6190cd0 + 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 diff --git a/eng/Versions.props b/eng/Versions.props index de8a2c3f9e79..44d001e1b9e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24558-02 - 17.13.0-preview-24558-02 + 17.13.0-preview-24558-03 + 17.13.0-preview-24558-03 17.11.4 17.12 From 61105642892af844babf3b45f2feeea4a8eefdc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 19:30:43 +0000 Subject: [PATCH 344/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24557.8 -> To Version 4.13.0-2.24558.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5844f573b3ec..a0756e09eaa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 - + https://github.com/dotnet/roslyn - 8fd7f94b052e88f2360cd0b6e81f75220fad8771 + 5c14a315b4d028960eae435ecee776e9b85840b4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ddf96d73fb29..05f12f402cef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 - 4.13.0-2.24557.8 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 + 4.13.0-2.24558.4 From e8b60209849b3ad13b37e89ae6ec45b16e5fa8f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 21:48:24 +0000 Subject: [PATCH 345/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.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.13.0-2.24557.8 -> To Version 4.13.0-2.24558.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 a0756e09eaa7..35ef8141b67c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 - + https://github.com/dotnet/roslyn - 5c14a315b4d028960eae435ecee776e9b85840b4 + 82aedf1935843bc16be7deb016b39c036ee453e6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 05f12f402cef..5d6f65889e59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 - 4.13.0-2.24558.4 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 + 4.13.0-2.24558.6 From 98e7b1015640407683ffb5071fdbd1b3676ee1d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 22:00:27 +0000 Subject: [PATCH 346/702] Update dependencies from https://github.com/dotnet/razor build 20241108.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24557.11 -> To Version 9.0.0-preview.24558.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c051ce1f4ecb..70c2a1361cab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 121b129b01629399f3a9a4f99050511991addf67 + df548d6e9192cfd399e04422edeb0b2d26b5a8e7 - + https://github.com/dotnet/razor - 121b129b01629399f3a9a4f99050511991addf67 + df548d6e9192cfd399e04422edeb0b2d26b5a8e7 - + https://github.com/dotnet/razor - 121b129b01629399f3a9a4f99050511991addf67 + df548d6e9192cfd399e04422edeb0b2d26b5a8e7 - + https://github.com/dotnet/razor - 121b129b01629399f3a9a4f99050511991addf67 + df548d6e9192cfd399e04422edeb0b2d26b5a8e7 diff --git a/eng/Versions.props b/eng/Versions.props index f2017e148920..5f7f8d8362a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24557.11 - 9.0.0-preview.24557.11 - 9.0.0-preview.24557.11 + 9.0.0-preview.24558.1 + 9.0.0-preview.24558.1 + 9.0.0-preview.24558.1 From 899b25ce28e0c859a4a418c7b497c7b8ff9b9a0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Nov 2024 22:04:55 +0000 Subject: [PATCH 347/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.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.13.0-2.24557.8 -> To Version 4.13.0-2.24558.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 35ef8141b67c..b3645d456871 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 970483121932c4cad0c3bf346077393121cddfe9 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 - + https://github.com/dotnet/roslyn - 82aedf1935843bc16be7deb016b39c036ee453e6 + a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5d6f65889e59..6a22bcf88cf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 - 4.13.0-2.24558.6 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 + 4.13.0-2.24558.7 From 5d23bb68dab86cc25b34dc0e064c27e823560913 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Fri, 8 Nov 2024 15:50:21 -0800 Subject: [PATCH 348/702] 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 fa8424661abf5ed8fbd92eb091d2340daea7a511 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 00:09:16 +0000 Subject: [PATCH 349/702] Update dependencies from https://github.com/dotnet/razor build 20241108.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24557.11 -> To Version 9.0.0-preview.24558.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70c2a1361cab..1d300349b859 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - df548d6e9192cfd399e04422edeb0b2d26b5a8e7 + f6384a995a7032f50f4e3d07fad1c87e2cd8a560 - + https://github.com/dotnet/razor - df548d6e9192cfd399e04422edeb0b2d26b5a8e7 + f6384a995a7032f50f4e3d07fad1c87e2cd8a560 - + https://github.com/dotnet/razor - df548d6e9192cfd399e04422edeb0b2d26b5a8e7 + f6384a995a7032f50f4e3d07fad1c87e2cd8a560 - + https://github.com/dotnet/razor - df548d6e9192cfd399e04422edeb0b2d26b5a8e7 + f6384a995a7032f50f4e3d07fad1c87e2cd8a560 diff --git a/eng/Versions.props b/eng/Versions.props index 5f7f8d8362a2..8ff791554f3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24558.1 - 9.0.0-preview.24558.1 - 9.0.0-preview.24558.1 + 9.0.0-preview.24558.2 + 9.0.0-preview.24558.2 + 9.0.0-preview.24558.2 From 6b8044aa22071f7f5212c87c5baa495113a9502c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 02:25:39 +0000 Subject: [PATCH 350/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.7 -> To Version 4.13.0-2.24558.9 --- 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 0f987638a3c8..0723c1b7c512 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 - + https://github.com/dotnet/roslyn - a223dd07dcd7eafb4a24cf8359245d2de8ac14c6 + 6dace410d88d3c09aa84a98384e1ebb00f89be74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ae57b22d9e90..70c87fd62530 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 - 4.13.0-2.24558.7 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 + 4.13.0-2.24558.9 From 5ff56770f1d61dd25cd106cbd22e07628a8c1f9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 03:39:04 +0000 Subject: [PATCH 351/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.7 -> To Version 4.13.0-2.24558.10 --- 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 0723c1b7c512..eee19c41e06e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 - + https://github.com/dotnet/roslyn - 6dace410d88d3c09aa84a98384e1ebb00f89be74 + 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 70c87fd62530..2e24448b66ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 - 4.13.0-2.24558.9 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 + 4.13.0-2.24558.10 From 87ad9419658a666f836725c8ad87761f6ae3f040 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 04:07:51 +0000 Subject: [PATCH 352/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.11 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.7 -> To Version 4.13.0-2.24558.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eee19c41e06e..6a4a754cadbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d - + https://github.com/dotnet/roslyn - 51b22b5452dc48fc41b721ab9d87adf78c3ddff2 + 53bf365f3a7f31ff31b235bc946a07c343a4eb2d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2e24448b66ca..274a1123b520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 - 4.13.0-2.24558.10 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 + 4.13.0-2.24558.11 From bbfe872a9c5fa32fde1d6574b2dc5f4360c2af26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 11:01:23 +0000 Subject: [PATCH 353/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.12 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.7 -> To Version 4.13.0-2.24558.12 --- 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 6a4a754cadbc..03d6f8ac36d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://github.com/dotnet/roslyn - 53bf365f3a7f31ff31b235bc946a07c343a4eb2d + c0b2f366d0fb54cf49040a82f0d044bb959a9e73 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 274a1123b520..cc77100e1156 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,14 +221,14 @@ - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 - 4.13.0-2.24558.11 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 + 4.13.0-2.24558.12 From d53ed18260807daeb3b0929cae844dff0adcd3d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 13:15:30 +0000 Subject: [PATCH 354/702] Update dependencies from https://github.com/dotnet/roslyn build 20241108.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24557.3 -> To Version 4.12.0-3.24558.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9652eee305fd..56db54c2d27d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ f07a91420bec3f657153e16c9f047cf151c1179f - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - + https://github.com/dotnet/roslyn - b6341b01321e4dc9c4455bed5ea84edd729d6082 + 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5fb93c40b43c..6c697baa1603 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,14 +220,14 @@ - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 - 4.12.0-3.24557.3 + 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 From 014482bf56cb2cbf625aa1a8b3b44d01560a66cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Nov 2024 14:15:12 +0000 Subject: [PATCH 355/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241109.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.24557.2 -> To Version 9.0.0-beta.24559.1 --- 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 0f987638a3c8..2a6a61ddd581 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 diff --git a/eng/Versions.props b/eng/Versions.props index ae57b22d9e90..1364f4825d98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 + 9.0.0-beta.24559.1 + 9.0.0-beta.24559.1 + 9.0.0-beta.24559.1 + 9.0.0-beta.24559.1 + 9.0.0-beta.24559.1 + 9.0.0-beta.24559.1 From b60190cb8b631b28707bdb5b52e5aefe681d9bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Sat, 9 Nov 2024 16:29:00 -0800 Subject: [PATCH 356/702] Simplify file watching (#44603) --- .../dotnet-watch/DotNetWatcher.cs | 12 +- .../dotnet-watch/EnvironmentOptions.cs | 6 +- .../dotnet-watch/EnvironmentVariables.cs | 1 + .../dotnet-watch/Filters/BuildEvaluator.cs | 7 +- .../HotReload/DefaultDeltaApplier.cs | 5 + .../dotnet-watch/HotReloadDotNetWatcher.cs | 203 +++++++++++++++--- .../dotnet-watch/Internal/FileWatcher.cs | 62 +++--- ...tcher.cs => EventBasedDirectoryWatcher.cs} | 54 ++--- .../FileWatcher/FileWatcherFactory.cs | 8 +- ...eSystemWatcher.cs => IDirectoryWatcher.cs} | 4 +- ...eWatcher.cs => PollingDirectoryWatcher.cs} | 81 +++---- .../Internal/HotReloadFileSetWatcher.cs | 178 --------------- .../Internal/MsBuildFileSetFactory.cs | 2 +- .../Properties/launchSettings.json | 4 +- test/dotnet-watch.Tests/FileWatcherTests.cs | 4 +- .../HotReload/ApplyDeltaTests.cs | 21 +- .../HotReload/RuntimeProcessLauncherTests.cs | 56 +++-- .../Utilities/AwaitableProcess.cs | 96 ++++----- .../Utilities/TestOptions.cs | 20 +- .../Watch/DotNetWatcherTests.cs | 2 +- test/dotnet-watch.Tests/Watch/ProgramTests.cs | 15 +- .../Watch/Utilities/DotNetWatchTestBase.cs | 7 +- .../Watch/Utilities/WatchableApp.cs | 14 +- 23 files changed, 423 insertions(+), 439 deletions(-) rename src/BuiltInTools/dotnet-watch/Internal/FileWatcher/{DotnetFileWatcher.cs => EventBasedDirectoryWatcher.cs} (80%) rename src/BuiltInTools/dotnet-watch/Internal/FileWatcher/{IFileSystemWatcher.cs => IDirectoryWatcher.cs} (79%) rename src/BuiltInTools/dotnet-watch/Internal/FileWatcher/{PollingFileWatcher.cs => PollingDirectoryWatcher.cs} (79%) delete mode 100644 src/BuiltInTools/dotnet-watch/Internal/HotReloadFileSetWatcher.cs diff --git a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs index 9c4ab9f433c7..0e9715ac7a3c 100644 --- a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs @@ -80,7 +80,9 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke using var currentRunCancellationSource = new CancellationTokenSource(); using var combinedCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownCancellationToken, currentRunCancellationSource.Token); - using var fileSetWatcher = new FileWatcher(evaluationResult.Files, Context.Reporter); + using var fileSetWatcher = new FileWatcher(Context.Reporter); + + fileSetWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); var processTask = ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, launchResult: null, combinedCancellationSource.Token); @@ -89,7 +91,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke while (true) { - fileSetTask = fileSetWatcher.GetChangedFileAsync(startedWatching: null, combinedCancellationSource.Token); + fileSetTask = fileSetWatcher.WaitForFileChangeAsync(evaluationResult.Files, startedWatching: null, combinedCancellationSource.Token); finishedTask = await Task.WhenAny(processTask, fileSetTask, cancelledTaskSource.Task); if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result.HasValue) @@ -119,9 +121,11 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke { // Process exited. Redo evalulation buildEvaluator.RequiresRevaluation = true; + // Now wait for a file to change before restarting process - changedFile = await fileSetWatcher.GetChangedFileAsync( - () => Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting), + changedFile = await fileSetWatcher.WaitForFileChangeAsync( + evaluationResult.Files, + startedWatching: () => Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting), shutdownCancellationToken); } else diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs index a9488af4feea..22cbc3ae2e3d 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs @@ -34,7 +34,8 @@ internal sealed record EnvironmentOptions( bool SuppressLaunchBrowser = false, bool SuppressBrowserRefresh = false, bool SuppressEmojis = false, - TestFlags TestFlags = TestFlags.None) + TestFlags TestFlags = TestFlags.None, + string TestOutput = "") { public static EnvironmentOptions FromEnvironment() => new ( @@ -46,7 +47,8 @@ internal sealed record EnvironmentOptions( SuppressLaunchBrowser: EnvironmentVariables.SuppressLaunchBrowser, SuppressBrowserRefresh: EnvironmentVariables.SuppressBrowserRefresh, SuppressEmojis: EnvironmentVariables.SuppressEmojis, - TestFlags: EnvironmentVariables.TestFlags + TestFlags: EnvironmentVariables.TestFlags, + TestOutput: EnvironmentVariables.TestOutputDir ); public bool RunningAsTest { get => (TestFlags & TestFlags.RunningAsTest) != TestFlags.None; } diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs b/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs index f0ee60534903..021e96f763bf 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs @@ -36,6 +36,7 @@ public static partial class Names public static bool SuppressBrowserRefresh => ReadBool("DOTNET_WATCH_SUPPRESS_BROWSER_REFRESH"); public static TestFlags TestFlags => Environment.GetEnvironmentVariable("__DOTNET_WATCH_TEST_FLAGS") is { } value ? Enum.Parse(value) : TestFlags.None; + public static string TestOutputDir => Environment.GetEnvironmentVariable("__DOTNET_WATCH_TEST_OUTPUT_DIR") ?? ""; public static string? AutoReloadWSHostName => Environment.GetEnvironmentVariable("DOTNET_WATCH_AUTO_RELOAD_WS_HOSTNAME"); public static string? BrowserPath => Environment.GetEnvironmentVariable("DOTNET_WATCH_BROWSER_PATH"); diff --git a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs index 3ff411fe0145..24a1713fa14d 100644 --- a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs +++ b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs @@ -84,8 +84,11 @@ private async ValueTask CreateEvaluationResult(CancellationTok return result; } - context.Reporter.Warn("Fix the error to continue or press Ctrl+C to exit."); - await FileWatcher.WaitForFileChangeAsync(rootProjectFileSetFactory.RootProjectFile, context.Reporter, cancellationToken); + await FileWatcher.WaitForFileChangeAsync( + rootProjectFileSetFactory.RootProjectFile, + context.Reporter, + startedWatching: () => context.Reporter.Warn("Fix the error to continue or press Ctrl+C to exit."), + cancellationToken); } } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs index 80487deeb808..aa9ef087e158 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs @@ -41,6 +41,11 @@ async Task> ConnectAsync() Reporter.Verbose($"Capabilities: '{capabilities}'"); return capabilities.Split(' ').ToImmutableArray(); } + catch (EndOfStreamException) + { + // process terminated before capabilities sent: + return []; + } catch (Exception e) when (e is not OperationCanceledException) { // pipe might throw another exception when forcibly closed on process termination: diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 14d4fe3bf3af..06748f0f0aa7 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.DotNet.Watcher.Internal; using Microsoft.DotNet.Watcher.Tools; @@ -10,6 +11,8 @@ namespace Microsoft.DotNet.Watcher { internal sealed class HotReloadDotNetWatcher : Watcher { + private static readonly DateTime s_fileNotExistFileTime = DateTime.FromFileTime(0); + private readonly IConsole _console; private readonly IRuntimeProcessLauncherFactory? _runtimeProcessLauncherFactory; private readonly RestartPrompt? _rudeEditRestartPrompt; @@ -57,6 +60,8 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke Context.Reporter.Output(hotReloadEnabledMessage, emoji: "🔥"); } + using var fileWatcher = new FileWatcher(Context.Reporter); + for (var iteration = 0; !shutdownCancellationToken.IsCancellationRequested; iteration++) { Interlocked.Exchange(ref forceRestartCancellationSource, new CancellationTokenSource())?.Dispose(); @@ -68,12 +73,12 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke var iterationCancellationToken = iterationCancellationSource.Token; var waitForFileChangeBeforeRestarting = true; - HotReloadFileSetWatcher? fileSetWatcher = null; EvaluationResult? evaluationResult = null; RunningProject? rootRunningProject = null; - Task? fileSetWatcherTask = null; + Task>? fileWatcherTask = null; IRuntimeProcessLauncher? runtimeProcessLauncher = null; CompilationHandler? compilationHandler = null; + Action? fileChangedCallback = null; try { @@ -171,30 +176,56 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke return; } - fileSetWatcher = new HotReloadFileSetWatcher(evaluationResult.Files, buildCompletionTime, Context.Reporter, Context.EnvironmentOptions.TestFlags); + fileWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); + + var changedFilesAccumulator = ImmutableList.Empty; + + void FileChangedCallback(string path, ChangeKind kind) + { + if (TryGetChangedFile(evaluationResult.Files, buildCompletionTime, path, kind) is { } changedFile) + { + ImmutableInterlocked.Update(ref changedFilesAccumulator, changedFiles => changedFiles.Add(changedFile)); + } + else + { + Context.Reporter.Verbose($"Change ignored: {kind} '{path}'."); + } + } + + fileChangedCallback = FileChangedCallback; + fileWatcher.OnFileChange += fileChangedCallback; + ReportWatchingForChanges(); // Hot Reload loop - exits when the root process needs to be restarted. while (true) { - fileSetWatcherTask = fileSetWatcher.GetChangedFilesAsync(iterationCancellationToken); - - var finishedTask = await Task.WhenAny(rootRunningProject.RunningProcess, fileSetWatcherTask).WaitAsync(iterationCancellationToken); - if (finishedTask == rootRunningProject.RunningProcess) + try { - // Cancel the iteration, but wait for a file change before starting a new one. + // Use timeout to batch file changes. If the process doesn't exit within the given timespan we'll check + // for accumulated file changes. If there are any we attempt Hot Reload. Otherwise we come back here to wait again. + _ = await rootRunningProject.RunningProcess.WaitAsync(TimeSpan.FromMilliseconds(50), iterationCancellationToken); + + // Process exited: cancel the iteration, but wait for a file change before starting a new one + waitForFileChangeBeforeRestarting = true; iterationCancellationSource.Cancel(); break; } - - // File watcher returns null when canceled: - if (fileSetWatcherTask.Result is not { } changedFiles) + catch (TimeoutException) + { + // check for changed files + } + catch (OperationCanceledException) { Debug.Assert(iterationCancellationToken.IsCancellationRequested); waitForFileChangeBeforeRestarting = false; break; } - ReportFileChanges(changedFiles); + var changedFiles = Interlocked.Exchange(ref changedFilesAccumulator, []); + if (changedFiles is []) + { + continue; + } // When a new file is added we need to run design-time build to find out // what kind of the file it is and which project(s) does it belong to (can be linked, web asset, etc.). @@ -205,6 +236,9 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke evaluationResult = await EvaluateRootProjectAsync(iterationCancellationToken); + // additional directories may have been added: + fileWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); + await compilationHandler.Workspace.UpdateProjectConeAsync(RootFileSetFactory.RootProjectFile, iterationCancellationToken); if (shutdownCancellationToken.IsCancellationRequested) @@ -214,20 +248,15 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke } // update files in the change set with new evaluation info: - for (int i = 0; i < changedFiles.Length; i++) - { - if (evaluationResult.Files.TryGetValue(changedFiles[i].Item.FilePath, out var evaluatedFile)) - { - changedFiles[i] = changedFiles[i] with { Item = evaluatedFile }; - } - } + changedFiles = changedFiles.Select(f => evaluationResult.Files.TryGetValue(f.Item.FilePath, out var evaluatedFile) ? f with { Item = evaluatedFile } : f) + .ToImmutableList(); ReportFileChanges(changedFiles); - - fileSetWatcher = new HotReloadFileSetWatcher(evaluationResult.Files, buildCompletionTime, Context.Reporter, Context.EnvironmentOptions.TestFlags); } else { + ReportFileChanges(changedFiles); + // update the workspace to reflect changes in the file content: await compilationHandler.Workspace.UpdateFileContentAsync(changedFiles, iterationCancellationToken); } @@ -313,7 +342,8 @@ await Task.WhenAll( .WaitAsync(shutdownCancellationToken); // Update build completion time, so that file changes caused by the rebuild do not affect our file watcher: - fileSetWatcher.UpdateBuildCompletionTime(DateTime.UtcNow); + buildCompletionTime = DateTime.UtcNow; + changedFilesAccumulator = []; // Restart session to capture new baseline that reflects the changes to the restarted projects. await compilationHandler.RestartSessionAsync(projectsToBeRebuilt, iterationCancellationToken); @@ -326,6 +356,12 @@ await Task.WhenAll( } finally { + // stop watching file changes: + if (fileChangedCallback != null) + { + fileWatcher.OnFileChange -= fileChangedCallback; + } + if (runtimeProcessLauncher != null) { // Request cleanup of all processes created by the launcher before we terminate the root process. @@ -347,7 +383,7 @@ await Task.WhenAll( try { // Wait for the root process to exit. - await Task.WhenAll(new[] { (Task?)rootRunningProject?.RunningProcess, fileSetWatcherTask }.Where(t => t != null)!); + await Task.WhenAll(new[] { (Task?)rootRunningProject?.RunningProcess, fileWatcherTask }.Where(t => t != null)!); } catch (OperationCanceledException) when (!shutdownCancellationToken.IsCancellationRequested) { @@ -355,7 +391,7 @@ await Task.WhenAll( } finally { - fileSetWatcherTask = null; + fileWatcherTask = null; if (runtimeProcessLauncher != null) { @@ -364,22 +400,120 @@ await Task.WhenAll( rootRunningProject?.Dispose(); - if (evaluationResult != null && - waitForFileChangeBeforeRestarting && + if (waitForFileChangeBeforeRestarting && !shutdownCancellationToken.IsCancellationRequested && !forceRestartCancellationSource.IsCancellationRequested) { - fileSetWatcher ??= new HotReloadFileSetWatcher(evaluationResult.Files, DateTime.MinValue, Context.Reporter, Context.EnvironmentOptions.TestFlags); - Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting); - using var shutdownOrForcedRestartSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownCancellationToken, forceRestartCancellationSource.Token); - await fileSetWatcher.GetChangedFilesAsync(shutdownOrForcedRestartSource.Token, forceWaitForNewUpdate: true); + await WaitForFileChangeBeforeRestarting(fileWatcher, evaluationResult, shutdownOrForcedRestartSource.Token); } + } + } + } + } + + private async ValueTask WaitForFileChangeBeforeRestarting(FileWatcher fileWatcher, EvaluationResult? evaluationResult, CancellationToken cancellationToken) + { + if (evaluationResult != null) + { + if (!fileWatcher.WatchingDirectories) + { + fileWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); + } + + _ = await fileWatcher.WaitForFileChangeAsync( + evaluationResult.Files, + startedWatching: () => Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting), + cancellationToken); + } + else + { + // evaluation cancelled - watch for any changes in the directory containing the root project: + fileWatcher.WatchContainingDirectories([RootFileSetFactory.RootProjectFile]); + + _ = await fileWatcher.WaitForFileChangeAsync( + (path, change) => new ChangedFile(new FileItem() { FilePath = path }, change), + startedWatching: () => Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting), + cancellationToken); + } + } - fileSetWatcher?.Dispose(); + private ChangedFile? TryGetChangedFile(IReadOnlyDictionary fileSet, DateTime buildCompletionTime, string path, ChangeKind kind) + { + // only handle file changes: + if (Directory.Exists(path)) + { + return null; + } + + if (kind != ChangeKind.Delete) + { + try + { + // Do not report changes to files that happened during build: + var creationTime = File.GetCreationTimeUtc(path); + var writeTime = File.GetLastWriteTimeUtc(path); + + if (creationTime == s_fileNotExistFileTime || writeTime == s_fileNotExistFileTime) + { + // file might have been deleted since we received the event + kind = ChangeKind.Delete; + } + else if (creationTime.Ticks < buildCompletionTime.Ticks && writeTime.Ticks < buildCompletionTime.Ticks) + { + Context.Reporter.Verbose( + $"Ignoring file change during build: {kind} '{path}' " + + $"(created {FormatTimestamp(creationTime)} and written {FormatTimestamp(writeTime)} before {FormatTimestamp(buildCompletionTime)})."); + + return null; } + else if (writeTime > creationTime) + { + Context.Reporter.Verbose($"File change: {kind} '{path}' (written {FormatTimestamp(writeTime)} after {FormatTimestamp(buildCompletionTime)})."); + } + else + { + Context.Reporter.Verbose($"File change: {kind} '{path}' (created {FormatTimestamp(creationTime)} after {FormatTimestamp(buildCompletionTime)})."); + } + } + catch (Exception e) + { + Context.Reporter.Verbose($"Ignoring file '{path}' due to access error: {e.Message}."); + return null; } } + + if (kind == ChangeKind.Delete) + { + Context.Reporter.Verbose($"File '{path}' deleted after {FormatTimestamp(buildCompletionTime)}."); + } + + if (fileSet.TryGetValue(path, out var fileItem)) + { + // For some reason we are sometimes seeing Add events raised whan an existing file is updated: + return new ChangedFile(fileItem, (kind == ChangeKind.Add) ? ChangeKind.Update : kind); + } + + if (kind == ChangeKind.Add) + { + return new ChangedFile(new FileItem { FilePath = path }, kind); + } + + return null; + } + + internal static string FormatTimestamp(DateTime time) + => time.ToString("HH:mm:ss.fffffff"); + + private void ReportWatchingForChanges() + { + var waitingForChanges = MessageDescriptor.WaitingForChanges; + if (Context.EnvironmentOptions.TestFlags.HasFlag(TestFlags.ElevateWaitingForChangesMessageSeverity)) + { + waitingForChanges = waitingForChanges with { Severity = MessageSeverity.Output }; + } + + Context.Reporter.Report(waitingForChanges); } private void ReportFileChanges(IReadOnlyList changedFiles) @@ -434,8 +568,11 @@ private async ValueTask EvaluateRootProjectAsync(CancellationT return result; } - Context.Reporter.Report(MessageDescriptor.FixBuildError); - await FileWatcher.WaitForFileChangeAsync(RootFileSetFactory.RootProjectFile, Context.Reporter, cancellationToken); + await FileWatcher.WaitForFileChangeAsync( + RootFileSetFactory.RootProjectFile, + Context.Reporter, + startedWatching: () => Context.Reporter.Report(MessageDescriptor.FixBuildError), + cancellationToken); } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs index 3a339bf63fb1..3b9f61208eff 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs @@ -5,9 +5,10 @@ namespace Microsoft.DotNet.Watcher.Internal { - internal sealed class FileWatcher(IReadOnlyDictionary fileSet, IReporter reporter) : IDisposable + internal sealed class FileWatcher(IReporter reporter) : IDisposable { - private readonly Dictionary _watchers = []; + // Directory watcher for each watched directory + private readonly Dictionary _watchers = []; private bool _disposed; public event Action? OnFileChange; @@ -29,13 +30,19 @@ public void Dispose() } } - public void StartWatching() + public bool WatchingDirectories + => _watchers.Count > 0; + + public void WatchContainingDirectories(IEnumerable filePaths) + => WatchDirectories(filePaths.Select(path => Path.GetDirectoryName(path)!)); + + public void WatchDirectories(IEnumerable directories) { - EnsureNotDisposed(); + ObjectDisposedException.ThrowIf(_disposed, this); - foreach (var (filePath, _) in fileSet) + foreach (var dir in directories) { - var directory = EnsureTrailingSlash(Path.GetDirectoryName(filePath)!); + var directory = EnsureTrailingSlash(dir); var alreadyWatched = _watchers .Where(d => directory.StartsWith(d.Key)) @@ -67,9 +74,9 @@ public void StartWatching() private void WatcherErrorHandler(object? sender, Exception error) { - if (sender is IFileSystemWatcher watcher) + if (sender is IDirectoryWatcher watcher) { - reporter.Warn($"The file watcher observing '{watcher.BasePath}' encountered an error: {error.Message}"); + reporter.Warn($"The file watcher observing '{watcher.WatchedDirectory}' encountered an error: {error.Message}"); } } @@ -90,29 +97,25 @@ private void DisposeWatcher(string directory) watcher.Dispose(); } - private void EnsureNotDisposed() - { - if (_disposed) - { - throw new ObjectDisposedException(nameof(FileWatcher)); - } - } - private static string EnsureTrailingSlash(string path) => (path is [.., var last] && last != Path.DirectorySeparatorChar) ? path + Path.DirectorySeparatorChar : path; - public async Task GetChangedFileAsync(Action? startedWatching, CancellationToken cancellationToken) - { - StartWatching(); + public Task WaitForFileChangeAsync(IReadOnlyDictionary fileSet, Action? startedWatching, CancellationToken cancellationToken) + => WaitForFileChangeAsync( + changeFilter: (path, kind) => fileSet.TryGetValue(path, out var fileItem) ? new ChangedFile(fileItem, kind) : null, + startedWatching, + cancellationToken); + public async Task WaitForFileChangeAsync(Func changeFilter, Action? startedWatching, CancellationToken cancellationToken) + { var fileChangedSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); cancellationToken.Register(() => fileChangedSource.TrySetResult(null)); void FileChangedCallback(string path, ChangeKind kind) { - if (fileSet.TryGetValue(path, out var fileItem)) + if (changeFilter(path, kind) is { } changedFile) { - fileChangedSource.TrySetResult(new ChangedFile(fileItem, kind)); + fileChangedSource.TrySetResult(changedFile); } } @@ -132,14 +135,21 @@ void FileChangedCallback(string path, ChangeKind kind) return changedFile; } - public static async ValueTask WaitForFileChangeAsync(string path, IReporter reporter, CancellationToken cancellationToken) + public static async ValueTask WaitForFileChangeAsync(string filePath, IReporter reporter, Action? startedWatching, CancellationToken cancellationToken) { - var fileSet = new Dictionary() { { path, new FileItem { FilePath = path } } }; + using var watcher = new FileWatcher(reporter); - using var watcher = new FileWatcher(fileSet, reporter); - await watcher.GetChangedFileAsync(startedWatching: null, cancellationToken); + watcher.WatchDirectories([Path.GetDirectoryName(filePath)!]); - reporter.Output($"File changed: {path}"); + var fileChange = await watcher.WaitForFileChangeAsync( + changeFilter: (path, kind) => path == filePath ? new ChangedFile(new FileItem { FilePath = path }, kind) : null, + startedWatching, + cancellationToken); + + if (fileChange != null) + { + reporter.Output($"File changed: {filePath}"); + } } } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs similarity index 80% rename from src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs rename to src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs index 7040fe1a0763..9c94c7b49b81 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs @@ -6,44 +6,32 @@ namespace Microsoft.DotNet.Watcher.Internal { - internal class DotnetFileWatcher : IFileSystemWatcher + internal sealed class EventBasedDirectoryWatcher : IDirectoryWatcher { - internal Action? Logger { get; set; } + public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; - private volatile bool _disposed; + public event EventHandler? OnError; + + public string WatchedDirectory { get; } - private readonly Func _watcherFactory; + internal Action? Logger { get; set; } + + private volatile bool _disposed; private FileSystemWatcher? _fileSystemWatcher; private readonly object _createLock = new(); - public DotnetFileWatcher(string watchedDirectory) - : this(watchedDirectory, DefaultWatcherFactory) + internal EventBasedDirectoryWatcher(string watchedDirectory) { - } - - internal DotnetFileWatcher(string watchedDirectory, Func fileSystemWatcherFactory) - { - Ensure.NotNull(fileSystemWatcherFactory, nameof(fileSystemWatcherFactory)); - Ensure.NotNullOrEmpty(watchedDirectory, nameof(watchedDirectory)); - - BasePath = watchedDirectory; - _watcherFactory = fileSystemWatcherFactory; + WatchedDirectory = watchedDirectory; CreateFileSystemWatcher(); } - public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; - - public event EventHandler? OnError; - - public string BasePath { get; } - - private static FileSystemWatcher DefaultWatcherFactory(string watchedDirectory) + public void Dispose() { - Ensure.NotNullOrEmpty(watchedDirectory, nameof(watchedDirectory)); - - return new FileSystemWatcher(watchedDirectory); + _disposed = true; + DisposeInnerWatcher(); } private void WatcherErrorHandler(object sender, ErrorEventArgs e) @@ -62,7 +50,7 @@ private void WatcherErrorHandler(object sender, ErrorEventArgs e) // Win32Exception may be triggered when setting EnableRaisingEvents on a file system type // that is not supported, such as a network share. Don't attempt to recreate the watcher // in this case as it will cause a StackOverflowException - if (!(exception is Win32Exception)) + if (exception is not Win32Exception) { // Recreate the watcher if it is a recoverable error. CreateFileSystemWatcher(); @@ -147,8 +135,10 @@ private void CreateFileSystemWatcher() DisposeInnerWatcher(); } - _fileSystemWatcher = _watcherFactory(BasePath); - _fileSystemWatcher.IncludeSubdirectories = true; + _fileSystemWatcher = new FileSystemWatcher(WatchedDirectory) + { + IncludeSubdirectories = true + }; _fileSystemWatcher.Created += WatcherAddedHandler; _fileSystemWatcher.Deleted += WatcherDeletedHandler; @@ -162,7 +152,7 @@ private void CreateFileSystemWatcher() private void DisposeInnerWatcher() { - if ( _fileSystemWatcher != null ) + if (_fileSystemWatcher != null) { _fileSystemWatcher.EnableRaisingEvents = false; @@ -181,11 +171,5 @@ public bool EnableRaisingEvents get => _fileSystemWatcher!.EnableRaisingEvents; set => _fileSystemWatcher!.EnableRaisingEvents = value; } - - public void Dispose() - { - _disposed = true; - DisposeInnerWatcher(); - } } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs index b05242d80ecd..c5431d1f100d 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs @@ -5,14 +5,14 @@ namespace Microsoft.DotNet.Watcher.Internal { internal static class FileWatcherFactory { - public static IFileSystemWatcher CreateWatcher(string watchedDirectory) + public static IDirectoryWatcher CreateWatcher(string watchedDirectory) => CreateWatcher(watchedDirectory, EnvironmentVariables.IsPollingEnabled); - public static IFileSystemWatcher CreateWatcher(string watchedDirectory, bool usePollingWatcher) + public static IDirectoryWatcher CreateWatcher(string watchedDirectory, bool usePollingWatcher) { return usePollingWatcher ? - new PollingFileWatcher(watchedDirectory) : - new DotnetFileWatcher(watchedDirectory); + new PollingDirectoryWatcher(watchedDirectory) : + new EventBasedDirectoryWatcher(watchedDirectory); } } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs similarity index 79% rename from src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs rename to src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs index ebdef49913ff..4cd187cb6fe0 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs @@ -3,13 +3,13 @@ namespace Microsoft.DotNet.Watcher.Internal { - internal interface IFileSystemWatcher : IDisposable + internal interface IDirectoryWatcher : IDisposable { event EventHandler<(string filePath, ChangeKind kind)> OnFileChange; event EventHandler OnError; - string BasePath { get; } + string WatchedDirectory { get; } bool EnableRaisingEvents { get; set; } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs similarity index 79% rename from src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs rename to src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs index 2df2004ee84b..df49f214adce 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs @@ -6,33 +6,41 @@ namespace Microsoft.DotNet.Watcher.Internal { - internal class PollingFileWatcher : IFileSystemWatcher + internal sealed class PollingDirectoryWatcher : IDirectoryWatcher { // The minimum interval to rerun the scan private static readonly TimeSpan _minRunInternal = TimeSpan.FromSeconds(.5); private readonly DirectoryInfo _watchedDirectory; - private Dictionary _knownEntities = new(); - private Dictionary _tempDictionary = new(); - private Dictionary _changes = new(); + private Dictionary _knownEntities = []; + private Dictionary _tempDictionary = []; + private readonly Dictionary _changes = []; private Thread _pollingThread; private bool _raiseEvents; - private bool _disposed; + private volatile bool _disposed; - public PollingFileWatcher(string watchedDirectory) + public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; + +#pragma warning disable CS0067 // not used + public event EventHandler? OnError; +#pragma warning restore + + public string WatchedDirectory { get; } + + public PollingDirectoryWatcher(string watchedDirectory) { Ensure.NotNullOrEmpty(watchedDirectory, nameof(watchedDirectory)); _watchedDirectory = new DirectoryInfo(watchedDirectory); - BasePath = _watchedDirectory.FullName; + WatchedDirectory = _watchedDirectory.FullName; _pollingThread = new Thread(new ThreadStart(PollingLoop)) { IsBackground = true, - Name = nameof(PollingFileWatcher) + Name = nameof(PollingDirectoryWatcher) }; CreateKnownFilesSnapshot(); @@ -40,20 +48,18 @@ public PollingFileWatcher(string watchedDirectory) _pollingThread.Start(); } - public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; - -#pragma warning disable CS0067 // not used - public event EventHandler? OnError; -#pragma warning restore - - public string BasePath { get; } + public void Dispose() + { + EnableRaisingEvents = false; + _disposed = true; + } public bool EnableRaisingEvents { get => _raiseEvents; set { - EnsureNotDisposed(); + ObjectDisposedException.ThrowIf(_disposed, this); _raiseEvents = value; } } @@ -90,9 +96,9 @@ private void CreateKnownFilesSnapshot() { _knownEntities.Clear(); - ForeachEntityInDirectory(_watchedDirectory, f => + ForeachEntityInDirectory(_watchedDirectory, fileInfo => { - _knownEntities.Add(f.FullName, new FileMeta(f)); + _knownEntities.Add(fileInfo.FullName, new FileMeta(fileInfo, foundAgain: false)); }); } @@ -100,14 +106,14 @@ private void CheckForChangedFiles() { _changes.Clear(); - ForeachEntityInDirectory(_watchedDirectory, f => + ForeachEntityInDirectory(_watchedDirectory, fileInfo => { - var fullFilePath = f.FullName; + var fullFilePath = fileInfo.FullName; if (!_knownEntities.ContainsKey(fullFilePath)) { // New file or directory - RecordChange(f, ChangeKind.Add); + RecordChange(fileInfo, ChangeKind.Add); } else { @@ -116,10 +122,10 @@ private void CheckForChangedFiles() try { if (!fileMeta.FileInfo.Attributes.HasFlag(FileAttributes.Directory) && - fileMeta.FileInfo.LastWriteTime != f.LastWriteTime) + fileMeta.FileInfo.LastWriteTime != fileInfo.LastWriteTime) { // File changed - RecordChange(f, ChangeKind.Update); + RecordChange(fileInfo, ChangeKind.Update); } _knownEntities[fullFilePath] = new FileMeta(fileMeta.FileInfo, foundAgain: true); @@ -130,7 +136,7 @@ private void CheckForChangedFiles() } } - _tempDictionary.Add(f.FullName, new FileMeta(f)); + _tempDictionary.Add(fileInfo.FullName, new FileMeta(fileInfo, foundAgain: false)); }); foreach (var file in _knownEntities) @@ -211,31 +217,10 @@ private void NotifyChanges() } } - private void EnsureNotDisposed() - { - if (_disposed) - { - throw new ObjectDisposedException(nameof(PollingFileWatcher)); - } - } - - public void Dispose() - { - EnableRaisingEvents = false; - _disposed = true; - } - - private struct FileMeta + private readonly struct FileMeta(FileSystemInfo fileInfo, bool foundAgain) { - public FileMeta(FileSystemInfo fileInfo, bool foundAgain = false) - { - FileInfo = fileInfo; - FoundAgain = foundAgain; - } - - public FileSystemInfo FileInfo; - - public bool FoundAgain; + public readonly FileSystemInfo FileInfo = fileInfo; + public readonly bool FoundAgain = foundAgain; } } } diff --git a/src/BuiltInTools/dotnet-watch/Internal/HotReloadFileSetWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/HotReloadFileSetWatcher.cs deleted file mode 100644 index 255f7c1474f1..000000000000 --- a/src/BuiltInTools/dotnet-watch/Internal/HotReloadFileSetWatcher.cs +++ /dev/null @@ -1,178 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - - -using System.Collections.Concurrent; -using System.Diagnostics; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Internal -{ - internal sealed class HotReloadFileSetWatcher(IReadOnlyDictionary fileSet, DateTime buildCompletionTime, IReporter reporter, TestFlags testFlags) : IDisposable - { - private static readonly TimeSpan s_debounceInterval = TimeSpan.FromMilliseconds(50); - private static readonly DateTime s_fileNotExistFileTime = DateTime.FromFileTime(0); - - private readonly FileWatcher _fileWatcher = new(fileSet, reporter); - private readonly object _changedFilesLock = new(); - private readonly ConcurrentDictionary _changedFiles = new(StringComparer.Ordinal); - - private TaskCompletionSource? _tcs; - private bool _initialized; - private bool _disposed; - - public void Dispose() - { - _disposed = true; - _fileWatcher.Dispose(); - } - - public void UpdateBuildCompletionTime(DateTime value) - { - lock (_changedFilesLock) - { - buildCompletionTime = value; - _changedFiles.Clear(); - } - } - - private void EnsureInitialized() - { - if (_initialized) - { - return; - } - - _initialized = true; - - _fileWatcher.StartWatching(); - _fileWatcher.OnFileChange += FileChangedCallback; - - var waitingForChanges = MessageDescriptor.WaitingForChanges; - if (testFlags.HasFlag(TestFlags.ElevateWaitingForChangesMessageSeverity)) - { - waitingForChanges = waitingForChanges with { Severity = MessageSeverity.Output }; - } - - reporter.Report(waitingForChanges); - - Task.Factory.StartNew(async () => - { - // Debounce / polling loop - while (!_disposed) - { - await Task.Delay(s_debounceInterval); - if (_changedFiles.IsEmpty) - { - continue; - } - - var tcs = Interlocked.Exchange(ref _tcs, null!); - if (tcs is null) - { - continue; - } - - ChangedFile[] changedFiles; - lock (_changedFilesLock) - { - changedFiles = _changedFiles.Values.ToArray(); - _changedFiles.Clear(); - } - - if (changedFiles is []) - { - continue; - } - - tcs.TrySetResult(changedFiles); - } - - }, default, TaskCreationOptions.LongRunning, TaskScheduler.Default); - - void FileChangedCallback(string path, ChangeKind kind) - { - // only handle file changes: - if (Directory.Exists(path)) - { - return; - } - - if (kind != ChangeKind.Delete) - { - try - { - // Do not report changes to files that happened during build: - var creationTime = File.GetCreationTimeUtc(path); - var writeTime = File.GetLastWriteTimeUtc(path); - - if (creationTime == s_fileNotExistFileTime || writeTime == s_fileNotExistFileTime) - { - // file might have been deleted since we received the event - kind = ChangeKind.Delete; - } - else if (creationTime.Ticks < buildCompletionTime.Ticks && writeTime.Ticks < buildCompletionTime.Ticks) - { - reporter.Verbose( - $"Ignoring file change during build: {kind} '{path}' " + - $"(created {FormatTimestamp(creationTime)} and written {FormatTimestamp(writeTime)} before {FormatTimestamp(buildCompletionTime)})."); - - return; - } - else if (writeTime > creationTime) - { - reporter.Verbose($"File change: {kind} '{path}' (written {FormatTimestamp(writeTime)} after {FormatTimestamp(buildCompletionTime)})."); - } - else - { - reporter.Verbose($"File change: {kind} '{path}' (created {FormatTimestamp(creationTime)} after {FormatTimestamp(buildCompletionTime)})."); - } - } - catch (Exception e) - { - reporter.Verbose($"Ignoring file '{path}' due to access error: {e.Message}."); - return; - } - } - - if (kind == ChangeKind.Delete) - { - reporter.Verbose($"File '{path}' deleted after {FormatTimestamp(buildCompletionTime)}."); - } - - if (kind == ChangeKind.Add) - { - lock (_changedFilesLock) - { - _changedFiles.TryAdd(path, new ChangedFile(new FileItem { FilePath = path }, kind)); - } - } - else if (fileSet.TryGetValue(path, out var fileItem)) - { - lock (_changedFilesLock) - { - _changedFiles.TryAdd(path, new ChangedFile(fileItem, kind)); - } - } - } - } - - public Task GetChangedFilesAsync(CancellationToken cancellationToken, bool forceWaitForNewUpdate = false) - { - EnsureInitialized(); - - var tcs = _tcs; - if (!forceWaitForNewUpdate && tcs is not null) - { - return tcs.Task; - } - - _tcs = tcs = new(TaskCreationOptions.RunContinuationsAsynchronously); - cancellationToken.Register(() => tcs.TrySetResult(null)); - return tcs.Task; - } - - internal static string FormatTimestamp(DateTime time) - => time.ToString("HH:mm:ss.fffffff"); - } -} diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs index 52e82d3a73ce..5cfb0baf08e6 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs @@ -166,7 +166,7 @@ private IReadOnlyList GetMSBuildArguments(string watchListFilePath) if (environmentOptions.TestFlags.HasFlag(TestFlags.RunningAsTest)) #endif { - arguments.Add("/bl:DotnetWatch.GenerateWatchList.binlog"); + arguments.Add($"/bl:{Path.Combine(environmentOptions.TestOutput, "DotnetWatch.GenerateWatchList.binlog")}"); } arguments.AddRange(buildArguments); diff --git a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json b/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json index dafd8c0ab7ef..7dc0c6bb6771 100644 --- a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json +++ b/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json @@ -2,8 +2,8 @@ "profiles": { "dotnet-watch": { "commandName": "Project", - "commandLineArgs": "--verbose /bl:DotnetRun.binlog", - "workingDirectory": "$(RepoRoot)src\\Assets\\TestProjects\\BlazorWasmWithLibrary\\blazorwasm", + "commandLineArgs": "--list", + "workingDirectory": "C:\\sdk\\artifacts\\tmp\\Debug\\BlazorWasm_Ap---8DA5F107", "environmentVariables": { "DOTNET_WATCH_DEBUG_SDK_DIRECTORY": "$(RepoRoot)artifacts\\bin\\redist\\$(Configuration)\\dotnet\\sdk\\$(Version)" } diff --git a/test/dotnet-watch.Tests/FileWatcherTests.cs b/test/dotnet-watch.Tests/FileWatcherTests.cs index eeadd08ceefd..3614f25413e4 100644 --- a/test/dotnet-watch.Tests/FileWatcherTests.cs +++ b/test/dotnet-watch.Tests/FileWatcherTests.cs @@ -19,7 +19,7 @@ private async Task TestOperation( Action operation) { using var watcher = FileWatcherFactory.CreateWatcher(dir, usePolling); - if (watcher is DotnetFileWatcher dotnetWatcher) + if (watcher is EventBasedDirectoryWatcher dotnetWatcher) { dotnetWatcher.Logger = m => output.WriteLine(m); } @@ -291,7 +291,7 @@ public async Task MultipleTriggers(bool usePolling) watcher.EnableRaisingEvents = false; } - private async Task AssertFileChangeRaisesEvent(string directory, IFileSystemWatcher watcher) + private async Task AssertFileChangeRaisesEvent(string directory, IDirectoryWatcher watcher) { var changedEv = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var expectedPath = Path.Combine(directory, Path.GetRandomFileName()); diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 8c46f7e490c2..86dafb654e92 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -128,9 +128,8 @@ class AppUpdateHandler await App.AssertOutputLineStartsWith("Updated"); - AssertEx.Contains( - "dotnet watch ⚠ [WatchHotReloadApp (net9.0)] Expected to find a static method 'ClearCache' or 'UpdateApplication' on type 'AppUpdateHandler, WatchHotReloadApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' but neither exists.", - App.Process.Output); + await App.WaitUntilOutputContains( + "dotnet watch ⚠ [WatchHotReloadApp (net9.0)] Expected to find a static method 'ClearCache' or 'UpdateApplication' on type 'AppUpdateHandler, WatchHotReloadApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' but neither exists."); } [Theory] @@ -169,18 +168,16 @@ class AppUpdateHandler await App.AssertOutputLineStartsWith("Updated"); - AssertEx.Contains( - "dotnet watch ⚠ [WatchHotReloadApp (net9.0)] Exception from 'System.Action`1[System.Type[]]': System.InvalidOperationException: Bug!", - App.Process.Output); + await App.WaitUntilOutputContains("dotnet watch ⚠ [WatchHotReloadApp (net9.0)] Exception from 'System.Action`1[System.Type[]]': System.InvalidOperationException: Bug!"); if (verbose) { - AssertEx.Contains("dotnet watch 🕵️ [WatchHotReloadApp (net9.0)] Deltas applied.", App.Process.Output); + App.AssertOutputContains("dotnet watch 🕵️ [WatchHotReloadApp (net9.0)] Deltas applied."); } else { // shouldn't see any agent messages: - AssertEx.DoesNotContain("🕵️", App.Process.Output); + App.AssertOutputDoesNotContain("🕵️"); } } @@ -190,13 +187,14 @@ public async Task BlazorWasm() var testAsset = TestAssets.CopyTestAsset("WatchBlazorWasm") .WithSource(); - App.Start(testAsset, [], testFlags: TestFlags.MockBrowser); + var port = TestOptions.GetTestPort(); + App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser); await App.AssertWaitingForChanges(); App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); - App.AssertOutputContains("dotnet watch ⌚ Launching browser: http://localhost:5000/"); + App.AssertOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}/"); // shouldn't see any agent messages (agent is not loaded into blazor-devserver): AssertEx.DoesNotContain("🕵️", App.Process.Output); @@ -225,7 +223,8 @@ public async Task BlazorWasm_MSBuildWarning() """)); }); - App.Start(testAsset, [], testFlags: TestFlags.MockBrowser); + var port = TestOptions.GetTestPort(); + App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser); await App.AssertOutputLineStartsWith("dotnet watch ⚠ msbuild: [Warning] Duplicate source file"); await App.AssertWaitingForChanges(); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index 9c5cc5f1fb0c..85932e21c212 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -17,6 +17,9 @@ public enum TriggerEvent WaitingForChanges, } + private TestAsset CopyTestAsset(string assetName, params object[] testParameters) + => TestAssets.CopyTestAsset("WatchAppMultiProc", identifier: string.Join(";", testParameters)).WithSource(); + private static async Task Launch(string projectPath, TestRuntimeProcessLauncher service, string workingDirectory, CancellationToken cancellationToken) { var projectOptions = new ProjectOptions() @@ -58,8 +61,7 @@ private static async Task Launch(string projectPath, TestRuntime [CombinatorialData] public async Task UpdateAndRudeEdit(TriggerEvent trigger) { - var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc", identifier: trigger.ToString()) - .WithSource(); + var testAsset = CopyTestAsset("WatchAppMultiProc", trigger); var workingDirectory = testAsset.Path; var hostDir = Path.Combine(testAsset.Path, "Host"); @@ -80,7 +82,7 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose", "--non-interactive", "--project", hostProject]), console, - TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath), + TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset), reporter, out var errorCode); @@ -137,20 +139,29 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) await launchCompletionB.Task; // let the host process start: + Log("Waiting for changes..."); await waitingForChanges.WaitAsync(); + + Log("Waiting for session started..."); await sessionStarted.WaitAsync(); await MakeRudeEditChange(); + + Log("Waiting for changed handled ..."); await changeHandled.WaitAsync(); // Wait for a new session to start, so that we capture the new solution snapshot // and further changes are treated as another update. + Log("Waiting for session started..."); await sessionStarted.WaitAsync(); await MakeValidDependencyChange(); + + Log("Waiting for changed handled ..."); await changeHandled.WaitAsync(); // clean up: + Log("Shutting down"); watchCancellationSource.Cancel(); try { @@ -207,7 +218,10 @@ public static void Common() } """); + Log("Waiting for updated output from project A ..."); await hasUpdateSourceA.Task; + + Log("Waiting for updated output from project B ..."); await hasUpdateSourceB.Task; Assert.True(hasUpdateSourceA.Task.IsCompletedSuccessfully); @@ -233,6 +247,7 @@ async Task MakeRudeEditChange() [assembly: System.Reflection.AssemblyMetadata("TestAssemblyMetadata", "2")] """); + Log("Waiting for updated output from project A ..."); await hasUpdateSource.Task; Assert.True(hasUpdateSource.Task.IsCompletedSuccessfully); @@ -245,8 +260,7 @@ async Task MakeRudeEditChange() [CombinatorialData] public async Task UpdateAppliedToNewProcesses(bool sharedOutput) { - var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc", identifier: sharedOutput.ToString()) - .WithSource(); + var testAsset = CopyTestAsset("WatchAppMultiProc", sharedOutput); if (sharedOutput) { @@ -270,7 +284,7 @@ public async Task UpdateAppliedToNewProcesses(bool sharedOutput) var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose", "--non-interactive", "--project", hostProject]), console, - TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath), + TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset), reporter, out var errorCode); @@ -313,9 +327,8 @@ public async Task UpdateAppliedToNewProcesses(bool sharedOutput) } }; - await Task.Delay(TimeSpan.FromSeconds(1)); - // let the host process start: + Log("Waiting for changes..."); await waitingForChanges.WaitAsync(); // service should have been created before Hot Reload session started: @@ -336,19 +349,27 @@ public static void Common() } """); + Log("Waiting for updated output from A ..."); await hasUpdateA.WaitAsync(); // Host and ServiceA received updates: + Log("Waiting for updates applied 1/2 ..."); await updatesApplied.WaitAsync(); + + Log("Waiting for updates applied 2/2 ..."); await updatesApplied.WaitAsync(); await Launch(serviceProjectB, service, workingDirectory, watchCancellationSource.Token); // ServiceB received updates: + Log("Waiting for updates applied ..."); await updatesApplied.WaitAsync(); + + Log("Waiting for updated output from B ..."); await hasUpdateB.WaitAsync(); // clean up: + Log("Shutting down"); watchCancellationSource.Cancel(); try { @@ -370,8 +391,7 @@ public enum UpdateLocation [CombinatorialData] public async Task HostRestart(UpdateLocation updateLocation) { - var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc", identifier: updateLocation.ToString()) - .WithSource(); + var testAsset = CopyTestAsset("WatchAppMultiProc", updateLocation); var workingDirectory = testAsset.Path; var hostDir = Path.Combine(testAsset.Path, "Host"); @@ -386,7 +406,7 @@ public async Task HostRestart(UpdateLocation updateLocation) var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose", "--project", hostProject]), console, - TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath), + TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset), reporter, out var errorCode); @@ -428,6 +448,7 @@ public async Task HostRestart(UpdateLocation updateLocation) await Task.Delay(TimeSpan.FromSeconds(1)); // let the host process start: + Log("Waiting for changes..."); await waitingForChanges.WaitAsync(); switch (updateLocation) @@ -446,6 +467,7 @@ public static void Print() """); // Host received Hot Reload updates: + Log("Waiting for change handled ..."); await changeHandled.WaitAsync(); break; @@ -454,6 +476,7 @@ public static void Print() UpdateSourceFile(hostProgram, content => content.Replace("Waiting", "")); // Host received Hot Reload updates: + Log("Waiting for change handled ..."); await changeHandled.WaitAsync(); break; @@ -462,14 +485,17 @@ public static void Print() UpdateSourceFile(hostProgram, content => content.Replace("Started", "")); // ⚠ ENC0118: Changing 'top-level code' might not have any effect until the application is restarted. Press "Ctrl + R" to restart. + Log("Waiting for restart needed ..."); await restartNeeded.WaitAsync(); console.PressKey(new ConsoleKeyInfo('R', ConsoleKey.R, shift: false, alt: false, control: true)); + Log("Waiting for restart requested ..."); await restartRequested.WaitAsync(); break; } + Log("Waiting updated output from Host ..."); await hasUpdate.WaitAsync(); // clean up: @@ -486,8 +512,7 @@ public static void Print() [Fact] public async Task RudeEditInProjectWithoutRunningProcess() { - var testAsset = TestAssets.CopyTestAsset("WatchAppMultiProc") - .WithSource(); + var testAsset = CopyTestAsset("WatchAppMultiProc"); var workingDirectory = testAsset.Path; var hostDir = Path.Combine(testAsset.Path, "Host"); @@ -502,7 +527,7 @@ public async Task RudeEditInProjectWithoutRunningProcess() var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose", "--non-interactive", "--project", hostProject]), console, - TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath), + TestOptions.GetEnvironmentOptions(workingDirectory, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset), reporter, out var errorCode); @@ -526,12 +551,14 @@ public async Task RudeEditInProjectWithoutRunningProcess() var sessionStarted = reporter.RegisterSemaphore(MessageDescriptor.HotReloadSessionStarted); // let the host process start: + Log("Waiting for changes..."); await waitingForChanges.WaitAsync(); // service should have been created before Hot Reload session started: Assert.NotNull(service); var runningProject = await Launch(serviceProjectA, service, workingDirectory, watchCancellationSource.Token); + Log("Waiting for session started ..."); await sessionStarted.WaitAsync(); // Terminate the process: @@ -542,6 +569,7 @@ public async Task RudeEditInProjectWithoutRunningProcess() [assembly: System.Reflection.AssemblyMetadata("TestAssemblyMetadata", "2")] """); + Log("Waiting for change handled ..."); await changeHandled.WaitAsync(); reporter.ProcessOutput.Contains("verbose ⌚ Rude edits detected but do not affect any running process"); diff --git a/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs b/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs index fb79e922dae8..c13ac86cdfbb 100644 --- a/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs +++ b/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Watcher.Tools { - internal class AwaitableProcess : IDisposable + internal class AwaitableProcess(DotnetCommand spec, ITestOutputHelper logger) : IDisposable { // cancel just before we hit timeout used on CI (XUnitWorkItemTimeout value in sdk\test\UnitTests.proj) private static readonly TimeSpan s_timeout = Environment.GetEnvironmentVariable("HELIX_WORK_ITEM_TIMEOUT") is { } value @@ -14,29 +14,14 @@ internal class AwaitableProcess : IDisposable private readonly object _testOutputLock = new(); + private readonly DotnetCommand _spec = spec; + private readonly List _lines = []; + private readonly BufferBlock _source = new(); private Process _process; - private readonly DotnetCommand _spec; - private readonly List _lines; - private BufferBlock _source; - private ITestOutputHelper _logger; - private TaskCompletionSource _exited; private bool _disposed; - public AwaitableProcess(DotnetCommand spec, ITestOutputHelper logger) - { - _spec = spec; - _logger = logger; - _source = new BufferBlock(); - _lines = new List(); - _exited = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - } - public IEnumerable Output => _lines; - - public Task Exited => _exited.Task; - public int Id => _process.Id; - public Process Process => _process; public void Start() @@ -70,6 +55,9 @@ public void Start() WriteTestOutput($"{DateTime.Now}: process started: '{_process.StartInfo.FileName} {_process.StartInfo.Arguments}'"); } + public void ClearOutput() + => _lines.Clear(); + public async Task GetOutputLineAsync(Predicate success, Predicate failure) { using var cancellationOnFailure = new CancellationTokenSource(); @@ -151,7 +139,7 @@ private void WriteTestOutput(string text) { if (!_disposed) { - _logger.WriteLine(text); + logger.WriteLine(text); } } } @@ -160,17 +148,9 @@ private void OnExit(object sender, EventArgs args) { // Wait to ensure the process has exited and all output consumed _process.WaitForExit(); - _source.Complete(); - _exited.TrySetResult(_process.ExitCode); - try - { - WriteTestOutput($"Process {_process.Id} has exited"); - } - catch - { - // test might not be running anymore - } + // Signal test methods waiting on all process output to be completed: + _source.Complete(); } public void Dispose() @@ -182,38 +162,40 @@ public void Dispose() _disposed = true; } - if (_process != null) + if (_process == null) { - try - { - _process.Kill(entireProcessTree: true); - } - catch - { - } + return; + } - try - { - _process.CancelErrorRead(); - } - catch - { - } + _process.ErrorDataReceived -= OnData; + _process.OutputDataReceived -= OnData; - try - { - _process.CancelOutputRead(); - } - catch - { - } + try + { + _process.CancelErrorRead(); + } + catch + { + } - _process.ErrorDataReceived -= OnData; - _process.OutputDataReceived -= OnData; - _process.Exited -= OnExit; - _process.Dispose(); - _process = null; + try + { + _process.CancelOutputRead(); + } + catch + { + } + + try + { + _process.Kill(entireProcessTree: false); + } + catch + { } + + _process.Dispose(); + _process = null; } } } diff --git a/test/dotnet-watch.Tests/Utilities/TestOptions.cs b/test/dotnet-watch.Tests/Utilities/TestOptions.cs index c083c93fdfa7..bbc9b51d2e25 100644 --- a/test/dotnet-watch.Tests/Utilities/TestOptions.cs +++ b/test/dotnet-watch.Tests/Utilities/TestOptions.cs @@ -1,23 +1,35 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher; internal static class TestOptions { + private static int s_testPort = 7000; + + public static int GetTestPort() + => Interlocked.Increment(ref s_testPort); + public static readonly ProjectOptions ProjectOptions = GetProjectOptions([]); - public static EnvironmentOptions GetEnvironmentOptions(string workingDirectory = "", string muxerPath = "") - => new(workingDirectory, muxerPath, TestFlags: TestFlags.RunningAsTest); + public static EnvironmentOptions GetEnvironmentOptions(string workingDirectory = "", string muxerPath = "", TestAsset? asset = null) + => new(workingDirectory, muxerPath, TestFlags: TestFlags.RunningAsTest, TestOutput: asset != null ? GetWatchTestOutputPath(asset) : ""); public static CommandLineOptions GetCommandLineOptions(string[] args) - => CommandLineOptions.Parse(args, NullReporter.Singleton, TextWriter.Null, out _); + => CommandLineOptions.Parse(args, NullReporter.Singleton, TextWriter.Null, out _) ?? throw new InvalidOperationException(); - public static ProjectOptions GetProjectOptions(string[] args = null) + public static ProjectOptions GetProjectOptions(string[]? args = null) { var options = GetCommandLineOptions(args ?? []); return options.GetProjectOptions(options.ProjectPath ?? "test.csproj", workingDirectory: ""); } + + public static string GetWatchTestOutputPath(this TestAsset asset) + => Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT") is { } ciOutputRoot + ? Path.Combine(ciOutputRoot, ".hotreload", asset.Name) + : asset.Path + ".hotreload"; } diff --git a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs index fb64fbad9567..50cbf578d2ce 100644 --- a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs +++ b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs @@ -100,7 +100,7 @@ public async Task RunsWithIterationEnvVariable() var value = await App.AssertOutputLineStartsWith(messagePrefix); Assert.Equal(1, int.Parse(value, CultureInfo.InvariantCulture)); - await App.AssertWaitingForChanges(); + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); UpdateSourceFile(source); await App.AssertStarted(); diff --git a/test/dotnet-watch.Tests/Watch/ProgramTests.cs b/test/dotnet-watch.Tests/Watch/ProgramTests.cs index 0dcc2a850e0f..43319ebdd215 100644 --- a/test/dotnet-watch.Tests/Watch/ProgramTests.cs +++ b/test/dotnet-watch.Tests/Watch/ProgramTests.cs @@ -23,7 +23,7 @@ public async Task ConsoleCancelKey() var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose"]), console, - TestOptions.GetEnvironmentOptions(workingDirectory: testAsset.Path, TestContext.Current.ToolsetUnderTest.DotNetHostPath), + TestOptions.GetEnvironmentOptions(workingDirectory: testAsset.Path, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset), reporter, out var errorCode); @@ -196,16 +196,21 @@ public async Task TestCommand() App.Start(testAsset, ["--verbose", "test", "--list-tests", "/p:VSTestUseMSBuildOutput=false"]); - await App.AssertOutputLineEquals("The following Tests are available:"); - await App.AssertOutputLineEquals(" TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + App.AssertOutputContains("The following Tests are available:"); + App.AssertOutputContains(" TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); + App.Process.ClearOutput(); // update file: var testFile = Path.Combine(testAsset.Path, "UnitTest1.cs"); var content = File.ReadAllText(testFile, Encoding.UTF8); File.WriteAllText(testFile, content.Replace("VSTestXunitPassTest", "VSTestXunitPassTest2"), Encoding.UTF8); - await App.AssertOutputLineEquals("The following Tests are available:"); - await App.AssertOutputLineEquals(" TestNamespace.VSTestXunitTests.VSTestXunitPassTest2"); + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + App.AssertOutputContains("The following Tests are available:"); + App.AssertOutputContains(" TestNamespace.VSTestXunitTests.VSTestXunitPassTest2"); } [Fact] diff --git a/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs b/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs index 780b5a7d39cb..70c38986a1b6 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs @@ -25,16 +25,19 @@ public DotNetWatchTestBase(ITestOutputHelper logger) public DebugTestOutputLogger Logger => (DebugTestOutputLogger)App.Logger; + public void Log(string message) + => Logger.WriteLine($"[TEST] {message}"); + public void UpdateSourceFile(string path, string text) { File.WriteAllText(path, text, Encoding.UTF8); - Logger.WriteLine($"File '{path}' updated ({HotReloadFileSetWatcher.FormatTimestamp(File.GetLastWriteTimeUtc(path))})."); + Log($"File '{path}' updated ({HotReloadDotNetWatcher.FormatTimestamp(File.GetLastWriteTimeUtc(path))})."); } public void UpdateSourceFile(string path, Func contentTransform) { File.WriteAllText(path, contentTransform(File.ReadAllText(path, Encoding.UTF8)), Encoding.UTF8); - Logger.WriteLine($"File '{path}' updated."); + Log($"File '{path}' updated."); } public void UpdateSourceFile(string path) diff --git a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs index 3a7c74b2fa71..26fe6b0b99c8 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs @@ -37,6 +37,9 @@ public static string GetLinePrefix(MessageDescriptor descriptor, string projectD public void AssertOutputContains(string message) => AssertEx.Contains(message, Process.Output); + public void AssertOutputDoesNotContain(string message) + => AssertEx.DoesNotContain(message, Process.Output); + public void AssertOutputContains(MessageDescriptor descriptor, string projectDisplay = null) => AssertOutputContains(GetLinePrefix(descriptor, projectDisplay)); @@ -117,15 +120,14 @@ public void Start(TestAsset asset, IEnumerable arguments, string relativ WorkingDirectory = workingDirectory ?? projectDirectory, }; + var testOutputPath = asset.GetWatchTestOutputPath(); + Directory.CreateDirectory(testOutputPath); + commandSpec.WithEnvironmentVariable("HOTRELOAD_DELTA_CLIENT_LOG_MESSAGES", "1"); commandSpec.WithEnvironmentVariable("DOTNET_USE_POLLING_FILE_WATCHER", "true"); commandSpec.WithEnvironmentVariable("__DOTNET_WATCH_TEST_FLAGS", testFlags.ToString()); - - var encLogPath = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT") is { } ciOutputRoot - ? Path.Combine(ciOutputRoot, ".hotreload", asset.Name) - : asset.Path + ".hotreload"; - - commandSpec.WithEnvironmentVariable("Microsoft_CodeAnalysis_EditAndContinue_LogDir", encLogPath); + commandSpec.WithEnvironmentVariable("__DOTNET_WATCH_TEST_OUTPUT_DIR", testOutputPath); + commandSpec.WithEnvironmentVariable("Microsoft_CodeAnalysis_EditAndContinue_LogDir", testOutputPath); foreach (var env in EnvironmentVariables) { From 1c9a591486c137967fc45e5c1d12c084b4718952 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Nov 2024 00:56:52 +0000 Subject: [PATCH 357/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241109.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.24557.2 -> To Version 9.0.0-beta.24559.2 --- 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 2a6a61ddd581..46d24dab450a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink 7c7d76475d055bb47dc9cadbb47065cd3625b515 diff --git a/eng/Versions.props b/eng/Versions.props index 1364f4825d98..32d2b056f9db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24559.1 - 9.0.0-beta.24559.1 - 9.0.0-beta.24559.1 - 9.0.0-beta.24559.1 - 9.0.0-beta.24559.1 - 9.0.0-beta.24559.1 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 From a115f5a9340c9fd2b5899e63ee0f35c718d2af41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Nov 2024 13:43:28 +0000 Subject: [PATCH 358/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241109.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.24557.2 -> To Version 9.0.0-beta.24559.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 9652eee305fd..3be7fc6ad0ce 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 - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 - + https://github.com/dotnet/sourcelink - 02c795c78776db6051730c33d80324228d602255 + 7c7d76475d055bb47dc9cadbb47065cd3625b515 diff --git a/eng/Versions.props b/eng/Versions.props index 5fb93c40b43c..34a069ef727d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 - 9.0.0-beta.24557.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 + 9.0.0-beta.24559.2 From fc48812c7aa1b63a88dc428f5f26fd22218c1004 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 00:54:47 -0600 Subject: [PATCH 359/702] 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 360/702] 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 361/702] 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 362/702] 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 7ef6bb30fe52fc09ae029cf12337fc635623b919 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 08:26:29 +0000 Subject: [PATCH 363/702] Update dependencies from https://github.com/dotnet/test-templates build 20241110.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24558.1 -> To Version 1.1.0-rtm.24560.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 8c032e6f7ebc..b7dd16276691 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 - 37e5097eeb9196aadfbbde131f58a5df63476f93 + 444ead1a9c68444464c70427d6626211dbcd64ff - + https://github.com/dotnet/test-templates - 37e5097eeb9196aadfbbde131f58a5df63476f93 + 444ead1a9c68444464c70427d6626211dbcd64ff diff --git a/eng/Versions.props b/eng/Versions.props index d3f33a4e2ee5..ee387fec7466 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24558.1 + 1.1.0-rtm.24560.1 From b3a56dac3703c440c5f63fdd5593572deddf9144 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 08:26:33 +0000 Subject: [PATCH 364/702] Update dependencies from https://github.com/dotnet/test-templates build 20241110.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24558.1 -> To Version 1.1.0-rtm.24560.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 063b4f34af70..bf6435f48b9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 37e5097eeb9196aadfbbde131f58a5df63476f93 + 444ead1a9c68444464c70427d6626211dbcd64ff - + https://github.com/dotnet/test-templates - 37e5097eeb9196aadfbbde131f58a5df63476f93 + 444ead1a9c68444464c70427d6626211dbcd64ff diff --git a/eng/Versions.props b/eng/Versions.props index 67f36f5e7fb1..8ce4a52a2343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24558.1 + 1.1.0-rtm.24560.1 From 01be830869d79ca2c3d26825eaa41af256e2c79e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 10:42:50 +0000 Subject: [PATCH 365/702] Update dependencies from https://github.com/dotnet/msbuild build 20241111.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24558-03 -> To Version 17.13.0-preview-24561-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf6435f48b9b..d36d55fc3806 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 + 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 - + https://github.com/dotnet/msbuild - 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 + 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 - + https://github.com/dotnet/msbuild - 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 + 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 diff --git a/eng/Versions.props b/eng/Versions.props index 8ce4a52a2343..f8c968355aa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24558-03 - 17.13.0-preview-24558-03 + 17.13.0-preview-24561-02 + 17.13.0-preview-24561-02 17.11.4 17.12 From 0abf48c0499a3fcc43a1dfbe207233e441238613 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 10:47:38 +0000 Subject: [PATCH 366/702] Update dependencies from https://github.com/dotnet/msbuild build 20241111.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24558-03 -> To Version 17.13.0-preview-24561-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d36d55fc3806..9b8fc4853a5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 + 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 - + https://github.com/dotnet/msbuild - 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 + 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 - + https://github.com/dotnet/msbuild - 5694e3c8b5a6c687f8990aedfb7c103c3fa91275 + 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 diff --git a/eng/Versions.props b/eng/Versions.props index f8c968355aa4..c4ecd24f5cd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24561-02 - 17.13.0-preview-24561-02 + 17.13.0-preview-24561-01 + 17.13.0-preview-24561-01 17.11.4 17.12 From b09da4533a0dec729dd0337cf21df8aaddcd17d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 11:06:09 +0000 Subject: [PATCH 367/702] Update dependencies from https://github.com/dotnet/msbuild build 20241111.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24558-03 -> To Version 17.13.0-preview-24561-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b8fc4853a5c..89e10bcc0ff1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 + f637dede2974bf9eccca61551349b6bf50c8b510 - + https://github.com/dotnet/msbuild - 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 + f637dede2974bf9eccca61551349b6bf50c8b510 - + https://github.com/dotnet/msbuild - 1bb761c631f417f86717cc3ea21ed1856ad9c3e3 + f637dede2974bf9eccca61551349b6bf50c8b510 diff --git a/eng/Versions.props b/eng/Versions.props index c4ecd24f5cd0..7c19e058068d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24561-01 - 17.13.0-preview-24561-01 + 17.13.0-preview-24561-03 + 17.13.0-preview-24561-03 17.11.4 17.12 From c3d141469b8057bb516f60cc7040b8b09b281ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:13:13 +0000 Subject: [PATCH 368/702] Update dependencies from https://github.com/dotnet/msbuild build 20241111.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24558-03 -> To Version 17.13.0-preview-24561-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89e10bcc0ff1..ab2f74af134f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - f637dede2974bf9eccca61551349b6bf50c8b510 + 963f4a65255046f5e5d0cbf9070e720a29d74b11 - + https://github.com/dotnet/msbuild - f637dede2974bf9eccca61551349b6bf50c8b510 + 963f4a65255046f5e5d0cbf9070e720a29d74b11 - + https://github.com/dotnet/msbuild - f637dede2974bf9eccca61551349b6bf50c8b510 + 963f4a65255046f5e5d0cbf9070e720a29d74b11 diff --git a/eng/Versions.props b/eng/Versions.props index 7c19e058068d..9314e6eefbeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24561-03 - 17.13.0-preview-24561-03 + 17.13.0-preview-24561-04 + 17.13.0-preview-24561-04 17.11.4 17.12 From ef29936951343ed47dc534d543494779737f1264 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:36:29 +0000 Subject: [PATCH 369/702] Update dependencies from https://github.com/dotnet/test-templates build 20241111.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24560.1 -> To Version 1.1.0-rtm.24561.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 bf6435f48b9b..5c61e463c6ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 444ead1a9c68444464c70427d6626211dbcd64ff + 282a2113ba98fd9c9dc18021d5c79d446ef7d45d - + https://github.com/dotnet/test-templates - 444ead1a9c68444464c70427d6626211dbcd64ff + 282a2113ba98fd9c9dc18021d5c79d446ef7d45d diff --git a/eng/Versions.props b/eng/Versions.props index 8ce4a52a2343..befde2d02517 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24560.1 + 1.1.0-rtm.24561.1 From 867417e45b7da13ebde79e908ee99b8943a30d71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:36:31 +0000 Subject: [PATCH 370/702] Update dependencies from https://github.com/dotnet/test-templates build 20241111.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24558.1 -> To Version 1.1.0-rtm.24561.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 b7dd16276691..202d07504e98 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 - 444ead1a9c68444464c70427d6626211dbcd64ff + 282a2113ba98fd9c9dc18021d5c79d446ef7d45d - + https://github.com/dotnet/test-templates - 444ead1a9c68444464c70427d6626211dbcd64ff + 282a2113ba98fd9c9dc18021d5c79d446ef7d45d diff --git a/eng/Versions.props b/eng/Versions.props index ee387fec7466..d55967e3b24b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24560.1 + 1.1.0-rtm.24561.1 From 693cdd49391c8b91a33ba137fc6f813d27e693e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:50:46 +0000 Subject: [PATCH 371/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241111.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.24559.2 -> To Version 9.0.0-beta.24561.1 --- 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 bf6435f48b9b..bbbfd61999d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 diff --git a/eng/Versions.props b/eng/Versions.props index 8ce4a52a2343..22406b104167 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 + 9.0.0-beta.24561.1 + 9.0.0-beta.24561.1 + 9.0.0-beta.24561.1 + 9.0.0-beta.24561.1 + 9.0.0-beta.24561.1 + 9.0.0-beta.24561.1 From f88a6daecbec1a70f85f7d9a3ce6f8c3c09b453b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 15:23:15 +0000 Subject: [PATCH 372/702] Update dependencies from https://github.com/dotnet/fsharp build 20241111.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24558.3 -> To Version 9.0.200-beta.24561.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 bf6435f48b9b..7af00771bc69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 77312bc7f9ae339b9d7a0c5ed750fa9effd82111 - + https://github.com/dotnet/fsharp - 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 + e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/fsharp - 28c439568b9cfd9978c8c0a91e05eaf0e0d39396 + e9dab83bc86ec414b7288d3f8be48a2b14eabb5d diff --git a/eng/Versions.props b/eng/Versions.props index 8ce4a52a2343..7372f22e3dfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ - 13.9.200-beta.24558.3 + 13.9.200-beta.24561.2 From b0968a1af0d6b831a9866ee59e0598cd9f949263 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 11 Nov 2024 08:59:26 -0800 Subject: [PATCH 373/702] 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 d24dbb5aacca539ba553d985a248bf211151f2c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 22:30:12 +0000 Subject: [PATCH 374/702] Update dependencies from https://github.com/dotnet/razor build 20241111.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24561.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbbfd61999d3..60f426746e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f6384a995a7032f50f4e3d07fad1c87e2cd8a560 + 22980a43b874831d13161bd89a3adc7af08bc8b5 - + https://github.com/dotnet/razor - f6384a995a7032f50f4e3d07fad1c87e2cd8a560 + 22980a43b874831d13161bd89a3adc7af08bc8b5 - + https://github.com/dotnet/razor - f6384a995a7032f50f4e3d07fad1c87e2cd8a560 + 22980a43b874831d13161bd89a3adc7af08bc8b5 - + https://github.com/dotnet/razor - f6384a995a7032f50f4e3d07fad1c87e2cd8a560 + 22980a43b874831d13161bd89a3adc7af08bc8b5 diff --git a/eng/Versions.props b/eng/Versions.props index 22406b104167..89d585441660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24558.2 - 9.0.0-preview.24558.2 - 9.0.0-preview.24558.2 + 9.0.0-preview.24561.1 + 9.0.0-preview.24561.1 + 9.0.0-preview.24561.1 From e689054fabf2ca451ca5972e86cabe79fc907a57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 00:42:05 +0000 Subject: [PATCH 375/702] Update dependencies from https://github.com/dotnet/razor build 20241111.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24561.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60f426746e78..f6eff51206a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 22980a43b874831d13161bd89a3adc7af08bc8b5 + 8a2c71f196bdf5bf28332a6b7d1927261481e146 - + https://github.com/dotnet/razor - 22980a43b874831d13161bd89a3adc7af08bc8b5 + 8a2c71f196bdf5bf28332a6b7d1927261481e146 - + https://github.com/dotnet/razor - 22980a43b874831d13161bd89a3adc7af08bc8b5 + 8a2c71f196bdf5bf28332a6b7d1927261481e146 - + https://github.com/dotnet/razor - 22980a43b874831d13161bd89a3adc7af08bc8b5 + 8a2c71f196bdf5bf28332a6b7d1927261481e146 diff --git a/eng/Versions.props b/eng/Versions.props index 89d585441660..dadbdc03a902 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24561.1 - 9.0.0-preview.24561.1 - 9.0.0-preview.24561.1 + 9.0.0-preview.24561.2 + 9.0.0-preview.24561.2 + 9.0.0-preview.24561.2 From 95883ebbaf3707ead65856691498c73f035e4ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 01:02:47 +0000 Subject: [PATCH 376/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241111.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.24561.1 -> To Version 9.0.0-beta.24561.2 --- 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 bbbfd61999d3..6387e2277356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink bb76840309871e5812f911b44eccc3b648e2c3d2 diff --git a/eng/Versions.props b/eng/Versions.props index 22406b104167..8c3f411a01f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24561.1 - 9.0.0-beta.24561.1 - 9.0.0-beta.24561.1 - 9.0.0-beta.24561.1 - 9.0.0-beta.24561.1 - 9.0.0-beta.24561.1 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 From f04030a7ac3bc8a76dfda67c53951b0559e144c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 02:03:19 +0000 Subject: [PATCH 377/702] Update dependencies from https://github.com/dotnet/razor build 20241111.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24561.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6eff51206a0..86591f5ce74c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 8a2c71f196bdf5bf28332a6b7d1927261481e146 + f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 - + https://github.com/dotnet/razor - 8a2c71f196bdf5bf28332a6b7d1927261481e146 + f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 - + https://github.com/dotnet/razor - 8a2c71f196bdf5bf28332a6b7d1927261481e146 + f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 - + https://github.com/dotnet/razor - 8a2c71f196bdf5bf28332a6b7d1927261481e146 + f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 diff --git a/eng/Versions.props b/eng/Versions.props index dadbdc03a902..2bc59fddc886 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24561.2 - 9.0.0-preview.24561.2 - 9.0.0-preview.24561.2 + 9.0.0-preview.24561.3 + 9.0.0-preview.24561.3 + 9.0.0-preview.24561.3 From 00c0e7cc0d0634a2cc1946ba762e5a80a81cb882 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 03:51:06 +0000 Subject: [PATCH 378/702] Update dependencies from https://github.com/dotnet/razor build 20241111.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24561.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86591f5ce74c..9b8713569949 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 + 95f862d12ea352bd034ce3499c90671c1f808c3a - + https://github.com/dotnet/razor - f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 + 95f862d12ea352bd034ce3499c90671c1f808c3a - + https://github.com/dotnet/razor - f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 + 95f862d12ea352bd034ce3499c90671c1f808c3a - + https://github.com/dotnet/razor - f3aa64757dcf538dcf9bbe1323d23e8f9a5567e6 + 95f862d12ea352bd034ce3499c90671c1f808c3a diff --git a/eng/Versions.props b/eng/Versions.props index 2bc59fddc886..282b77cee123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24561.3 - 9.0.0-preview.24561.3 - 9.0.0-preview.24561.3 + 9.0.0-preview.24561.4 + 9.0.0-preview.24561.4 + 9.0.0-preview.24561.4 From 194258e364080035cec04a22dac2398308740704 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 03:52:19 +0000 Subject: [PATCH 379/702] Update dependencies from https://github.com/dotnet/msbuild build 20241112.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24562-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 702c7bcb87e8..4ffb59539023 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 963f4a65255046f5e5d0cbf9070e720a29d74b11 + ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 - + https://github.com/dotnet/msbuild - 963f4a65255046f5e5d0cbf9070e720a29d74b11 + ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 - + https://github.com/dotnet/msbuild - 963f4a65255046f5e5d0cbf9070e720a29d74b11 + ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 diff --git a/eng/Versions.props b/eng/Versions.props index edf7f7da674e..7277f25eca4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24561-04 - 17.13.0-preview-24561-04 + 17.13.0-preview-24562-01 + 17.13.0-preview-24562-01 17.11.4 17.12 From 6c1087d275c1bebd8e8bc0cb10b5c33485dffb4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 06:12:39 +0000 Subject: [PATCH 380/702] Update dependencies from https://github.com/dotnet/razor build 20241111.5 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.24558.2 -> To Version 9.0.0-preview.24561.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b8713569949..4e23fdd665a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 95f862d12ea352bd034ce3499c90671c1f808c3a + 1f24912e448cfdc18ceae3c572a92e21d99e9afd - + https://github.com/dotnet/razor - 95f862d12ea352bd034ce3499c90671c1f808c3a + 1f24912e448cfdc18ceae3c572a92e21d99e9afd - + https://github.com/dotnet/razor - 95f862d12ea352bd034ce3499c90671c1f808c3a + 1f24912e448cfdc18ceae3c572a92e21d99e9afd - + https://github.com/dotnet/razor - 95f862d12ea352bd034ce3499c90671c1f808c3a + 1f24912e448cfdc18ceae3c572a92e21d99e9afd diff --git a/eng/Versions.props b/eng/Versions.props index 282b77cee123..bdbd6eb7ebcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24561.4 - 9.0.0-preview.24561.4 - 9.0.0-preview.24561.4 + 9.0.0-preview.24561.5 + 9.0.0-preview.24561.5 + 9.0.0-preview.24561.5 From f12db7342ff7b836ae4237cf686edc86188074b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 10:50:13 +0000 Subject: [PATCH 381/702] Update dependencies from https://github.com/dotnet/msbuild build 20241112.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24562-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ffb59539023..de801c74d113 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 + fad2b48d63627556de49173e7d93bccc267c971a - + https://github.com/dotnet/msbuild - ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 + fad2b48d63627556de49173e7d93bccc267c971a - + https://github.com/dotnet/msbuild - ef8c1da4a8ba0b08d595d3803add38f8ba7b7d65 + fad2b48d63627556de49173e7d93bccc267c971a diff --git a/eng/Versions.props b/eng/Versions.props index 7277f25eca4e..09988d89bcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24562-01 - 17.13.0-preview-24562-01 + 17.13.0-preview-24562-02 + 17.13.0-preview-24562-02 17.11.4 17.12 From ce4c3d199d4431740c2bb7f3f129fb662aa82161 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 13:58:10 +0000 Subject: [PATCH 382/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241111.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.24559.2 -> To Version 9.0.0-beta.24561.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 202d07504e98..5576ecaf1c8f 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 - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 - + https://github.com/dotnet/sourcelink - 7c7d76475d055bb47dc9cadbb47065cd3625b515 + bb76840309871e5812f911b44eccc3b648e2c3d2 diff --git a/eng/Versions.props b/eng/Versions.props index d55967e3b24b..bb15e7c282f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 - 9.0.0-beta.24559.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 + 9.0.0-beta.24561.2 From 64d12236c5b1c6563b90cb52af31aff5c1d1f31b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 14:54:00 +0000 Subject: [PATCH 383/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241112.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.24561.1 -> To Version 9.0.0-beta.24562.1 --- 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 6387e2277356..8c87d2e1b20a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 diff --git a/eng/Versions.props b/eng/Versions.props index 8c3f411a01f2..3c2f27429c99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 + 9.0.0-beta.24562.1 + 9.0.0-beta.24562.1 + 9.0.0-beta.24562.1 + 9.0.0-beta.24562.1 + 9.0.0-beta.24562.1 + 9.0.0-beta.24562.1 From d272e340f1fe8cccf024d0a0f1efd8cd6e502e78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 14:58:31 +0000 Subject: [PATCH 384/702] Update dependencies from https://github.com/dotnet/msbuild build 20241112.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24562-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de801c74d113..0718c7bc4532 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - fad2b48d63627556de49173e7d93bccc267c971a + 074c2a87e2dffd0c9ac14b033eef01b92a556fbc - + https://github.com/dotnet/msbuild - fad2b48d63627556de49173e7d93bccc267c971a + 074c2a87e2dffd0c9ac14b033eef01b92a556fbc - + https://github.com/dotnet/msbuild - fad2b48d63627556de49173e7d93bccc267c971a + 074c2a87e2dffd0c9ac14b033eef01b92a556fbc diff --git a/eng/Versions.props b/eng/Versions.props index 09988d89bcd9..b55ddabd5cb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24562-02 - 17.13.0-preview-24562-02 + 17.13.0-preview-24562-03 + 17.13.0-preview-24562-03 17.11.4 17.12 From d6d817b4b190cac22459ace68bc42f49384dd7c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 16:03:10 +0000 Subject: [PATCH 385/702] Update dependencies from https://github.com/dotnet/msbuild build 20241112.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24562-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0718c7bc4532..ea1835b63542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 074c2a87e2dffd0c9ac14b033eef01b92a556fbc + cfbd4bc8985c3473d66262ce2e968e5b520650a9 - + https://github.com/dotnet/msbuild - 074c2a87e2dffd0c9ac14b033eef01b92a556fbc + cfbd4bc8985c3473d66262ce2e968e5b520650a9 - + https://github.com/dotnet/msbuild - 074c2a87e2dffd0c9ac14b033eef01b92a556fbc + cfbd4bc8985c3473d66262ce2e968e5b520650a9 diff --git a/eng/Versions.props b/eng/Versions.props index b55ddabd5cb1..fb09c0b60d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24562-03 - 17.13.0-preview-24562-03 + 17.13.0-preview-24562-04 + 17.13.0-preview-24562-04 17.11.4 17.12 From 37b15ef5ad8a1da0e3d626877b6996cd98832aa6 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 12 Nov 2024 09:24:09 -0800 Subject: [PATCH 386/702] 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 bf536d516eb3ad6e16789f00cf12243ba690dca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 19:41:47 +0000 Subject: [PATCH 387/702] Update dependencies from https://github.com/dotnet/razor build 20241112.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24562.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e23fdd665a9..bbf56e52b9d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 1f24912e448cfdc18ceae3c572a92e21d99e9afd + a9f72d54bd6a87f117988423b9e248ee55d48b34 - + https://github.com/dotnet/razor - 1f24912e448cfdc18ceae3c572a92e21d99e9afd + a9f72d54bd6a87f117988423b9e248ee55d48b34 - + https://github.com/dotnet/razor - 1f24912e448cfdc18ceae3c572a92e21d99e9afd + a9f72d54bd6a87f117988423b9e248ee55d48b34 - + https://github.com/dotnet/razor - 1f24912e448cfdc18ceae3c572a92e21d99e9afd + a9f72d54bd6a87f117988423b9e248ee55d48b34 diff --git a/eng/Versions.props b/eng/Versions.props index bdbd6eb7ebcb..ac92f1bb7540 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24561.5 - 9.0.0-preview.24561.5 - 9.0.0-preview.24561.5 + 9.0.0-preview.24562.1 + 9.0.0-preview.24562.1 + 9.0.0-preview.24562.1 From dc13d711ef078c59ff7a70ac66ada494b9d26fa8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Nov 2024 21:02:11 +0000 Subject: [PATCH 388/702] Update dependencies from https://github.com/dotnet/razor build 20241112.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24562.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbf56e52b9d2..08e50037473b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - a9f72d54bd6a87f117988423b9e248ee55d48b34 + f2fc3e4f7377f0807df97e04ee532b6041e8552b - + https://github.com/dotnet/razor - a9f72d54bd6a87f117988423b9e248ee55d48b34 + f2fc3e4f7377f0807df97e04ee532b6041e8552b - + https://github.com/dotnet/razor - a9f72d54bd6a87f117988423b9e248ee55d48b34 + f2fc3e4f7377f0807df97e04ee532b6041e8552b - + https://github.com/dotnet/razor - a9f72d54bd6a87f117988423b9e248ee55d48b34 + f2fc3e4f7377f0807df97e04ee532b6041e8552b diff --git a/eng/Versions.props b/eng/Versions.props index ac92f1bb7540..ecff7c239de3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24562.1 - 9.0.0-preview.24562.1 - 9.0.0-preview.24562.1 + 9.0.0-preview.24562.2 + 9.0.0-preview.24562.2 + 9.0.0-preview.24562.2 From 1e9852d763a428b57d9c2235d67a3df62289ee6e Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:08:53 +0100 Subject: [PATCH 389/702] .NET Source-Build 9.0.100 November 2024 Updates (#44820) --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 566567e99432..69bb7db32648 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 1d646f1bb297..97eea60b3146 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.100-rc.2.24474.1 - 9.0.100-rc.2.24474.1 + 9.0.100 + 9.0.100-rtm.24529.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 1f0e02cea1fd..044f23f6237a 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11" + "dotnet": "9.0.100" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2" } } From 0d73049db67b84b7f115aae330517bf45f8239ec Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 15:24:27 -0800 Subject: [PATCH 390/702] 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 a369d538fe587e1ce7d281b6cc1be8ea11bd2f20 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 15:24:27 -0800 Subject: [PATCH 391/702] 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 6ec38caaaa3e2224a5fbd553bae7544abacc767d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 00:45:05 +0000 Subject: [PATCH 392/702] Update dependencies from https://github.com/dotnet/razor build 20241112.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24562.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08e50037473b..e20dc0884489 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f2fc3e4f7377f0807df97e04ee532b6041e8552b + 2479b5e55f420ac8c9325e5bf266677f01322a82 - + https://github.com/dotnet/razor - f2fc3e4f7377f0807df97e04ee532b6041e8552b + 2479b5e55f420ac8c9325e5bf266677f01322a82 - + https://github.com/dotnet/razor - f2fc3e4f7377f0807df97e04ee532b6041e8552b + 2479b5e55f420ac8c9325e5bf266677f01322a82 - + https://github.com/dotnet/razor - f2fc3e4f7377f0807df97e04ee532b6041e8552b + 2479b5e55f420ac8c9325e5bf266677f01322a82 diff --git a/eng/Versions.props b/eng/Versions.props index ecff7c239de3..fe4a1585b23e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24562.2 - 9.0.0-preview.24562.2 - 9.0.0-preview.24562.2 + 9.0.0-preview.24562.3 + 9.0.0-preview.24562.3 + 9.0.0-preview.24562.3 From dca08eba55b54f2b916ab3b07a9d2e091a9bbb56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 00:58:19 +0000 Subject: [PATCH 393/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241112.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.24561.1 -> To Version 9.0.0-beta.24562.2 --- 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 8c87d2e1b20a..666ff7be015b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink 4e751513abaad9c7b51fb411fa44ee2f8480a183 diff --git a/eng/Versions.props b/eng/Versions.props index 3c2f27429c99..b9e9b7a181d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24562.1 - 9.0.0-beta.24562.1 - 9.0.0-beta.24562.1 - 9.0.0-beta.24562.1 - 9.0.0-beta.24562.1 - 9.0.0-beta.24562.1 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 From 29301ba0db12cb702477ef4370e7ae1f0635f397 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 09:34:47 +0000 Subject: [PATCH 394/702] Update dependencies from https://github.com/dotnet/msbuild build 20241113.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24563-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1835b63542..23dbc338a4dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - cfbd4bc8985c3473d66262ce2e968e5b520650a9 + c49eee220014b0041bb9fb8989b0d8c5be51af08 - + https://github.com/dotnet/msbuild - cfbd4bc8985c3473d66262ce2e968e5b520650a9 + c49eee220014b0041bb9fb8989b0d8c5be51af08 - + https://github.com/dotnet/msbuild - cfbd4bc8985c3473d66262ce2e968e5b520650a9 + c49eee220014b0041bb9fb8989b0d8c5be51af08 diff --git a/eng/Versions.props b/eng/Versions.props index fb09c0b60d99..1f55d0d62d81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24562-04 - 17.13.0-preview-24562-04 + 17.13.0-preview-24563-01 + 17.13.0-preview-24563-01 17.11.4 17.12 From c35c5bbc7b7579a03820c0e89a63d491ba2134c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 12:31:38 +0000 Subject: [PATCH 395/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.62 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.60 -> To Version 6.13.0-preview.1.62 --- 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 252e05f4c2f9..9fdbce7ea673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 - + https://github.com/nuget/nuget.client - 4f24d6d51798557a1c54b4aad71389a08af94cfd + ce95a567627472f8abd9d155047392e22142ff72 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 56f80e57bf67..c72765480454 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,18 +154,18 @@ - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 - 6.13.0-preview.1.60 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 + 6.13.0-preview.1.62 From 79993f15f8323cc7e3e89d303bd0ca9cd9cd804f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 13:47:18 +0000 Subject: [PATCH 396/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241112.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.24559.2 -> To Version 9.0.0-beta.24562.2 --- NuGet.config | 4 ---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7da16b0568f..0994edd55783 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5576ecaf1c8f..2e7a05a1899e 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 - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 - + https://github.com/dotnet/sourcelink - bb76840309871e5812f911b44eccc3b648e2c3d2 + 4e751513abaad9c7b51fb411fa44ee2f8480a183 diff --git a/eng/Versions.props b/eng/Versions.props index bb15e7c282f6..02658e3af6cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 - 9.0.0-beta.24561.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 + 9.0.0-beta.24562.2 From 38dd7569891014be6a72ac24ee9775b6f69b91ca Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 13 Nov 2024 08:36:50 -0600 Subject: [PATCH 397/702] Revert "Update triggers for SB sdk diff and license scan pipelines" (#43011) (#44832) --- .../content/eng/pipelines/source-build-sdk-diff-tests.yml | 1 - src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 32138d40a023..3a1c9be677c5 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -18,7 +18,6 @@ resources: branches: include: - refs/heads/release/*.0.1xx-preview* - - refs/heads/release/9.0.1xx - refs/heads/internal/release/*.0.1xx* pr: none diff --git a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml index 98d54c594eb1..ee2880395698 100644 --- a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml @@ -9,7 +9,6 @@ schedules: include: - main - release/*.0.1xx-preview* - - release/9.0.1xx - internal/release/*.0.1xx* pr: none @@ -20,7 +19,6 @@ trigger: include: - main - release/*.0.1xx-preview* - - release/9.0.1xx - internal/release/*.0.1xx* paths: include: From fb7e80ca6aed8df008b82a039a9be299623f735f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 13 Nov 2024 07:20:43 -0800 Subject: [PATCH 398/702] .NET 9 GA, MAUI baseline manifests These are the GA versions live on NuGet.org for .NET 9. --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d55967e3b24b..4a4aa505de27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -325,13 +325,13 @@ 8.0.100 8.2.2 - 9.0.100-rc.2 - 9.0.0-rc.2.24503.2 - 35.0.0-rc.2.152 - 18.0.9600-net9-rc2 - 18.0.9600-net9-rc2 - 15.0.9600-net9-rc2 - 18.0.9600-net9-rc2 + 9.0.100 + 9.0.0 + 35.0.7 + 18.0.9617 + 18.0.9617 + 15.0.9617 + 18.0.9617 9.0.0-rtm.24515.1 9.0.0 From 1ee15b60b80fbcf6bdbabfbe67c0d435aee251dc Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Nov 2024 09:25:44 -0800 Subject: [PATCH 399/702] revert the templating nuget.config change --- NuGet.config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 369fb65f17c8..3aa831ad45b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,12 +20,7 @@ - - - - - - + From 845d62451dbd5d87d3be22c78894f2a45d8ca29f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 13 Nov 2024 11:07:27 -0800 Subject: [PATCH 400/702] Fix images used for helix tests in CI --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3ef040d53ce7..7cd6e7e314dc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -97,7 +97,7 @@ extends: parameters: pool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2022.amd64 os: windows helixTargetQueue: windows.amd64.vs2022.pre oneESCompat: From 41e6a111fdcf1e23181ac47e2654104f76d21c51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 22:44:39 +0000 Subject: [PATCH 401/702] Update dependencies from https://github.com/dotnet/razor build 20241113.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24563.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e20dc0884489..cf90866df843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 2479b5e55f420ac8c9325e5bf266677f01322a82 + ade9db7be3403b158dace09321017339705d870a - + https://github.com/dotnet/razor - 2479b5e55f420ac8c9325e5bf266677f01322a82 + ade9db7be3403b158dace09321017339705d870a - + https://github.com/dotnet/razor - 2479b5e55f420ac8c9325e5bf266677f01322a82 + ade9db7be3403b158dace09321017339705d870a - + https://github.com/dotnet/razor - 2479b5e55f420ac8c9325e5bf266677f01322a82 + ade9db7be3403b158dace09321017339705d870a diff --git a/eng/Versions.props b/eng/Versions.props index fe4a1585b23e..825a3c3398fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24562.3 - 9.0.0-preview.24562.3 - 9.0.0-preview.24562.3 + 9.0.0-preview.24563.1 + 9.0.0-preview.24563.1 + 9.0.0-preview.24563.1 From 97e8330bddfd9801894ce53b2e50c2c572914076 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 13 Nov 2024 17:32:49 -0800 Subject: [PATCH 402/702] Fix failing tests using "UseUwp" --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 6c3dac9ca3f5..46f9c2a07fa5 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -463,6 +463,7 @@ public void ItWarnsWhenBuildingAProjectWithUseUwpProperty() TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -484,6 +485,7 @@ public void ItErrorsWhenTargetingBelowNet6WithUseUwpProperty() TargetFrameworks = "netstandard2.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -505,6 +507,7 @@ public void ItErrorsWhenTransitivelyReferencingWindowsUIXamlReferencesWithoutUse TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProjectA.AdditionalProperties["UseUwp"] = "true"; + testProjectA.AdditionalProperties["UseUwpTools"] = "false"; TestProject testProjectB = new() { @@ -579,6 +582,7 @@ public void ItBuildsWhenReferencingWindowsUIXamlTypesWithUseUwpProperty() } }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; // Temporary until new projections flow to tests testProject.AdditionalProperties["WindowsSdkPackageVersion"] = "10.0.22621.39"; From c3ae10cbd093da50c079271e5b10f06fd184d77a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 03:59:50 +0000 Subject: [PATCH 403/702] Update dependencies from https://github.com/dotnet/msbuild build 20241114.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24564-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23dbc338a4dd..75efe54d2b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - c49eee220014b0041bb9fb8989b0d8c5be51af08 + c8c3407ccf8a2b69b936595a1b31b3a996162a6a - + https://github.com/dotnet/msbuild - c49eee220014b0041bb9fb8989b0d8c5be51af08 + c8c3407ccf8a2b69b936595a1b31b3a996162a6a - + https://github.com/dotnet/msbuild - c49eee220014b0041bb9fb8989b0d8c5be51af08 + c8c3407ccf8a2b69b936595a1b31b3a996162a6a diff --git a/eng/Versions.props b/eng/Versions.props index 1f55d0d62d81..162d83170837 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24563-01 - 17.13.0-preview-24563-01 + 17.13.0-preview-24564-01 + 17.13.0-preview-24564-01 17.11.4 17.12 From f6af8f89b393286d82d445690310cbd578fbb039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 04:05:30 +0000 Subject: [PATCH 404/702] Update dependencies from https://github.com/dotnet/msbuild build 20241114.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24564-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75efe54d2b1d..e32281d31b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - c8c3407ccf8a2b69b936595a1b31b3a996162a6a + 4a6306491b49be676ded2a43c1e4557785772517 - + https://github.com/dotnet/msbuild - c8c3407ccf8a2b69b936595a1b31b3a996162a6a + 4a6306491b49be676ded2a43c1e4557785772517 - + https://github.com/dotnet/msbuild - c8c3407ccf8a2b69b936595a1b31b3a996162a6a + 4a6306491b49be676ded2a43c1e4557785772517 diff --git a/eng/Versions.props b/eng/Versions.props index 162d83170837..909365499ea7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24564-01 - 17.13.0-preview-24564-01 + 17.13.0-preview-24564-02 + 17.13.0-preview-24564-02 17.11.4 17.12 From 8f2ff0f6dbf01e7ef8f883e01c9895b841093885 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 09:20:10 +0000 Subject: [PATCH 405/702] Update dependencies from https://github.com/dotnet/test-templates build 20241114.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24561.1 -> To Version 1.1.0-rtm.24564.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 252e05f4c2f9..fa6db08d7cb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 282a2113ba98fd9c9dc18021d5c79d446ef7d45d + 9f284e00c920d6ffc37a9efe35838b8730076098 - + https://github.com/dotnet/test-templates - 282a2113ba98fd9c9dc18021d5c79d446ef7d45d + 9f284e00c920d6ffc37a9efe35838b8730076098 diff --git a/eng/Versions.props b/eng/Versions.props index 56f80e57bf67..27dc6422f002 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24561.1 + 1.1.0-rtm.24564.1 From 5acc99b332de800496549127afb1ded68aa2b8c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 09:20:11 +0000 Subject: [PATCH 406/702] Update dependencies from https://github.com/dotnet/test-templates build 20241114.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24561.1 -> To Version 1.1.0-rtm.24564.1 --- NuGet.config | 4 ---- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7da16b0568f..0994edd55783 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 202d07504e98..2efd1960830d 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 - 282a2113ba98fd9c9dc18021d5c79d446ef7d45d + 9f284e00c920d6ffc37a9efe35838b8730076098 - + https://github.com/dotnet/test-templates - 282a2113ba98fd9c9dc18021d5c79d446ef7d45d + 9f284e00c920d6ffc37a9efe35838b8730076098 diff --git a/eng/Versions.props b/eng/Versions.props index d55967e3b24b..272c65ad4a4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24561.1 + 1.1.0-rtm.24564.1 From 43bdf1b236b3ce800877590afaf1879e938fd734 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 14:15:13 +0000 Subject: [PATCH 407/702] 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 8b2cc44fbc0c..c8cc1c404232 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,31 +18,17 @@ - - - - - - - - - - - - - - @@ -70,7 +55,6 @@ - @@ -86,21 +70,8 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0641b805899..4f04e67b499d 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 98a4a7c5f2cb..b28b422ab861 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.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 2210c16a20e7c77540e73cb665498cf26786cc30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 14:31:31 +0000 Subject: [PATCH 408/702] 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 1ebc04c796fe107eacb75cb77e0a8bb153b005e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 14:45:40 +0000 Subject: [PATCH 409/702] Update dependencies from https://github.com/dotnet/arcade build 20241112.13 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13 --- NuGet.config | 4 ---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7da16b0568f..0994edd55783 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 202d07504e98..10676150905a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de diff --git a/eng/Versions.props b/eng/Versions.props index d55967e3b24b..bd7eff3f9dd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -286,10 +286,10 @@ - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 diff --git a/global.json b/global.json index d2eb21c71695..21f2755cb612 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From c426042a76d971d1e46902255c6e02eb1927c48d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Nov 2024 10:04:10 -0800 Subject: [PATCH 410/702] Update to the GA SDK to try to fix the windows SDK error --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index d2eb21c71695..d7f1244344d8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" From cd95eddc6139ce35027045f80f355ffe54e24e68 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 11 Nov 2024 19:08:41 -0800 Subject: [PATCH 411/702] Update Windows SDK projection --- eng/ManualVersions.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index e0f285d96bdc..9b67e035d26a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,20 +9,20 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.54 - 10.0.18362.54 - 10.0.19041.54 - 10.0.20348.54 - 10.0.22000.54 - 10.0.22621.54 - 10.0.26100.54 - 10.0.17763.52 - 10.0.18362.52 - 10.0.19041.52 - 10.0.20348.52 - 10.0.22000.52 - 10.0.22621.52 - 10.0.26100.52 + 10.0.17763.57 + 10.0.18362.57 + 10.0.19041.57 + 10.0.20348.57 + 10.0.22000.57 + 10.0.22621.57 + 10.0.26100.57 + 10.0.17763.55 + 10.0.18362.55 + 10.0.19041.55 + 10.0.20348.55 + 10.0.22000.55 + 10.0.22621.55 + 10.0.26100.55 From f1042e982ace4901445cb9a64363079d572f9eb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 01:31:25 +0000 Subject: [PATCH 412/702] Update dependencies from https://github.com/dotnet/razor build 20241114.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24564.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf90866df843..578cf84d21b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - ade9db7be3403b158dace09321017339705d870a + 991f32755a7306297b6b226daa35b686207ea61c - + https://github.com/dotnet/razor - ade9db7be3403b158dace09321017339705d870a + 991f32755a7306297b6b226daa35b686207ea61c - + https://github.com/dotnet/razor - ade9db7be3403b158dace09321017339705d870a + 991f32755a7306297b6b226daa35b686207ea61c - + https://github.com/dotnet/razor - ade9db7be3403b158dace09321017339705d870a + 991f32755a7306297b6b226daa35b686207ea61c diff --git a/eng/Versions.props b/eng/Versions.props index 825a3c3398fe..f98074a5af45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24563.1 - 9.0.0-preview.24563.1 - 9.0.0-preview.24563.1 + 9.0.0-preview.24564.1 + 9.0.0-preview.24564.1 + 9.0.0-preview.24564.1 From d93987234a3d21007ef25e8b6c9cc51c5b598b7c Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Fri, 15 Nov 2024 09:04:34 +0100 Subject: [PATCH 413/702] Set BuildWithNetFrameworkHostedCompiler=true --- .../BlazorLegacyIntegrationTest60.cs | 2 +- .../BuildWithComponentsIntegrationTest.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs index bf1ca6f53949..5e23d2946d45 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs @@ -54,7 +54,7 @@ public void Publish60Hosted_Works() ProjectDirectory = CreateAspNetSdkTestAsset(testAsset); var publish = CreatePublishCommand(ProjectDirectory, "Server"); - ExecuteCommand(publish) + ExecuteCommand(publish, "/p:BuildWithNetFrameworkHostedCompiler=true") .Should() .Pass() .And.NotHaveStdOutContaining("warning IL"); diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs index b93cec570764..1feb0fed8adf 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs @@ -40,7 +40,7 @@ private void Build_ComponentsWorks([CallerMemberName] string callerName = "") var projectDirectory = CreateAspNetSdkTestAsset(testAsset, callerName); var build = new BuildCommand(projectDirectory); - build.Execute().Should().Pass(); + build.Execute("/p:BuildWithNetFrameworkHostedCompiler=true").Should().Pass(); string outputPath = build.GetOutputDirectory(DefaultTfm).ToString(); From 70e80c53c1efc4457af2dfd9a407310373b2a028 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Fri, 15 Nov 2024 00:39:33 -0800 Subject: [PATCH 414/702] Remove extra lines --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2648e3dc7f45..3aa831ad45b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,6 @@ - - From febd4625a21783550354d64b89476c7842bfe3c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 09:02:36 +0000 Subject: [PATCH 415/702] Update dependencies from https://github.com/dotnet/templating build 20241115.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.101-servicing.24556.3 -> To Version 9.0.101-servicing.24565.1 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa831ad45b1..de7d8008faff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - + - @@ -50,13 +46,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db63491b0747..4f41582a9add 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - b699ff195f37e5039d378be3be64ccf7512df50a + 4a1c74ee735ce30e3483e29c969b842f72fae6cb - + https://github.com/dotnet/templating - b699ff195f37e5039d378be3be64ccf7512df50a + 4a1c74ee735ce30e3483e29c969b842f72fae6cb - + https://github.com/dotnet/templating - b699ff195f37e5039d378be3be64ccf7512df50a + 4a1c74ee735ce30e3483e29c969b842f72fae6cb diff --git a/eng/Versions.props b/eng/Versions.props index 840f869b5273..24e907745fe5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -209,7 +209,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.101-servicing.24556.3 + 9.0.101-servicing.24565.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 604618d8fbd933a2d48c2da3540b869c250ad9a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 09:24:08 +0000 Subject: [PATCH 416/702] Update dependencies from https://github.com/dotnet/razor build 20241115.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24565.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 578cf84d21b6..8d4fb1fef21e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 991f32755a7306297b6b226daa35b686207ea61c + e85c2f885eef2c9c275d00712d4d8a327e3d5b99 - + https://github.com/dotnet/razor - 991f32755a7306297b6b226daa35b686207ea61c + e85c2f885eef2c9c275d00712d4d8a327e3d5b99 - + https://github.com/dotnet/razor - 991f32755a7306297b6b226daa35b686207ea61c + e85c2f885eef2c9c275d00712d4d8a327e3d5b99 - + https://github.com/dotnet/razor - 991f32755a7306297b6b226daa35b686207ea61c + e85c2f885eef2c9c275d00712d4d8a327e3d5b99 diff --git a/eng/Versions.props b/eng/Versions.props index f98074a5af45..5c060c76a0bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24564.1 - 9.0.0-preview.24564.1 - 9.0.0-preview.24564.1 + 9.0.0-preview.24565.1 + 9.0.0-preview.24565.1 + 9.0.0-preview.24565.1 From 09be0ab1d1f06f6f8555cf99d2f072805c0e172b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 09:51:32 +0000 Subject: [PATCH 417/702] Update dependencies from https://github.com/dotnet/templating build 20241115.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.101-servicing.24556.3 -> To Version 9.0.101-servicing.24565.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 de7d8008faff..3da372c869d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f41582a9add..84963ff031d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 4a1c74ee735ce30e3483e29c969b842f72fae6cb + e660cd905cc907f7167c0826e2c30eb57a87e4da - + https://github.com/dotnet/templating - 4a1c74ee735ce30e3483e29c969b842f72fae6cb + e660cd905cc907f7167c0826e2c30eb57a87e4da - + https://github.com/dotnet/templating - 4a1c74ee735ce30e3483e29c969b842f72fae6cb + e660cd905cc907f7167c0826e2c30eb57a87e4da diff --git a/eng/Versions.props b/eng/Versions.props index 24e907745fe5..24766271537e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -209,7 +209,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.101-servicing.24565.1 + 9.0.101-servicing.24565.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3c6c645491585d9f64c5f5d58ba2298bf449eaec Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Nov 2024 11:45:02 -0800 Subject: [PATCH 418/702] Fix failing tests because of "UseUwpTools" property (#44859) --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 6c3dac9ca3f5..46f9c2a07fa5 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -463,6 +463,7 @@ public void ItWarnsWhenBuildingAProjectWithUseUwpProperty() TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -484,6 +485,7 @@ public void ItErrorsWhenTargetingBelowNet6WithUseUwpProperty() TargetFrameworks = "netstandard2.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -505,6 +507,7 @@ public void ItErrorsWhenTransitivelyReferencingWindowsUIXamlReferencesWithoutUse TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProjectA.AdditionalProperties["UseUwp"] = "true"; + testProjectA.AdditionalProperties["UseUwpTools"] = "false"; TestProject testProjectB = new() { @@ -579,6 +582,7 @@ public void ItBuildsWhenReferencingWindowsUIXamlTypesWithUseUwpProperty() } }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; // Temporary until new projections flow to tests testProject.AdditionalProperties["WindowsSdkPackageVersion"] = "10.0.22621.39"; From 90a42462be16b4a71fbc2c44faa7a1cfc5d09035 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 13:23:40 +0000 Subject: [PATCH 419/702] Update dependencies from https://github.com/dotnet/templating build 20241115.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.308-servicing.24556.1 -> To Version 8.0.308-servicing.24565.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 c8cc1c404232..6a911019bf6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f04e67b499d..52e4c21444cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 50b07cbd3a4e656f7a9099872efbbe292db5e05a + dfb7edc7ef4de70574d68009fa9005303f4afa48 - + https://github.com/dotnet/templating - 50b07cbd3a4e656f7a9099872efbbe292db5e05a + dfb7edc7ef4de70574d68009fa9005303f4afa48 - + https://github.com/dotnet/templating - 50b07cbd3a4e656f7a9099872efbbe292db5e05a + dfb7edc7ef4de70574d68009fa9005303f4afa48 diff --git a/eng/Versions.props b/eng/Versions.props index b28b422ab861..cadcfe8e5e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.308-servicing.24556.1 + 8.0.308-servicing.24565.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 51c05ea709e6d2cf57e4d783c74c9f58d93805ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 13:28:36 +0000 Subject: [PATCH 420/702] 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 491d5bbf7afd76b9887628676f6bf30e39fc6f69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 16:19:19 +0000 Subject: [PATCH 421/702] Update dependencies from https://github.com/dotnet/msbuild build 20241115.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24565-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e32281d31b1d..59ba004e810e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 4a6306491b49be676ded2a43c1e4557785772517 + 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 - + https://github.com/dotnet/msbuild - 4a6306491b49be676ded2a43c1e4557785772517 + 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 - + https://github.com/dotnet/msbuild - 4a6306491b49be676ded2a43c1e4557785772517 + 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 diff --git a/eng/Versions.props b/eng/Versions.props index 909365499ea7..f57b8fe157eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24564-02 - 17.13.0-preview-24564-02 + 17.13.0-preview-24565-01 + 17.13.0-preview-24565-01 17.11.4 17.12 From a85c33cb8042f5c3bec8baaf3d06c12154d170cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 16:34:48 +0000 Subject: [PATCH 422/702] Update dependencies from https://github.com/dotnet/razor build 20241115.8 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.24523.9 -> To Version 9.0.0-preview.24565.8 --- NuGet.config | 7 ------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa831ad45b1..0994edd55783 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - @@ -50,13 +46,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db63491b0747..f15de3b8d74f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 + 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor - 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 + 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor - 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 + 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 - + https://github.com/dotnet/razor - 8bf9ad1ce4cfc0d77916f8db993e2d7f29b22665 + 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 diff --git a/eng/Versions.props b/eng/Versions.props index 840f869b5273..bb479f600eb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -247,9 +247,9 @@ - 9.0.0-preview.24523.9 - 9.0.0-preview.24523.9 - 9.0.0-preview.24523.9 + 9.0.0-preview.24565.8 + 9.0.0-preview.24565.8 + 9.0.0-preview.24565.8 From 9486b6cba00d32d5b4af29c13343cccf9f978773 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 17:14:14 -0800 Subject: [PATCH 423/702] Update implicit versions Update to 9.0.0 release version --- NuGet.config | 52 +++++++++ eng/Version.Details.xml | 252 ++++++++++++++++++++-------------------- eng/Versions.props | 114 +++++++++--------- 3 files changed, 235 insertions(+), 183 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..74d4d0a82718 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,17 +6,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,10 +69,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252e05f4c2f9..d7c734cd7c14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 44a0b49cb0ae4d3c5400360b5124d451a9c5362e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df + 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/emsdk - 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df + 763d10a1a251be35337ee736832bfde3f9200672 @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/nuget/nuget.client @@ -226,99 +226,99 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 49ab7e335401671d3909153f2ca0dddc6030628d + a04736acb8edb533756131d3d5fc55f15cd03d6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b @@ -339,21 +339,21 @@ f6384a995a7032f50f4e3d07fad1c87e2cd8a560 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/dotnet/test-templates @@ -386,13 +386,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d30c019e3116e813215903d7330ea18e620f8d16 + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 49ab7e335401671d3909153f2ca0dddc6030628d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://github.com/dotnet/xdt @@ -499,89 +499,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -615,9 +615,9 @@ 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 56f80e57bf67..e3a17d8e507c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ 30 32 17 - 35 + 36 20 - 10 + 11 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -92,7 +92,7 @@ - 9.0.0-rc.2.24474.1 + 9.0.0-rtm.24529.1 @@ -103,54 +103,54 @@ - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0-rtm.24528.9 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 2.1.0 - 9.0.0-rc.2.24473.5 + 9.0.0 8.0.0 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.0 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.4 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 + 9.0.0 + 9.0.0 @@ -232,19 +232,19 @@ - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 + 9.0.0 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0 + 9.0.0 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 @@ -254,8 +254,8 @@ - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 @@ -334,7 +334,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rc.2.24468.8 + 9.0.0-rtm.24528.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 642d6de424b030433ddb1209b66cedae9ba3bf3e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 17:34:46 -0800 Subject: [PATCH 424/702] Switch to emsdk stable package version --- NuGet.config | 15 +++++++++++++++ eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74d4d0a82718..47cf47c74848 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,21 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7c734cd7c14..30dbbc939a93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -59,7 +59,7 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk 763d10a1a251be35337ee736832bfde3f9200672 diff --git a/eng/Versions.props b/eng/Versions.props index e3a17d8e507c..39b122332bb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -334,7 +334,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24528.2 + 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From d9cfa04ed8b4ec9e3627ac7ecb44b7d3085d91bb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Nov 2024 15:00:54 -0800 Subject: [PATCH 425/702] Update the version package property for emscripten --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 39b122332bb5..f05a6c6bd803 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -335,7 +335,7 @@ 18.0.9600-net9-rc2 9.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 788b60f65adec5a6840a73085197e36047e79f51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 18:03:43 +0000 Subject: [PATCH 426/702] Update dependencies from https://github.com/dotnet/razor build 20241115.11 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.24558.2 -> To Version 9.0.0-preview.24565.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d4fb1fef21e..cd2cdaf83db4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - e85c2f885eef2c9c275d00712d4d8a327e3d5b99 + 1676deca771d6455d013ffbace9be1bd3b4549dd - + https://github.com/dotnet/razor - e85c2f885eef2c9c275d00712d4d8a327e3d5b99 + 1676deca771d6455d013ffbace9be1bd3b4549dd - + https://github.com/dotnet/razor - e85c2f885eef2c9c275d00712d4d8a327e3d5b99 + 1676deca771d6455d013ffbace9be1bd3b4549dd - + https://github.com/dotnet/razor - e85c2f885eef2c9c275d00712d4d8a327e3d5b99 + 1676deca771d6455d013ffbace9be1bd3b4549dd diff --git a/eng/Versions.props b/eng/Versions.props index 5c060c76a0bf..f0f9074f5109 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24565.1 - 9.0.0-preview.24565.1 - 9.0.0-preview.24565.1 + 9.0.0-preview.24565.11 + 9.0.0-preview.24565.11 + 9.0.0-preview.24565.11 From 07b7c9ee696b56a86b4f28697874d7e83bebc19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 15 Nov 2024 13:42:35 -0800 Subject: [PATCH 427/702] [dotnet-watch] Separate build from run (#44699) --- eng/Versions.props | 4 + .../Aspire/AspireServiceFactory.cs | 9 +- src/BuiltInTools/dotnet-watch/FileItem.cs | 6 +- .../dotnet-watch/Filters/BuildEvaluator.cs | 3 +- .../HotReload/CompilationHandler.cs | 14 +- .../dotnet-watch/HotReload/ProjectLauncher.cs | 5 +- .../dotnet-watch/HotReload/ProjectNodeMap.cs | 1 + .../dotnet-watch/HotReload/RunningProject.cs | 3 +- .../dotnet-watch/HotReloadDotNetWatcher.cs | 225 ++++++++++++++---- .../dotnet-watch/Internal/FileWatcher.cs | 8 +- .../dotnet-watch/Internal/IReporter.cs | 3 +- .../Internal/MsBuildFileSetFactory.cs | 28 +-- .../dotnet-watch/Internal/PhysicalConsole.cs | 3 +- .../Properties/launchSettings.json | 9 +- .../dotnet-watch/Utilities/BuildUtilities.cs | 48 ++++ .../Microsoft.NET.TestFramework.csproj | 4 +- test/Microsoft.NET.TestFramework/TestAsset.cs | 32 +-- .../WatchAspire.AppHost.csproj | 7 +- .../WatchAspire.ServiceDefaults.csproj | 4 +- .../HotReload/ApplyDeltaTests.cs | 71 +++++- .../HotReload/RuntimeProcessLauncherTests.cs | 9 +- .../MSBuildEvaluationFilterTest.cs | 12 +- .../Utilities/TestReporter.cs | 3 + .../Watch/GlobbingAppTests.cs | 2 +- .../Watch/Utilities/WatchableApp.cs | 7 +- 25 files changed, 375 insertions(+), 145 deletions(-) create mode 100644 src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs diff --git a/eng/Versions.props b/eng/Versions.props index 56f80e57bf67..6a63bf4783c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,6 +90,10 @@ 1.1.0-beta.24367.3 + + + 9.1.0-preview.1.24555.3 + 9.0.0-rc.2.24474.1 diff --git a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs index 77f472fa9b25..62bb5c073c1a 100644 --- a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs @@ -104,11 +104,11 @@ async ValueTask IAspireServerEvents.StartProjectAsync(string dcpId, Proj var projectOptions = GetProjectOptions(projectLaunchInfo); var sessionId = Interlocked.Increment(ref _sessionIdDispenser).ToString(CultureInfo.InvariantCulture); - await StartProjectAsync(dcpId, sessionId, projectOptions, build: false, isRestart: false, cancellationToken); + await StartProjectAsync(dcpId, sessionId, projectOptions, isRestart: false, cancellationToken); return sessionId; } - public async ValueTask StartProjectAsync(string dcpId, string sessionId, ProjectOptions projectOptions, bool build, bool isRestart, CancellationToken cancellationToken) + public async ValueTask StartProjectAsync(string dcpId, string sessionId, ProjectOptions projectOptions, bool isRestart, CancellationToken cancellationToken) { ObjectDisposedException.ThrowIf(_isDisposed, this); @@ -125,9 +125,8 @@ public async ValueTask StartProjectAsync(string dcpId, string se var writeResult = outputChannel.Writer.TryWrite(line); Debug.Assert(writeResult); }, - restartOperation: (build, cancellationToken) => - StartProjectAsync(dcpId, sessionId, projectOptions, build, isRestart: true, cancellationToken), - build: build, + restartOperation: cancellationToken => + StartProjectAsync(dcpId, sessionId, projectOptions, isRestart: true, cancellationToken), cancellationToken); if (runningProject == null) diff --git a/src/BuiltInTools/dotnet-watch/FileItem.cs b/src/BuiltInTools/dotnet-watch/FileItem.cs index 7fc91cd6fa1c..45caba204f7b 100644 --- a/src/BuiltInTools/dotnet-watch/FileItem.cs +++ b/src/BuiltInTools/dotnet-watch/FileItem.cs @@ -7,12 +7,14 @@ namespace Microsoft.DotNet.Watcher { internal readonly record struct FileItem { - public string FilePath { get; init; } + public required string FilePath { get; init; } /// /// List of all projects that contain this file (does not contain duplicates). + /// Empty if is and the + /// item has not been assigned to a project yet. /// - public List ContainingProjectPaths { get; init; } + public required List ContainingProjectPaths { get; init; } public string? StaticWebAssetPath { get; init; } diff --git a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs index 24a1713fa14d..e96515567666 100644 --- a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs +++ b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using Microsoft.DotNet.Watcher.Internal; +using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools { @@ -87,7 +88,7 @@ private async ValueTask CreateEvaluationResult(CancellationTok await FileWatcher.WaitForFileChangeAsync( rootProjectFileSetFactory.RootProjectFile, context.Reporter, - startedWatching: () => context.Reporter.Warn("Fix the error to continue or press Ctrl+C to exit."), + startedWatching: () => context.Reporter.Report(MessageDescriptor.FixBuildError), cancellationToken); } } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index a3e26556b869..c7da8886806a 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -74,7 +74,7 @@ public async ValueTask TerminateNonRootProcessesAndDispose(CancellationToken can Dispose(); } - public ValueTask RestartSessionAsync(IReadOnlySet projectsToBeRebuilt, CancellationToken cancellationToken) + public ValueTask RestartSessionAsync(ImmutableDictionary projectsToBeRebuilt, CancellationToken cancellationToken) { // Remove previous updates to all modules that were affected by rude edits. // All running projects that statically reference these modules have been terminated. @@ -84,7 +84,7 @@ public ValueTask RestartSessionAsync(IReadOnlySet projectsToBeRebuilt lock (_runningProjectsAndUpdatesGuard) { - _previousUpdates = _previousUpdates.RemoveAll(update => projectsToBeRebuilt.Contains(update.ProjectId)); + _previousUpdates = _previousUpdates.RemoveAll(update => projectsToBeRebuilt.ContainsKey(update.ProjectId)); } _hotReloadService.EndSession(); @@ -276,7 +276,7 @@ private static void PrepareCompilations(Solution solution, string projectPath, C } } - public async ValueTask<(IReadOnlySet projectsToBeRebuilt, IEnumerable terminatedProjects)> HandleFileChangesAsync( + public async ValueTask<(ImmutableDictionary projectsToRebuild, ImmutableArray terminatedProjects)> HandleFileChangesAsync( Func, CancellationToken, Task> restartPrompt, CancellationToken cancellationToken) { @@ -292,14 +292,14 @@ private static void PrepareCompilations(Solution solution, string projectPath, C { // If Hot Reload is blocked (due to compilation error) we ignore the current // changes and await the next file change. - return (ImmutableHashSet.Empty, []); + return (ImmutableDictionary.Empty, []); } if (updates.Status == ModuleUpdateStatus.RestartRequired) { if (!anyProcessNeedsRestart) { - return (ImmutableHashSet.Empty, []); + return (ImmutableDictionary.Empty, []); } await restartPrompt.Invoke(updates.ProjectsToRestart, cancellationToken); @@ -308,7 +308,7 @@ private static void PrepareCompilations(Solution solution, string projectPath, C // except for the root process, which will terminate later on. var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectsToRestart.Select(p => p.FilePath!), cancellationToken); - return (updates.ProjectsToRebuild.Select(p => p.Id).ToHashSet(), terminatedProjects); + return (updates.ProjectsToRebuild.ToImmutableDictionary(keySelector: p => p.Id, elementSelector: p => p.FilePath!), terminatedProjects); } Debug.Assert(updates.Status == ModuleUpdateStatus.Ready); @@ -348,7 +348,7 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT } }, cancellationToken); - return (ImmutableHashSet.Empty, []); + return (ImmutableDictionary.Empty, []); } private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates updates, CancellationToken cancellationToken) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs index 44ce6ccee578..81e9915e4445 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs @@ -31,7 +31,6 @@ public EnvironmentOptions EnvironmentOptions CancellationTokenSource processTerminationSource, Action? onOutput, RestartOperation restartOperation, - bool build, CancellationToken cancellationToken) { var projectNode = projectMap.TryGetProjectNode(projectOptions.ProjectPath, projectOptions.TargetFramework); @@ -58,9 +57,7 @@ public EnvironmentOptions EnvironmentOptions Executable = EnvironmentOptions.MuxerPath, WorkingDirectory = projectOptions.WorkingDirectory, OnOutput = onOutput, - Arguments = build || !CommandLineOptions.IsCodeExecutionCommand(projectOptions.Command) - ? [projectOptions.Command, .. projectOptions.CommandArguments] - : [projectOptions.Command, "--no-build", .. projectOptions.CommandArguments] + Arguments = [projectOptions.Command, "--no-build", .. projectOptions.CommandArguments] }; var environmentBuilder = EnvironmentVariablesBuilder.FromCurrentEnvironment(); diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs index d84046666ccf..08ae16922305 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs @@ -11,6 +11,7 @@ internal readonly struct ProjectNodeMap(ProjectGraph graph, IReporter reporter) { public readonly ProjectGraph Graph = graph; + // full path of proj file to list of nodes representing all target frameworks of the project: public readonly IReadOnlyDictionary> Map = graph.ProjectNodes.GroupBy(n => n.ProjectInstance.FullPath).ToDictionary( keySelector: static g => g.Key, diff --git a/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs b/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs index 99b04b828a63..a4a94cf08591 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Watcher.Tools { - internal delegate ValueTask RestartOperation(bool build, CancellationToken cancellationToken); + internal delegate ValueTask RestartOperation(CancellationToken cancellationToken); internal sealed class RunningProject( ProjectGraphNode projectNode, @@ -68,7 +68,6 @@ public void Dispose() public async ValueTask WaitForProcessRunningAsync(CancellationToken cancellationToken) { await DeltaApplier.WaitForProcessRunningAsync(cancellationToken); - Reporter.Report(MessageDescriptor.BuildCompleted); } } } diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 06748f0f0aa7..f5eb2f29fb6b 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -3,13 +3,16 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Text.RegularExpressions; +using Microsoft.CodeAnalysis; +using Microsoft.DotNet.Watch; using Microsoft.DotNet.Watcher.Internal; using Microsoft.DotNet.Watcher.Tools; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher { - internal sealed class HotReloadDotNetWatcher : Watcher + internal sealed partial class HotReloadDotNetWatcher : Watcher { private static readonly DateTime s_fileNotExistFileTime = DateTime.FromFileTime(0); @@ -120,12 +123,18 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke }; } + if (!await BuildProjectAsync(rootProjectOptions.ProjectPath, rootProjectOptions.BuildArguments, iterationCancellationToken)) + { + // error has been reported: + waitForFileChangeBeforeRestarting = false; + return; + } + rootRunningProject = await projectLauncher.TryLaunchProcessAsync( rootProjectOptions, rootProcessTerminationSource, onOutput: null, - restartOperation: new RestartOperation((_, _) => throw new InvalidOperationException("Root project shouldn't be restarted")), - build: true, + restartOperation: new RestartOperation(_ => throw new InvalidOperationException("Root project shouldn't be restarted")), iterationCancellationToken); if (rootRunningProject == null) @@ -221,46 +230,12 @@ void FileChangedCallback(string path, ChangeKind kind) break; } - var changedFiles = Interlocked.Exchange(ref changedFilesAccumulator, []); + var changedFiles = await CaptureChangedFilesSnapshot(rebuiltProjects: null); if (changedFiles is []) { continue; } - // When a new file is added we need to run design-time build to find out - // what kind of the file it is and which project(s) does it belong to (can be linked, web asset, etc.). - // We don't need to rebuild and restart the application though. - if (changedFiles.Any(f => f.Change is ChangeKind.Add)) - { - Context.Reporter.Verbose("File addition triggered re-evaluation."); - - evaluationResult = await EvaluateRootProjectAsync(iterationCancellationToken); - - // additional directories may have been added: - fileWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); - - await compilationHandler.Workspace.UpdateProjectConeAsync(RootFileSetFactory.RootProjectFile, iterationCancellationToken); - - if (shutdownCancellationToken.IsCancellationRequested) - { - // Ctrl+C: - return; - } - - // update files in the change set with new evaluation info: - changedFiles = changedFiles.Select(f => evaluationResult.Files.TryGetValue(f.Item.FilePath, out var evaluatedFile) ? f with { Item = evaluatedFile } : f) - .ToImmutableList(); - - ReportFileChanges(changedFiles); - } - else - { - ReportFileChanges(changedFiles); - - // update the workspace to reflect changes in the file content: - await compilationHandler.Workspace.UpdateFileContentAsync(changedFiles, iterationCancellationToken); - } - HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.Main); var stopwatch = Stopwatch.StartNew(); @@ -274,7 +249,7 @@ void FileChangedCallback(string path, ChangeKind kind) HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.CompilationHandler); - var (projectsToBeRebuilt, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projects, cancellationToken) => + var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projects, cancellationToken) => { if (_rudeEditRestartPrompt != null) { @@ -329,24 +304,141 @@ void FileChangedCallback(string path, ChangeKind kind) break; } - if (projectsToRestart.Any()) + if (projectsToRebuild.Count > 0) + { + while (true) + { + iterationCancellationToken.ThrowIfCancellationRequested(); + + // pause accumulating file changes during build: + fileWatcher.OnFileChange -= fileChangedCallback; + try + { + var buildResults = await Task.WhenAll( + projectsToRebuild.Values.Select(projectPath => BuildProjectAsync(projectPath, rootProjectOptions.BuildArguments, iterationCancellationToken))); + + if (buildResults.All(success => success)) + { + break; + } + } + finally + { + fileWatcher.OnFileChange += fileChangedCallback; + } + + iterationCancellationToken.ThrowIfCancellationRequested(); + + _ = await fileWatcher.WaitForFileChangeAsync( + startedWatching: () => Context.Reporter.Report(MessageDescriptor.FixBuildError), + shutdownCancellationToken); + } + + // Update build completion time, so that file changes caused by the rebuild do not affect our file watcher: + buildCompletionTime = DateTime.UtcNow; + + // Changes made since last snapshot of the accumulator shouldn't be included in next Hot Reload update. + // Apply them to the workspace. + _ = await CaptureChangedFilesSnapshot(projectsToRebuild); + + // Restart session to capture new baseline that reflects the changes to the restarted projects. + await compilationHandler.RestartSessionAsync(projectsToRebuild, iterationCancellationToken); + } + + if (projectsToRestart is not []) { - // Restart all terminated child processes and wait until their build completes: await Task.WhenAll( projectsToRestart.Select(async runningProject => { - var newRunningProject = await runningProject.RestartOperation(build: true, shutdownCancellationToken); - runningProject.Dispose(); - await newRunningProject.WaitForProcessRunningAsync(shutdownCancellationToken); + var newRunningProject = await runningProject.RestartOperation(shutdownCancellationToken); + + try + { + await newRunningProject.WaitForProcessRunningAsync(shutdownCancellationToken); + } + catch (OperationCanceledException) when (!shutdownCancellationToken.IsCancellationRequested) + { + // Process might have exited while we were trying to communicate with it. + } + finally + { + runningProject.Dispose(); + } })) .WaitAsync(shutdownCancellationToken); + } - // Update build completion time, so that file changes caused by the rebuild do not affect our file watcher: - buildCompletionTime = DateTime.UtcNow; - changedFilesAccumulator = []; + async Task> CaptureChangedFilesSnapshot(ImmutableDictionary? rebuiltProjects) + { + var changedFiles = Interlocked.Exchange(ref changedFilesAccumulator, []); + if (changedFiles is []) + { + return []; + } - // Restart session to capture new baseline that reflects the changes to the restarted projects. - await compilationHandler.RestartSessionAsync(projectsToBeRebuilt, iterationCancellationToken); + // When a new file is added we need to run design-time build to find out + // what kind of the file it is and which project(s) does it belong to (can be linked, web asset, etc.). + // We don't need to rebuild and restart the application though. + var hasAddedFile = changedFiles.Any(f => f.Change is ChangeKind.Add); + + if (hasAddedFile) + { + Context.Reporter.Verbose("File addition triggered re-evaluation."); + + evaluationResult = await EvaluateRootProjectAsync(iterationCancellationToken); + + // additional directories may have been added: + fileWatcher.WatchContainingDirectories(evaluationResult.Files.Keys); + + await compilationHandler.Workspace.UpdateProjectConeAsync(RootFileSetFactory.RootProjectFile, iterationCancellationToken); + + if (shutdownCancellationToken.IsCancellationRequested) + { + // Ctrl+C: + return []; + } + + // Update files in the change set with new evaluation info. + changedFiles = changedFiles + .Select(f => evaluationResult.Files.TryGetValue(f.Item.FilePath, out var evaluatedFile) ? f with { Item = evaluatedFile } : f) + .ToImmutableList(); + } + + if (rebuiltProjects != null) + { + // Filter changed files down to those contained in projects being rebuilt. + // File changes that affect projects that are not being rebuilt will stay in the accumulator + // and be included in the next Hot Reload change set. + var rebuiltProjectPaths = rebuiltProjects.Values.ToHashSet(); + + var newAccumulator = ImmutableList.Empty; + var newChangedFiles = ImmutableList.Empty; + + foreach (var file in changedFiles) + { + if (file.Item.ContainingProjectPaths.All(containingProjectPath => rebuiltProjectPaths.Contains(containingProjectPath))) + { + newChangedFiles = newChangedFiles.Add(file); + } + else + { + newAccumulator = newAccumulator.Add(file); + } + } + + changedFiles = newChangedFiles; + ImmutableInterlocked.Update(ref changedFilesAccumulator, accumulator => accumulator.AddRange(newAccumulator)); + } + + ReportFileChanges(changedFiles); + + if (!hasAddedFile) + { + // update the workspace to reflect changes in the file content: + await compilationHandler.Workspace.UpdateFileContentAsync(changedFiles, iterationCancellationToken); + } + + return changedFiles; } } } @@ -432,7 +524,6 @@ private async ValueTask WaitForFileChangeBeforeRestarting(FileWatcher fileWatche fileWatcher.WatchContainingDirectories([RootFileSetFactory.RootProjectFile]); _ = await fileWatcher.WaitForFileChangeAsync( - (path, change) => new ChangedFile(new FileItem() { FilePath = path }, change), startedWatching: () => Context.Reporter.Report(MessageDescriptor.WaitingForFileChangeBeforeRestarting), cancellationToken); } @@ -496,7 +587,7 @@ private async ValueTask WaitForFileChangeBeforeRestarting(FileWatcher fileWatche if (kind == ChangeKind.Add) { - return new ChangedFile(new FileItem { FilePath = path }, kind); + return new ChangedFile(new FileItem { FilePath = path, ContainingProjectPaths = [] }, kind); } return null; @@ -576,6 +667,38 @@ await FileWatcher.WaitForFileChangeAsync( } } + private async Task BuildProjectAsync(string projectPath, IReadOnlyList buildArguments, CancellationToken cancellationToken) + { + var buildOutput = new List(); + + var processSpec = new ProcessSpec + { + Executable = Context.EnvironmentOptions.MuxerPath, + WorkingDirectory = Path.GetDirectoryName(projectPath)!, + OnOutput = line => + { + lock (buildOutput) + { + buildOutput.Add(line); + } + }, + // pass user-specified build arguments last to override defaults: + Arguments = ["build", projectPath, "-consoleLoggerParameters:NoSummary;Verbosity=minimal", .. buildArguments] + }; + + Context.Reporter.Output($"Building '{projectPath}' ..."); + + var exitCode = await ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: false, launchResult: null, cancellationToken); + BuildUtilities.ReportBuildOutput(Context.Reporter, buildOutput, verboseOutput: exitCode == 0); + + if (exitCode == 0) + { + Context.Reporter.Output("Build succeeded."); + } + + return exitCode == 0; + } + private string GetRelativeFilePath(string path) { var relativePath = path; diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs index 3b9f61208eff..e1513b5a44dd 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs @@ -100,6 +100,12 @@ private void DisposeWatcher(string directory) private static string EnsureTrailingSlash(string path) => (path is [.., var last] && last != Path.DirectorySeparatorChar) ? path + Path.DirectorySeparatorChar : path; + public Task WaitForFileChangeAsync(Action? startedWatching, CancellationToken cancellationToken) + => WaitForFileChangeAsync( + changeFilter: (path, kind) => new ChangedFile(new FileItem() { FilePath = path, ContainingProjectPaths = [] }, kind), + startedWatching, + cancellationToken); + public Task WaitForFileChangeAsync(IReadOnlyDictionary fileSet, Action? startedWatching, CancellationToken cancellationToken) => WaitForFileChangeAsync( changeFilter: (path, kind) => fileSet.TryGetValue(path, out var fileItem) ? new ChangedFile(fileItem, kind) : null, @@ -142,7 +148,7 @@ public static async ValueTask WaitForFileChangeAsync(string filePath, IReporter watcher.WatchDirectories([Path.GetDirectoryName(filePath)!]); var fileChange = await watcher.WaitForFileChangeAsync( - changeFilter: (path, kind) => path == filePath ? new ChangedFile(new FileItem { FilePath = path }, kind) : null, + changeFilter: (path, kind) => path == filePath ? new ChangedFile(new FileItem { FilePath = path, ContainingProjectPaths = [] }, kind) : null, startedWatching, cancellationToken); diff --git a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs index 892d21e5b2e0..b3d3532a89aa 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs @@ -62,9 +62,8 @@ public bool TryGetMessage(string? prefix, object?[] args, [NotNullWhen(true)] ou public static readonly MessageDescriptor KillingProcess = new("Killing process {0}", "⌚", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor HotReloadChangeHandled = new("Hot reload change handled in {0}ms.", "🔥", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor HotReloadSucceeded = new("Hot reload succeeded.", "🔥", MessageSeverity.Output, s_id++); - public static readonly MessageDescriptor BuildCompleted = new("Build completed.", "⌚", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor UpdatesApplied = new("Updates applied: {0} out of {1}.", "🔥", MessageSeverity.Verbose, s_id++); - public static readonly MessageDescriptor WaitingForFileChangeBeforeRestarting = new("Waiting for a file to change before restarting dotnet...", "⏳", MessageSeverity.Warning, s_id++); + public static readonly MessageDescriptor WaitingForFileChangeBeforeRestarting = new("Waiting for a file to change before restarting ...", "⏳", MessageSeverity.Warning, s_id++); public static readonly MessageDescriptor WatchingWithHotReload = new("Watching with Hot Reload.", "⌚", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor RestartInProgress = new("Restart in progress.", "🔄", MessageSeverity.Output, s_id++); public static readonly MessageDescriptor RestartRequested = new("Restart requested.", "🔄", MessageSeverity.Output, s_id++); diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs index 5cfb0baf08e6..d720550e3e1f 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Text.Json; using Microsoft.Build.Graph; +using Microsoft.DotNet.Watch; using Microsoft.DotNet.Watcher.Internal; using Microsoft.Extensions.Tools.Internal; @@ -57,28 +58,17 @@ internal class MSBuildFileSetFactory( var exitCode = await ProcessRunner.RunAsync(processSpec, reporter, isUserApplication: false, launchResult: null, cancellationToken); - if (exitCode != 0 || !File.Exists(watchList)) - { - reporter.Error($"Error(s) finding watch items project file '{Path.GetFileName(rootProjectFile)}'"); + var success = exitCode == 0 && File.Exists(watchList); + if (!success) + { + reporter.Error($"Error(s) finding watch items project file '{Path.GetFileName(rootProjectFile)}'."); reporter.Output($"MSBuild output from target '{TargetName}':"); - reporter.Output(string.Empty); - - foreach (var (line, isError) in capturedOutput) - { - var message = " " + line; - if (isError) - { - reporter.Error(message); - } - else - { - reporter.Output(message); - } - } - - reporter.Output(string.Empty); + } + BuildUtilities.ReportBuildOutput(reporter, capturedOutput, verboseOutput: success); + if (!success) + { return null; } diff --git a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs index bf4cc645bc33..26cba6baded9 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs @@ -62,7 +62,8 @@ private async Task ListenToStandardInputAsync() { CtrlC => new ConsoleKeyInfo('C', ConsoleKey.C, shift: false, alt: false, control: true), CtrlR => new ConsoleKeyInfo('R', ConsoleKey.R, shift: false, alt: false, control: true), - >= 'A' and <= 'Z' => new ConsoleKeyInfo(c, ConsoleKey.A + (c - 'A'), shift: false, alt: false, control: false), + >= 'a' and <= 'z' => new ConsoleKeyInfo(c, ConsoleKey.A + (c - 'a'), shift: false, alt: false, control: false), + >= 'A' and <= 'Z' => new ConsoleKeyInfo(c, ConsoleKey.A + (c - 'A'), shift: true, alt: false, control: false), _ => default }; diff --git a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json b/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json index 7dc0c6bb6771..de41cecc021a 100644 --- a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json +++ b/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json @@ -2,10 +2,13 @@ "profiles": { "dotnet-watch": { "commandName": "Project", - "commandLineArgs": "--list", - "workingDirectory": "C:\\sdk\\artifacts\\tmp\\Debug\\BlazorWasm_Ap---8DA5F107", + "commandLineArgs": "--verbose /bl:DotnetRun.binlog", + "workingDirectory": "$(RepoRoot)src\\Assets\\TestProjects\\BlazorWasmWithLibrary\\blazorwasm", "environmentVariables": { - "DOTNET_WATCH_DEBUG_SDK_DIRECTORY": "$(RepoRoot)artifacts\\bin\\redist\\$(Configuration)\\dotnet\\sdk\\$(Version)" + "DOTNET_WATCH_DEBUG_SDK_DIRECTORY": "$(RepoRoot)artifacts\\bin\\redist\\$(Configuration)\\dotnet\\sdk\\$(Version)", + "DCP_IDE_REQUEST_TIMEOUT_SECONDS": "100000", + "DCP_IDE_NOTIFICATION_TIMEOUT_SECONDS": "100000", + "DCP_IDE_NOTIFICATION_KEEPALIVE_SECONDS": "100000" } } } diff --git a/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs b/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs new file mode 100644 index 000000000000..199fc4eb9f91 --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs @@ -0,0 +1,48 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Text.RegularExpressions; +using Microsoft.DotNet.Watcher.Internal; +using Microsoft.Extensions.Tools.Internal; + +namespace Microsoft.DotNet.Watch; + +internal static partial class BuildUtilities +{ + private static readonly Regex s_buildDiagnosticRegex = GetBuildDiagnosticRegex(); + + [GeneratedRegex(@"[^:]+: (error|warning) [A-Za-z]+[0-9]+: .+")] + private static partial Regex GetBuildDiagnosticRegex(); + + public static void ReportBuildOutput(IReporter reporter, IEnumerable buildOutput, bool verboseOutput) + { + const string BuildEmoji = "🔨"; + + foreach (var (line, isError) in buildOutput) + { + if (isError) + { + reporter.Error(line); + } + else if (s_buildDiagnosticRegex.Match(line) is { Success: true } match) + { + if (match.Groups[1].Value == "error") + { + reporter.Error(line); + } + else + { + reporter.Warn(line); + } + } + else if (verboseOutput) + { + reporter.Verbose(line, BuildEmoji); + } + else + { + reporter.Output(line, BuildEmoji); + } + } + } +} diff --git a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj index b26d3363ae66..8d76264dcfad 100644 --- a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj +++ b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj @@ -34,8 +34,8 @@ <_Parameter2>$(MicrosoftAspNetCoreAppRefPackageVersion) - <_Parameter1>MicrosoftNETSdkAspireManifest80100PackageVersion - <_Parameter2>$(MicrosoftNETSdkAspireManifest80100PackageVersion) + <_Parameter1>AspirePackageVersion + <_Parameter2>$(AspirePackageVersion) diff --git a/test/Microsoft.NET.TestFramework/TestAsset.cs b/test/Microsoft.NET.TestFramework/TestAsset.cs index b9f9f935da48..f48a36775831 100644 --- a/test/Microsoft.NET.TestFramework/TestAsset.cs +++ b/test/Microsoft.NET.TestFramework/TestAsset.cs @@ -89,22 +89,24 @@ public TestAsset WithSource() File.Copy(srcFile, destFile, true); } - string[][] Properties = { - new string[] { "TargetFramework", "$(CurrentTargetFramework)", ToolsetInfo.CurrentTargetFramework }, - new string[] { "CurrentTargetFramework", "$(CurrentTargetFramework)", ToolsetInfo.CurrentTargetFramework }, - new string[] { "RuntimeIdentifier", "$(LatestWinRuntimeIdentifier)", ToolsetInfo.LatestWinRuntimeIdentifier }, - new string[] { "RuntimeIdentifier", "$(LatestLinuxRuntimeIdentifier)", ToolsetInfo.LatestLinuxRuntimeIdentifier }, - new string[] { "RuntimeIdentifier", "$(LatestMacRuntimeIdentifier)", ToolsetInfo.LatestMacRuntimeIdentifier }, - new string[] { "RuntimeIdentifier", "$(LatestRuntimeIdentifiers)", ToolsetInfo.LatestRuntimeIdentifiers } }; - - foreach (string[] property in Properties) + var substitutions = new[] { - UpdateProjProperty(property[0], property[1], property[2]); + (propertyName: "TargetFramework", variableName: "CurrentTargetFramework", value: ToolsetInfo.CurrentTargetFramework), + (propertyName: "CurrentTargetFramework", variableName: "CurrentTargetFramework", value: ToolsetInfo.CurrentTargetFramework), + (propertyName: "RuntimeIdentifier", variableName: "LatestWinRuntimeIdentifier", value: ToolsetInfo.LatestWinRuntimeIdentifier), + (propertyName: "RuntimeIdentifier", variableName: "LatestLinuxRuntimeIdentifier", value: ToolsetInfo.LatestLinuxRuntimeIdentifier), + (propertyName: "RuntimeIdentifier", variableName: "LatestMacRuntimeIdentifier", value: ToolsetInfo.LatestMacRuntimeIdentifier), + (propertyName: "RuntimeIdentifier", variableName: "LatestRuntimeIdentifiers", value: ToolsetInfo.LatestRuntimeIdentifiers) + }; + + foreach (var (propertyName, variableName, value) in substitutions) + { + UpdateProjProperty(propertyName, variableName, value); } foreach (var (propertyName, version) in ToolsetInfo.GetPackageVersionProperties()) { - this.ReplacePackageVersionVariable(propertyName, version); + ReplacePackageVersionVariable(propertyName, version); } return this; @@ -118,21 +120,21 @@ public TestAsset UpdateProjProperty(string propertyName, string variableName, st var ns = p.Root.Name.Namespace; var getNode = p.Root.Elements(ns + "PropertyGroup").Elements(ns + propertyName).FirstOrDefault(); getNode ??= p.Root.Elements(ns + "PropertyGroup").Elements(ns + $"{propertyName}s").FirstOrDefault(); - getNode?.SetValue(getNode?.Value.Replace(variableName, targetValue)); + getNode?.SetValue(getNode?.Value.Replace($"$({variableName})", targetValue)); }); } public TestAsset ReplacePackageVersionVariable(string targetName, string targetValue) { - string[] PropertyNames = new[] { "PackageReference", "Package" }; + var elementsWithVersionAttribute = new[] { "PackageReference", "Package", "Sdk" }; return WithProjectChanges(project => { var ns = project.Root.Name.Namespace; - foreach (var PropertyName in PropertyNames) + foreach (var elementName in elementsWithVersionAttribute) { var packageReferencesToUpdate = - project.Root.Descendants(ns + PropertyName) + project.Root.Descendants(ns + elementName) .Where(p => p.Attribute("Version") != null && p.Attribute("Version").Value.Equals($"$({targetName})", StringComparison.OrdinalIgnoreCase)); foreach (var packageReference in packageReferencesToUpdate) { diff --git a/test/TestAssets/TestProjects/WatchAspire/WatchAspire.AppHost/WatchAspire.AppHost.csproj b/test/TestAssets/TestProjects/WatchAspire/WatchAspire.AppHost/WatchAspire.AppHost.csproj index bb5e72a5337b..ac214265e5ee 100644 --- a/test/TestAssets/TestProjects/WatchAspire/WatchAspire.AppHost/WatchAspire.AppHost.csproj +++ b/test/TestAssets/TestProjects/WatchAspire/WatchAspire.AppHost/WatchAspire.AppHost.csproj @@ -1,4 +1,5 @@ - + + Exe @@ -7,8 +8,6 @@ enable true ad800ccc-954c-40cc-920b-2e09fc9eee7a - - 9.0.0 @@ -16,7 +15,7 @@ - + diff --git a/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj b/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj index cbfdf8929cb2..dad4e33333b6 100644 --- a/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj +++ b/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -9,7 +9,7 @@ - + diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 86dafb654e92..40f866231f90 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -380,15 +380,10 @@ public async Task Aspire() var testAsset = TestAssets.CopyTestAsset("WatchAspire") .WithSource(); - var workloadInstallCommandSpec = new DotnetCommand(Logger, ["workload", "install", "aspire", "--include-previews"]) - { - WorkingDirectory = testAsset.Path, - }; - - var result = workloadInstallCommandSpec.Execute(); - Assert.Equal(0, result.ExitCode); - var serviceSourcePath = Path.Combine(testAsset.Path, "WatchAspire.ApiService", "Program.cs"); + var serviceProjectPath = Path.Combine(testAsset.Path, "WatchAspire.ApiService", "WatchAspire.ApiService.csproj"); + var originalSource = File.ReadAllText(serviceSourcePath, Encoding.UTF8); + App.Start(testAsset, ["-lp", "http"], relativeProjectDirectory: "WatchAspire.AppHost", testFlags: TestFlags.ReadKeyFromStdin); await App.AssertWaitingForChanges(); @@ -399,9 +394,10 @@ public async Task Aspire() // wait until after DCP session started: await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #1"); - var newSource = File.ReadAllText(serviceSourcePath, Encoding.UTF8); - newSource = newSource.Replace("Enumerable.Range(1, 5)", "Enumerable.Range(1, 10)"); - UpdateSourceFile(serviceSourcePath, newSource); + // valid code change: + UpdateSourceFile( + serviceSourcePath, + originalSource.Replace("Enumerable.Range(1, 5)", "Enumerable.Range(1, 10)")); await App.AssertOutputLineStartsWith("dotnet watch 🔥 Hot reload change handled"); @@ -411,7 +407,60 @@ public async Task Aspire() // Only one browser should be launched (dashboard). The child process shouldn't launch a browser. Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: "))); + App.Process.ClearOutput(); + +#if TODO // needs Roslyn update + // rude edit with build error: + UpdateSourceFile( + serviceSourcePath, + originalSource.Replace("record WeatherForecast", "record WeatherForecast2")); + + await App.AssertOutputLineStartsWith(" ❔ Do you want to restart these projects? Yes (y) / No (n) / Always (a) / Never (v)"); + + App.AssertOutputContains("dotnet watch ⌚ Unable to apply hot reload, restart is needed to apply the changes."); + App.AssertOutputContains("error ENC0020: Renaming record 'WeatherForecast' requires restarting the application."); + App.AssertOutputContains("dotnet watch ⌚ Affected projects:"); + App.AssertOutputContains("dotnet watch ⌚ WatchAspire.ApiService"); + App.Process.ClearOutput(); + + App.SendKey('y'); + + await App.AssertOutputLineStartsWith(MessageDescriptor.FixBuildError, failure: _ => false); + + // We don't have means to gracefully terminate process on Windows, see https://github.com/dotnet/runtime/issues/109432 + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + App.AssertOutputContains("dotnet watch ❌ [WatchAspire.ApiService (net9.0)] Exited with error code -1"); + } + else + { + App.AssertOutputContains("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Exited"); + } + + App.AssertOutputContains($"dotnet watch ⌚ Building '{serviceProjectPath}' ..."); + App.AssertOutputContains("error CS0246: The type or namespace name 'WeatherForecast' could not be found"); + App.Process.ClearOutput(); + + // TODO: remove + Log("dotnet build-server shutdown"); + var workloadInstallCommandSpec = new DotnetCommand(Logger, ["build-server", "shutdown"]) + { + WorkingDirectory = testAsset.Path, + }; + + var result = workloadInstallCommandSpec.Execute(); + Assert.Equal(0, result.ExitCode); + + // fix build error: + UpdateSourceFile( + serviceSourcePath, + originalSource.Replace("WeatherForecast", "WeatherForecast2")); + + await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Capabilities"); + App.AssertOutputContains("dotnet watch ⌚ Build succeeded."); + App.AssertOutputContains($"dotnet watch ⭐ Starting project: {serviceProjectPath}"); +#endif App.SendControlC(); await App.AssertOutputLineStartsWith("dotnet watch 🛑 Shutdown requested. Press Ctrl+C again to force exit."); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index 85932e21c212..c87b4de72655 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -37,14 +37,13 @@ private static async Task Launch(string projectPath, TestRuntime }; RestartOperation? startOp = null; - startOp = new RestartOperation(async (build, cancellationToken) => + startOp = new RestartOperation(async cancellationToken => { var result = await service.ProjectLauncher.TryLaunchProcessAsync( projectOptions, new CancellationTokenSource(), onOutput: null, restartOperation: startOp!, - build, cancellationToken); Assert.NotNull(result); @@ -54,7 +53,7 @@ private static async Task Launch(string projectPath, TestRuntime return result; }); - return await startOp(build: false, cancellationToken); + return await startOp(cancellationToken); } [Theory] @@ -171,7 +170,7 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) { } - Assert.Equal(4, launchedProcessCount); + Assert.Equal(6, launchedProcessCount); // Hot Reload shared dependency - should update both service projects async Task MakeValidDependencyChange() @@ -252,7 +251,7 @@ async Task MakeRudeEditChange() Assert.True(hasUpdateSource.Task.IsCompletedSuccessfully); - Assert.Equal(4, launchedProcessCount); + Assert.Equal(6, launchedProcessCount); } } diff --git a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs index 004e75749db3..901a26dd6fb3 100644 --- a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs +++ b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs @@ -28,7 +28,7 @@ public async Task ProcessAsync_EvaluatesFileSetIfProjFileChanges() evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Test.csproj" }, ChangeKind.Update), CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Test.csproj", ContainingProjectPaths = [] }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); } @@ -52,7 +52,7 @@ public async Task ProcessAsync_DoesNotEvaluateFileSetIfNonProjFileChanges() evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs", ContainingProjectPaths = [] }, ChangeKind.Update), CancellationToken.None); Assert.False(evaluator.RequiresRevaluation); Assert.Equal(1, counter); @@ -78,7 +78,7 @@ public async Task ProcessAsync_EvaluateFileSetOnEveryChangeIfOptimizationIsSuppr evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs", ContainingProjectPaths = [] }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); Assert.Equal(2, counter); @@ -93,8 +93,8 @@ public async Task ProcessAsync_SetsEvaluationRequired_IfMSBuildFileChanges_ButIs var result = new EvaluationResult( new Dictionary() { - { "Controlller.cs", new FileItem { FilePath = "Controlller.cs" } }, - { "Proj.csproj", new FileItem { FilePath = "Proj.csproj" } }, + { "Controlller.cs", new FileItem { FilePath = "Controlller.cs", ContainingProjectPaths = []} }, + { "Proj.csproj", new FileItem { FilePath = "Proj.csproj", ContainingProjectPaths = [] } }, }, projectGraph: null); @@ -121,7 +121,7 @@ public async Task ProcessAsync_SetsEvaluationRequired_IfMSBuildFileChanges_ButIs evaluator.RequiresRevaluation = false; evaluator.Timestamps["Proj.csproj"] = new DateTime(1007); - await evaluator.EvaluateAsync(new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); + await evaluator.EvaluateAsync(new(new() { FilePath = "Controller.cs", ContainingProjectPaths = [] }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); } diff --git a/test/dotnet-watch.Tests/Utilities/TestReporter.cs b/test/dotnet-watch.Tests/Utilities/TestReporter.cs index e7054f2ed195..cba2d09751a1 100644 --- a/test/dotnet-watch.Tests/Utilities/TestReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/TestReporter.cs @@ -18,6 +18,9 @@ internal class TestReporter(ITestOutputHelper output) : IReporter public bool EnableProcessOutputReporting => true; + public bool IsVerbose + => true; + public event Action? OnProjectProcessOutput; public event Action? OnProcessOutput; diff --git a/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs b/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs index 6b44db35472f..4402dd1739c2 100644 --- a/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs +++ b/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs @@ -114,7 +114,7 @@ public async Task ListsFiles() App.DotnetWatchArgs.Clear(); App.Start(testAsset, ["--list"]); var lines = await App.Process.GetAllOutputLinesAsync(CancellationToken.None); - var files = lines.Where(l => !l.StartsWith("watch :")); + var files = lines.Where(l => !l.StartsWith("dotnet watch ⌚") && l.Trim() != ""); AssertEx.EqualFileList( testAsset.Path, diff --git a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs index 26fe6b0b99c8..8a1b55cb609a 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs @@ -59,7 +59,7 @@ public Task AssertOutputLineStartsWith(MessageDescriptor descriptor, str /// public async Task AssertOutputLineStartsWith(string expectedPrefix, Predicate failure = null) { - Logger.WriteLine($"Test waiting for output: '{expectedPrefix}'"); + Logger.WriteLine($"[TEST] Test waiting for output: '{expectedPrefix}'"); var line = await Process.GetOutputLineAsync( success: line => line.StartsWith(expectedPrefix, StringComparison.Ordinal), @@ -129,6 +129,11 @@ public void Start(TestAsset asset, IEnumerable arguments, string relativ commandSpec.WithEnvironmentVariable("__DOTNET_WATCH_TEST_OUTPUT_DIR", testOutputPath); commandSpec.WithEnvironmentVariable("Microsoft_CodeAnalysis_EditAndContinue_LogDir", testOutputPath); + // suppress all DCP timeouts: + commandSpec.WithEnvironmentVariable("DCP_IDE_REQUEST_TIMEOUT_SECONDS", "100000"); + commandSpec.WithEnvironmentVariable("DCP_IDE_NOTIFICATION_TIMEOUT_SECONDS", "100000"); + commandSpec.WithEnvironmentVariable("DCP_IDE_NOTIFICATION_KEEPALIVE_SECONDS", "100000"); + foreach (var env in EnvironmentVariables) { commandSpec.WithEnvironmentVariable(env.Key, env.Value); From 64487c85a0f379f9876a1e6f94da9552f61c1a73 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 15 Nov 2024 14:34:26 -0800 Subject: [PATCH 428/702] Remove eventlisterner guard It appears it was only used for an old bug and it makes this class harder to read and understand. --- test/HelixTasks/AssemblyScheduler.cs | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/test/HelixTasks/AssemblyScheduler.cs b/test/HelixTasks/AssemblyScheduler.cs index 428d40dff3f4..53349f8f16b4 100644 --- a/test/HelixTasks/AssemblyScheduler.cs +++ b/test/HelixTasks/AssemblyScheduler.cs @@ -35,15 +35,6 @@ public AssemblyPartitionInfo(string assemblyPath) public sealed class AssemblyScheduler { - /// - /// This is a test class inserted into assemblies to guard against a .NET desktop bug. The tests - /// inside of it counteract the underlying issue. If this test is included in any assembly it - /// must be added to every partition to ensure the work around is present - /// - /// https://github.com/dotnet/corefx/issues/3793 - /// https://github.com/dotnet/roslyn/issues/8936 - /// - private const string EventListenerGuardFullName = "Microsoft.CodeAnalysis.UnitTests.EventListenerGuard"; private readonly struct TypeInfo { @@ -78,23 +69,20 @@ private sealed class AssemblyInfoBuilder private readonly StringBuilder _builder = new(); private readonly string _assemblyPath; private readonly int _methodLimit; - private readonly bool _hasEventListenerGuard; private readonly bool _netFramework; private int _currentId; private List _currentTypeInfoList = new(); - private AssemblyInfoBuilder(string assemblyPath, int methodLimit, bool hasEventListenerGuard, bool netFramework = false) + private AssemblyInfoBuilder(string assemblyPath, int methodLimit, bool netFramework = false) { _assemblyPath = assemblyPath; _methodLimit = methodLimit; - _hasEventListenerGuard = hasEventListenerGuard; _netFramework = netFramework; } internal static void Build(string assemblyPath, int methodLimit, List typeInfoList, out List partitionList, out List assemblyInfoList, bool netFramework = false) { - var hasEventListenerGuard = typeInfoList.Any(x => x.FullName == EventListenerGuardFullName); - var builder = new AssemblyInfoBuilder(assemblyPath, methodLimit, hasEventListenerGuard, netFramework); + var builder = new AssemblyInfoBuilder(assemblyPath, methodLimit, netFramework); builder.Build(typeInfoList); partitionList = builder._partitionList; assemblyInfoList = builder._assemblyInfoList; @@ -131,12 +119,6 @@ private void BeginPartition() _currentId++; _currentTypeInfoList = new List(); _builder.Length = 0; - - // Ensure the EventListenerGuard is in every partition. - if (_hasEventListenerGuard) - { - _builder.Append($@"-class ""{EventListenerGuardFullName}"" "); - } } private void CheckForPartitionLimit(bool done) From 6adf982abfde31f4af7300509da9c60b168e8b35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Nov 2024 13:10:52 +0000 Subject: [PATCH 429/702] Update dependencies from https://github.com/dotnet/razor build 20241115.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24523.2 -> To Version 7.0.0-preview.24565.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f04e67b499d..3e295bcb47e2 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 - 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e + aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f - + https://github.com/dotnet/razor - 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e + aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f - + https://github.com/dotnet/razor - 5161ec13b0ed670b69f3fe5b2c57f239ce63c28e + aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b28b422ab861..0cf5a7f16dab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.24523.2 - 7.0.0-preview.24523.2 - 7.0.0-preview.24523.2 + 7.0.0-preview.24565.5 + 7.0.0-preview.24565.5 + 7.0.0-preview.24565.5 From a8d4e866d3a9a94e5fd031f3125a2bde43223982 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Nov 2024 13:13:38 +0000 Subject: [PATCH 430/702] 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 67b70cd1b6d14bf17e20c6b4ece15caec0880f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Nov 2024 18:17:35 +0000 Subject: [PATCH 431/702] Update dependencies from https://github.com/dotnet/razor build 20241116.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24566.1 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..ebbb7dd877ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd2cdaf83db4..82e143c6cb68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 1676deca771d6455d013ffbace9be1bd3b4549dd + 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 - + https://github.com/dotnet/razor - 1676deca771d6455d013ffbace9be1bd3b4549dd + 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 - + https://github.com/dotnet/razor - 1676deca771d6455d013ffbace9be1bd3b4549dd + 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 - + https://github.com/dotnet/razor - 1676deca771d6455d013ffbace9be1bd3b4549dd + 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 diff --git a/eng/Versions.props b/eng/Versions.props index f0f9074f5109..144f166459aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24565.11 - 9.0.0-preview.24565.11 - 9.0.0-preview.24565.11 + 9.0.0-preview.24566.1 + 9.0.0-preview.24566.1 + 9.0.0-preview.24566.1 From d0315d5e30fb0ee72c9edaf35680d314122502bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Nov 2024 22:04:57 +0000 Subject: [PATCH 432/702] Update dependencies from https://github.com/dotnet/msbuild build 20241117.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24567-01 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..ebbb7dd877ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59ba004e810e..a7c40908c4cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 + db16ed4422e3c9c5a308765c18a7d89b14d0162c - + https://github.com/dotnet/msbuild - 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 + db16ed4422e3c9c5a308765c18a7d89b14d0162c - + https://github.com/dotnet/msbuild - 6cd445d84e59a36c7fbb6f50b7a5a62767a6da51 + db16ed4422e3c9c5a308765c18a7d89b14d0162c diff --git a/eng/Versions.props b/eng/Versions.props index f57b8fe157eb..3c88aa64c370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24565-01 - 17.13.0-preview-24565-01 + 17.13.0-preview-24567-01 + 17.13.0-preview-24567-01 17.11.4 17.12 From 40c69d2ab7120f9907855da98ff8de71c128f4ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 07:14:54 +0000 Subject: [PATCH 433/702] Update dependencies from https://github.com/dotnet/msbuild build 20241118.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24568-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7c40908c4cf..bbccda89f7b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - db16ed4422e3c9c5a308765c18a7d89b14d0162c + aa3142a4aecf2bc704bbe061f962d48941cb0205 - + https://github.com/dotnet/msbuild - db16ed4422e3c9c5a308765c18a7d89b14d0162c + aa3142a4aecf2bc704bbe061f962d48941cb0205 - + https://github.com/dotnet/msbuild - db16ed4422e3c9c5a308765c18a7d89b14d0162c + aa3142a4aecf2bc704bbe061f962d48941cb0205 diff --git a/eng/Versions.props b/eng/Versions.props index 3c88aa64c370..ab3fd1b09010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24567-01 - 17.13.0-preview-24567-01 + 17.13.0-preview-24568-01 + 17.13.0-preview-24568-01 17.11.4 17.12 From fabeda8131ecc668980dc91b4da614e76cdcf3b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 10:22:08 +0000 Subject: [PATCH 434/702] Update dependencies from https://github.com/dotnet/test-templates build 20241118.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24561.1 -> To Version 1.1.0-rtm.24568.1 --- NuGet.config | 7 ------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa831ad45b1..0994edd55783 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - @@ -17,13 +15,11 @@ - - @@ -50,13 +46,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0d754dbb314..2b138bb1a6d3 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 - 9f284e00c920d6ffc37a9efe35838b8730076098 + 25628d789b54ec56a8648d02847c1ad1b0ea31df - + https://github.com/dotnet/test-templates - 9f284e00c920d6ffc37a9efe35838b8730076098 + 25628d789b54ec56a8648d02847c1ad1b0ea31df diff --git a/eng/Versions.props b/eng/Versions.props index d88c741b6057..aba29e43cee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24564.1 + 1.1.0-rtm.24568.1 From aecf0d585429061765d71602a8bd8274a9064694 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 10:22:08 +0000 Subject: [PATCH 435/702] Update dependencies from https://github.com/dotnet/test-templates build 20241118.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24561.1 -> To Version 1.1.0-rtm.24568.1 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..ebbb7dd877ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa6db08d7cb3..a1406b28964a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 9f284e00c920d6ffc37a9efe35838b8730076098 + 25628d789b54ec56a8648d02847c1ad1b0ea31df - + https://github.com/dotnet/test-templates - 9f284e00c920d6ffc37a9efe35838b8730076098 + 25628d789b54ec56a8648d02847c1ad1b0ea31df diff --git a/eng/Versions.props b/eng/Versions.props index 27dc6422f002..e4db32712235 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rtm.24564.1 + 1.1.0-rtm.24568.1 From b3de954c1cac17ca5c9fa76b0a35ade2012b4971 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 11:59:32 +0000 Subject: [PATCH 436/702] Update dependencies from https://github.com/dotnet/msbuild build 20241118.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24568-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbccda89f7b3..410d34ba3a24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - aa3142a4aecf2bc704bbe061f962d48941cb0205 + eec6ac731e5b39f6b14bbbe7995896047d170332 - + https://github.com/dotnet/msbuild - aa3142a4aecf2bc704bbe061f962d48941cb0205 + eec6ac731e5b39f6b14bbbe7995896047d170332 - + https://github.com/dotnet/msbuild - aa3142a4aecf2bc704bbe061f962d48941cb0205 + eec6ac731e5b39f6b14bbbe7995896047d170332 diff --git a/eng/Versions.props b/eng/Versions.props index ab3fd1b09010..1d408222ad1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24568-01 - 17.13.0-preview-24568-01 + 17.13.0-preview-24568-02 + 17.13.0-preview-24568-02 17.11.4 17.12 From a58be956dea01d717bd25fc062ea252f7693d9f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 14:58:59 +0000 Subject: [PATCH 437/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241118.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.24561.1 -> To Version 9.0.0-beta.24568.1 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..ebbb7dd877ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 666ff7be015b..f45edb090fdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 diff --git a/eng/Versions.props b/eng/Versions.props index b9e9b7a181d7..7af6fe5e3c86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 + 9.0.0-beta.24568.1 + 9.0.0-beta.24568.1 + 9.0.0-beta.24568.1 + 9.0.0-beta.24568.1 + 9.0.0-beta.24568.1 + 9.0.0-beta.24568.1 From be8394568078c63aa304610b4b2e95e373f500f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 15:40:33 +0000 Subject: [PATCH 438/702] Update dependencies from https://github.com/dotnet/msbuild build 20241118.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24568-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 410d34ba3a24..51cbefef1f80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 9a1554c87052eff5bf9d33466bf11dd8789a989f - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 9a1554c87052eff5bf9d33466bf11dd8789a989f - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 9a1554c87052eff5bf9d33466bf11dd8789a989f diff --git a/eng/Versions.props b/eng/Versions.props index 1d408222ad1e..249446c01138 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24568-02 - 17.13.0-preview-24568-02 + 17.13.0-preview-24568-03 + 17.13.0-preview-24568-03 17.11.4 17.12 From d795d955b0a2879fd6135fb3200f7dfe7a4a2c70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 16:44:36 +0000 Subject: [PATCH 439/702] Update dependencies from https://github.com/dotnet/msbuild build 20241118.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24568-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51cbefef1f80..db2c31953395 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - 9a1554c87052eff5bf9d33466bf11dd8789a989f + cb9e69a34c1a972ba43a9f26ac80ec2da919e24a - + https://github.com/dotnet/msbuild - 9a1554c87052eff5bf9d33466bf11dd8789a989f + cb9e69a34c1a972ba43a9f26ac80ec2da919e24a - + https://github.com/dotnet/msbuild - 9a1554c87052eff5bf9d33466bf11dd8789a989f + cb9e69a34c1a972ba43a9f26ac80ec2da919e24a diff --git a/eng/Versions.props b/eng/Versions.props index 249446c01138..cda60f8dd2a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24568-03 - 17.13.0-preview-24568-03 + 17.13.0-preview-24568-04 + 17.13.0-preview-24568-04 17.11.4 17.12 From eaa90561131a6a42a72df1b111ff5dbd6b4b209e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Mon, 18 Nov 2024 11:05:28 -0800 Subject: [PATCH 440/702] Clean up namespaces (#44691) --- eng/pipelines/templates/jobs/sdk-job-matrix.yml | 7 ++++--- src/BuiltInTools/AspireService/AspireServerService.cs | 7 +------ .../AspireService/Contracts/IAspireServerEvents.cs | 2 +- src/BuiltInTools/AspireService/Helpers/CertGenerator.cs | 2 +- .../AspireService/Helpers/ExceptionExtensions.cs | 4 +--- .../AspireService/Helpers/HttpContextExtensions.cs | 7 +------ src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs | 2 +- .../AspireService/Helpers/SocketConnectionManager.cs | 2 +- src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs | 5 +---- .../AspireService/Helpers/WebSocketConnection.cs | 5 +---- src/BuiltInTools/AspireService/Models/ErrorResponse.cs | 2 +- src/BuiltInTools/AspireService/Models/InfoResponse.cs | 2 +- .../AspireService/Models/RunSessionRequest.cs | 6 +----- .../AspireService/Models/SessionChangeNotification.cs | 2 +- src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs | 2 +- src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs | 2 +- .../DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs | 2 +- src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs | 7 ++++--- src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs | 2 +- .../dotnet-watch/Aspire/AspireServiceFactory.cs | 8 ++------ .../dotnet-watch/Browser/BrowserConnection.cs | 3 +-- src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs | 4 +--- .../dotnet-watch/Browser/BrowserRefreshServer.cs | 3 +-- src/BuiltInTools/dotnet-watch/CommandLineOptions.cs | 4 +--- src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs | 3 +-- src/BuiltInTools/dotnet-watch/DotNetWatcher.cs | 5 +---- src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs | 3 +-- src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs | 2 +- .../dotnet-watch/EnvironmentVariablesBuilder.cs | 2 +- .../dotnet-watch/EnvironmentVariables_StartupHook.cs | 2 +- src/BuiltInTools/dotnet-watch/EvaluationResult.cs | 2 +- src/BuiltInTools/dotnet-watch/FileItem.cs | 3 +-- src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs | 4 +--- src/BuiltInTools/dotnet-watch/GlobalOptions.cs | 2 +- .../dotnet-watch/HotReload/AgentMessageSeverity.cs | 2 +- .../HotReload/BlazorWebAssemblyDeltaApplier.cs | 4 +--- .../HotReload/BlazorWebAssemblyHostedDeltaApplier.cs | 3 +-- .../dotnet-watch/HotReload/CompilationHandler.cs | 4 +--- .../dotnet-watch/HotReload/DefaultDeltaApplier.cs | 4 +--- src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs | 4 +--- .../dotnet-watch/HotReload/HotReloadEventSource.cs | 2 +- .../dotnet-watch/HotReload/HotReloadProfile.cs | 2 +- .../dotnet-watch/HotReload/HotReloadProfileReader.cs | 3 +-- .../dotnet-watch/HotReload/IRuntimeProcessLauncher.cs | 2 +- .../HotReload/IRuntimeProcessLauncherFactory.cs | 2 +- .../dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs | 4 +--- .../dotnet-watch/HotReload/NamedPipeContract.cs | 2 +- .../dotnet-watch/HotReload/ProjectLauncher.cs | 5 +---- src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs | 3 +-- .../dotnet-watch/HotReload/ResponseLoggingLevel.cs | 2 +- src/BuiltInTools/dotnet-watch/HotReload/RestartPrompt.cs | 3 +-- src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs | 3 +-- .../dotnet-watch/HotReload/ScopedCssFileHandler.cs | 6 +----- .../dotnet-watch/HotReload/SingleProcessDeltaApplier.cs | 3 +-- .../dotnet-watch/HotReload/StaticFileHandler.cs | 7 +------ src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs | 2 +- src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs | 7 +------ .../dotnet-watch/Internal/BrowserSpecificReporter.cs | 4 +--- .../dotnet-watch/Internal/CommandLineUtilities.cs | 2 +- .../dotnet-watch/Internal/ConsoleInputReader.cs | 2 +- src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs | 3 +-- src/BuiltInTools/dotnet-watch/Internal/Ensure.cs | 2 +- src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs | 4 +--- .../dotnet-watch/Internal/FileWatcher/ChangeKind.cs | 2 +- .../Internal/FileWatcher/EventBasedDirectoryWatcher.cs | 3 +-- .../Internal/FileWatcher/FileWatcherFactory.cs | 2 +- .../Internal/FileWatcher/IDirectoryWatcher.cs | 2 +- .../Internal/FileWatcher/PollingDirectoryWatcher.cs | 3 +-- src/BuiltInTools/dotnet-watch/Internal/IConsole.cs | 2 +- src/BuiltInTools/dotnet-watch/Internal/IReporter.cs | 5 +---- .../dotnet-watch/Internal/MSBuildFileSetResult.cs | 2 +- .../dotnet-watch/Internal/MsBuildFileSetFactory.cs | 5 +---- .../dotnet-watch/Internal/MsBuildProjectFinder.cs | 4 +--- src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs | 3 +-- src/BuiltInTools/dotnet-watch/Internal/OutputLine.cs | 2 +- src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs | 4 +--- src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs | 3 +-- .../dotnet-watch/Internal/ProjectSpecificReporter.cs | 4 +--- .../dotnet-watch/Internal/ReporterTraceListener.cs | 3 +-- src/BuiltInTools/dotnet-watch/LaunchSettingsProfile.cs | 3 +-- src/BuiltInTools/dotnet-watch/ProcessLaunchResult.cs | 2 +- src/BuiltInTools/dotnet-watch/ProcessSpec.cs | 3 +-- src/BuiltInTools/dotnet-watch/Program.cs | 7 +------ src/BuiltInTools/dotnet-watch/ProjectOptions.cs | 2 +- src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs | 2 -- src/BuiltInTools/dotnet-watch/Utilities/Disposables.cs | 2 +- .../dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs | 2 +- src/BuiltInTools/dotnet-watch/Utilities/Versions.cs | 2 +- src/BuiltInTools/dotnet-watch/Watcher.cs | 3 +-- src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 2 +- .../HotReloadAgentTest.cs | 3 +-- .../StartupHookTests.cs | 2 +- .../AspireServerServiceTests.cs | 4 +--- .../Mocks/Helpers.cs | 2 +- .../Mocks/IAspireServerEventsMock.cs | 3 +-- .../Mocks/IServiceProviderMock.cs | 2 +- .../Mocks/MockFactory.cs | 2 +- .../Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs | 2 +- .../RunSessionRequestTests.cs | 4 +--- test/dotnet-watch.Tests/CommandLineOptionsTests.cs | 2 +- test/dotnet-watch.Tests/ConsoleReporterTests.cs | 2 +- test/dotnet-watch.Tests/FileSetSerializerTests.cs | 4 +--- test/dotnet-watch.Tests/FileWatcherTests.cs | 5 +---- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 6 +----- .../HotReload/CompilationHandlerTests.cs | 5 +---- .../HotReload/RuntimeProcessLauncherTests.cs | 5 +---- test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs | 4 +--- .../Internal/EnvironmentVariablesBuilderTest.cs | 4 +--- test/dotnet-watch.Tests/LaunchSettingsProfileTest.cs | 5 +---- test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs | 5 +---- test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs | 6 +----- test/dotnet-watch.Tests/NoRestoreTests.cs | 4 +--- test/dotnet-watch.Tests/Utilities/AssertEx.cs | 2 +- test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs | 2 +- .../dotnet-watch.Tests/Utilities/DebugTestOutputLogger.cs | 2 +- test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs | 4 +--- test/dotnet-watch.Tests/Utilities/MockReporter.cs | 4 +--- test/dotnet-watch.Tests/Utilities/TaskExtensions.cs | 2 +- test/dotnet-watch.Tests/Utilities/TestConsole.cs | 2 +- test/dotnet-watch.Tests/Utilities/TestOptions.cs | 4 +--- test/dotnet-watch.Tests/Utilities/TestReporter.cs | 4 +--- .../Utilities/TestRuntimeProcessLauncher.cs | 2 +- test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs | 4 +--- test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs | 3 +-- test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs | 4 +--- test/dotnet-watch.Tests/Watch/NoDepsAppTests.cs | 2 +- test/dotnet-watch.Tests/Watch/ProgramTests.cs | 5 +---- .../Watch/Utilities/DotNetWatchTestBase.cs | 4 +--- test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs | 7 +------ 129 files changed, 135 insertions(+), 298 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-job-matrix.yml b/eng/pipelines/templates/jobs/sdk-job-matrix.yml index 8a7c75d1ba21..0d863564b914 100644 --- a/eng/pipelines/templates/jobs/sdk-job-matrix.yml +++ b/eng/pipelines/templates/jobs/sdk-job-matrix.yml @@ -12,9 +12,10 @@ parameters: runTestsAsTool: true # This job uses the build step for testing, so the extra test step is not necessary. runTests: false - - categoryName: TemplateEngine - testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj - publishXunitResults: true + # Turn off template engine runs on Windows temporarily until agent images are updated + #- categoryName: TemplateEngine + # testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj + # publishXunitResults: true - categoryName: AoT runAoTTests: true ### LINUX ### diff --git a/src/BuiltInTools/AspireService/AspireServerService.cs b/src/BuiltInTools/AspireService/AspireServerService.cs index d3450d65ad18..9543b0cda9cd 100644 --- a/src/BuiltInTools/AspireService/AspireServerService.cs +++ b/src/BuiltInTools/AspireService/AspireServerService.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.Collections.Immutable; using System.Net; using System.Net.WebSockets; using System.Security.Cryptography; @@ -13,13 +12,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.WebTools.AspireServer.Contracts; -using Microsoft.WebTools.AspireServer.Helpers; -using Microsoft.WebTools.AspireServer.Models; -using Microsoft.WebTools.AspireService.Helpers; using IAsyncDisposable = System.IAsyncDisposable; -namespace Microsoft.WebTools.AspireServer; +namespace Aspire.Tools.Service; /// /// Implementation of the AspireServerService. A new instance of this service will be created for each diff --git a/src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs b/src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs index 1a4b5b6ddee2..82f000261a9e 100644 --- a/src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs +++ b/src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.WebTools.AspireServer.Contracts; +namespace Aspire.Tools.Service; internal interface IAspireServerEvents { diff --git a/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs b/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs index a0b0f7766d48..e3785b9ecc19 100644 --- a/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs +++ b/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs @@ -4,7 +4,7 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -namespace Microsoft.WebTools.AspireServer; +namespace Aspire.Tools.Service; internal static class CertGenerator { diff --git a/src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs b/src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs index ed3fc9321271..d667c50819e4 100644 --- a/src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs +++ b/src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; - -namespace Microsoft.WebTools.AspireServer.Helpers; +namespace Aspire.Tools.Service; internal static class ExceptionExtensions { diff --git a/src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs b/src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs index 6c04e6553f66..13ddb6b5cd23 100644 --- a/src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs +++ b/src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs @@ -1,14 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Threading; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.WebTools.AspireServer.Contracts; -using Microsoft.WebTools.AspireServer.Models; -namespace Microsoft.WebTools.AspireServer.Helpers; +namespace Aspire.Tools.Service; internal static class HttpContextExtensions { diff --git a/src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs b/src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs index 52953e211022..c190354635b6 100644 --- a/src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs +++ b/src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; -namespace Microsoft.WebTools.AspireService.Helpers; +namespace Aspire.Tools.Service; internal sealed class LoggerProvider(Action reporter) : ILoggerProvider { diff --git a/src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs b/src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs index 8f088759a6a0..46e6388a58c3 100644 --- a/src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs +++ b/src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.WebTools.AspireServer; +namespace Aspire.Tools.Service; /// /// Manages the set of active socket connections. Since it registers to be notified when a socket has gone bad, diff --git a/src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs b/src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs index 76921f3a6a65..3ac8c1034703 100644 --- a/src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs +++ b/src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs @@ -1,13 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; -using System.Linq; using System.Net; using System.Net.Sockets; -namespace Microsoft.WebTools.AspireServer.Helpers; +namespace Aspire.Tools.Service; internal class SocketUtilities { diff --git a/src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs b/src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs index bf41ac6ded5c..e82da71764d1 100644 --- a/src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs +++ b/src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs @@ -1,12 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Net.WebSockets; -using System.Threading; -using System.Threading.Tasks; -namespace Microsoft.WebTools.AspireServer; +namespace Aspire.Tools.Service; /// /// Used by the SocketConnectionManager to track one socket connection. It needs to be disposed when done with it diff --git a/src/BuiltInTools/AspireService/Models/ErrorResponse.cs b/src/BuiltInTools/AspireService/Models/ErrorResponse.cs index 0f5094ef1940..7eb0bcc46a6d 100644 --- a/src/BuiltInTools/AspireService/Models/ErrorResponse.cs +++ b/src/BuiltInTools/AspireService/Models/ErrorResponse.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.WebTools.AspireServer.Models; +namespace Aspire.Tools.Service; /// /// Detailed error information serialized into the body of the response diff --git a/src/BuiltInTools/AspireService/Models/InfoResponse.cs b/src/BuiltInTools/AspireService/Models/InfoResponse.cs index ef05bcd6cb11..dda6f8bc3a97 100644 --- a/src/BuiltInTools/AspireService/Models/InfoResponse.cs +++ b/src/BuiltInTools/AspireService/Models/InfoResponse.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.WebTools.AspireServer.Models; +namespace Aspire.Tools.Service; /// /// Response when asked for /info diff --git a/src/BuiltInTools/AspireService/Models/RunSessionRequest.cs b/src/BuiltInTools/AspireService/Models/RunSessionRequest.cs index 1d0d55fb2d5f..7f31a2113fe0 100644 --- a/src/BuiltInTools/AspireService/Models/RunSessionRequest.cs +++ b/src/BuiltInTools/AspireService/Models/RunSessionRequest.cs @@ -1,15 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Diagnostics; -using System.Linq; using System.Text.Json.Serialization; -using Microsoft.WebTools.AspireServer.Contracts; -namespace Microsoft.WebTools.AspireServer.Models; +namespace Aspire.Tools.Service; internal class EnvVar { diff --git a/src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs b/src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs index d20e38f3360f..fd9803c6e4a3 100644 --- a/src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs +++ b/src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Text.Json.Serialization; -namespace Microsoft.WebTools.AspireServer.Models; +namespace Aspire.Tools.Service; internal static class NotificationType { diff --git a/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs b/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs index 37b50cd78318..90ae2d674aca 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; internal sealed class AgentReporter { diff --git a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs b/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs index 3451a89e13c2..eab6448749f5 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Reflection; -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; #if NET [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")] diff --git a/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs b/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs index 223960330e82..9e5a5669ea3a 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs @@ -3,7 +3,7 @@ using System.Reflection; -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; /// /// Finds and invokes metadata update handlers. diff --git a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs index 1988b6a41dab..6d10a619c33d 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs @@ -1,11 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.IO.Pipes; -using Microsoft.DotNet.Watcher; -using Microsoft.Extensions.HotReload; +using Microsoft.DotNet.Watch; +/// +/// The runtime startup hook looks for top-level type named "StartupHook". +/// internal sealed class StartupHook { private static readonly bool s_logToStandardOutput = Environment.GetEnvironmentVariable(EnvironmentVariables.Names.HotReloadDeltaClientLogMessages) == "1"; diff --git a/src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs b/src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs index d8c74accb280..7638306d8017 100644 --- a/src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs +++ b/src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.Serialization.Json; using Microsoft.Build.Framework; -using Microsoft.DotNet.Watcher.Internal; +using Microsoft.DotNet.Watch; using Task = Microsoft.Build.Utilities.Task; namespace DotNetWatchTasks diff --git a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs index 62bb5c073c1a..d806dd11ba45 100644 --- a/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs @@ -5,14 +5,10 @@ using System.Diagnostics; using System.Globalization; using System.Threading.Channels; +using Aspire.Tools.Service; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -using Microsoft.WebTools.AspireServer; -using Microsoft.WebTools.AspireServer.Contracts; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal class AspireServiceFactory : IRuntimeProcessLauncherFactory { diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs index 8e62d46039d9..b7824f636011 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnection.cs @@ -4,9 +4,8 @@ using System.Buffers; using System.Net.WebSockets; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch; internal readonly struct BrowserConnection : IAsyncDisposable { diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs index 994f29c0c9f8..dc120099b3b7 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs @@ -6,10 +6,8 @@ using System.Diagnostics.CodeAnalysis; using System.Text.RegularExpressions; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed partial class BrowserConnector(DotNetWatchContext context) : IAsyncDisposable { diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs index dc0e27565646..274a9c7dfcdf 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs @@ -16,9 +16,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { /// /// Communicates with aspnetcore-browser-refresh.js loaded in the browser. diff --git a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs index ff305bc270c2..7441aaaa0496 100644 --- a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs +++ b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs @@ -9,11 +9,9 @@ using System.Diagnostics; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Tools.Run; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; using NuGet.Common; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed class CommandLineOptions { diff --git a/src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs b/src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs index 95fd1ccb98ed..5b875b1181e3 100644 --- a/src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs +++ b/src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class DotNetWatchContext { diff --git a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs index 0e9715ac7a3c..321ad2924813 100644 --- a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs @@ -4,11 +4,8 @@ using System.Diagnostics; using System.Globalization; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class DotNetWatcher(DotNetWatchContext context, MSBuildFileSetFactory fileSetFactory) : Watcher(context, fileSetFactory) { diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs index 22cbc3ae2e3d..43d17a2312cb 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentOptions.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { [Flags] internal enum TestFlags diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs b/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs index 021e96f763bf..c31413b1d3f2 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentVariables.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal static partial class EnvironmentVariables { diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentVariablesBuilder.cs b/src/BuiltInTools/dotnet-watch/EnvironmentVariablesBuilder.cs index 37f17e94c315..aec5634a4acf 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentVariablesBuilder.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentVariablesBuilder.cs @@ -3,7 +3,7 @@ using System.Diagnostics; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class EnvironmentVariablesBuilder { diff --git a/src/BuiltInTools/dotnet-watch/EnvironmentVariables_StartupHook.cs b/src/BuiltInTools/dotnet-watch/EnvironmentVariables_StartupHook.cs index 9534a3694695..6a9191c1dab7 100644 --- a/src/BuiltInTools/dotnet-watch/EnvironmentVariables_StartupHook.cs +++ b/src/BuiltInTools/dotnet-watch/EnvironmentVariables_StartupHook.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal static partial class EnvironmentVariables { diff --git a/src/BuiltInTools/dotnet-watch/EvaluationResult.cs b/src/BuiltInTools/dotnet-watch/EvaluationResult.cs index 48ca7f6902af..b551c518acf5 100644 --- a/src/BuiltInTools/dotnet-watch/EvaluationResult.cs +++ b/src/BuiltInTools/dotnet-watch/EvaluationResult.cs @@ -3,7 +3,7 @@ using Microsoft.Build.Graph; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed class EvaluationResult(IReadOnlyDictionary files, ProjectGraph? projectGraph) { diff --git a/src/BuiltInTools/dotnet-watch/FileItem.cs b/src/BuiltInTools/dotnet-watch/FileItem.cs index 45caba204f7b..8e0a028d4d09 100644 --- a/src/BuiltInTools/dotnet-watch/FileItem.cs +++ b/src/BuiltInTools/dotnet-watch/FileItem.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal readonly record struct FileItem { diff --git a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs index e96515567666..ae32359c539f 100644 --- a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs +++ b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs @@ -3,10 +3,8 @@ using System.Diagnostics; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal class BuildEvaluator(DotNetWatchContext context, MSBuildFileSetFactory rootProjectFileSetFactory) { diff --git a/src/BuiltInTools/dotnet-watch/GlobalOptions.cs b/src/BuiltInTools/dotnet-watch/GlobalOptions.cs index 090da3fc0c67..9012920b5d2e 100644 --- a/src/BuiltInTools/dotnet-watch/GlobalOptions.cs +++ b/src/BuiltInTools/dotnet-watch/GlobalOptions.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed class GlobalOptions { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs b/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs index f1bd34cec33d..88bf9a039fc6 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; internal enum AgentMessageSeverity : byte { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs index 58094f6b5197..701e9edb8254 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs @@ -4,10 +4,8 @@ using System.Buffers; using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.Extensions.HotReload; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class BlazorWebAssemblyDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, Version? targetFrameworkVersion) : SingleProcessDeltaApplier(reporter) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs index 630cf05a85c6..1eda8a6f7986 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs @@ -4,9 +4,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class BlazorWebAssemblyHostedDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, Version? targetFrameworkVersion) : DeltaApplier(reporter) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index c7da8886806a..b64873f7a74d 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -9,10 +9,8 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.EditAndContinue; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class CompilationHandler : IDisposable { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs index aa9ef087e158..fd5a94da5380 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs @@ -7,10 +7,8 @@ using System.Diagnostics; using System.IO.Pipes; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.Extensions.HotReload; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class DefaultDeltaApplier(IReporter reporter) : SingleProcessDeltaApplier(reporter) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs index 83909a36b693..bac753649d02 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs @@ -4,10 +4,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.Extensions.HotReload; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal abstract class DeltaApplier(IReporter reporter) : IDisposable { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs index 2aff913ac55a..04b3dbb70d52 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs @@ -4,7 +4,7 @@ using System.Diagnostics.Tracing; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { [EventSource(Name = "HotReload")] internal sealed class HotReloadEventSource : EventSource diff --git a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfile.cs b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfile.cs index cf56c3819975..898148d2f331 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfile.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfile.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal enum HotReloadProfile { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfileReader.cs b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfileReader.cs index 38755a8c795b..fe8e9a968e01 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfileReader.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadProfileReader.cs @@ -4,9 +4,8 @@ using Microsoft.Build.Execution; using Microsoft.Build.Graph; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal static class HotReloadProfileReader { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncher.cs index 375e2a9b3248..f91f9342155b 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncher.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; /// /// Process launcher that triggers process launches at runtime of the watched application, diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs index 0c23cfe00975..431e79830ae3 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IRuntimeProcessLauncherFactory.cs @@ -3,7 +3,7 @@ using Microsoft.Build.Graph; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; /// /// Creates for a given root project. diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs index 90ec68694946..16095da7e1f9 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -8,10 +8,8 @@ using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.MSBuild; using Microsoft.CodeAnalysis.Text; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch; internal class IncrementalMSBuildWorkspace : Workspace { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs index ca9cb00d0b2c..0cb55835a07a 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.HotReload +namespace Microsoft.DotNet.Watch { internal readonly struct UpdatePayload(IReadOnlyList deltas, ResponseLoggingLevel responseLoggingLevel) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs index 81e9915e4445..91d461a59a50 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs @@ -3,11 +3,8 @@ using System.Globalization; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal delegate ValueTask ProcessExitAction(int processId, int? exitCode); diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs index 08ae16922305..40412bb9978f 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectNodeMap.cs @@ -3,9 +3,8 @@ using Microsoft.Build.Graph; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal readonly struct ProjectNodeMap(ProjectGraph graph, IReporter reporter) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs b/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs index b8bdb153075c..b6ec99381d8d 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; internal enum ResponseLoggingLevel : byte { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/RestartPrompt.cs b/src/BuiltInTools/dotnet-watch/HotReload/RestartPrompt.cs index d64a10b80ec3..488a7b5018b7 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/RestartPrompt.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/RestartPrompt.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Tasks; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class RestartPrompt(IReporter reporter, ConsoleInputReader requester, bool? noPrompt) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs b/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs index a4a94cf08591..49d8268cf0cf 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs @@ -4,9 +4,8 @@ using System.Collections.Immutable; using Microsoft.Build.Graph; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal delegate ValueTask RestartOperation(CancellationToken cancellationToken); diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs index a5659df6c339..7e8a16b0b8fe 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs @@ -2,13 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections; -using System.Diagnostics; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class ScopedCssFileHandler(IReporter reporter, ProjectNodeMap projectMap, BrowserConnector browserConnector) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/SingleProcessDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/SingleProcessDeltaApplier.cs index f83d52ee2784..5ddd10428664 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/SingleProcessDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/SingleProcessDeltaApplier.cs @@ -5,9 +5,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal abstract class SingleProcessDeltaApplier(IReporter reporter) : DeltaApplier(reporter) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs index 0d768832b923..fd1909dfdbff 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs @@ -2,15 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections; -using System.Diagnostics; using System.Text.Json; using System.Text.Json.Serialization; -using Microsoft.CodeAnalysis.StackTraceExplorer; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class StaticFileHandler(IReporter reporter, ProjectNodeMap projectMap, BrowserConnector browserConnector) { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs b/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs index a05d91784ba1..412ce62fc1b7 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.HotReload; +namespace Microsoft.DotNet.Watch; internal readonly struct UpdateDelta(Guid moduleId, byte[] metadataDelta, byte[] ilDelta, byte[] pdbDelta, int[] updatedTypes) { diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index f5eb2f29fb6b..dc89b4a5c74a 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -3,14 +3,9 @@ using System.Collections.Immutable; using System.Diagnostics; -using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; -using Microsoft.DotNet.Watch; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed partial class HotReloadDotNetWatcher : Watcher { diff --git a/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs index e709c7cf479d..2d15a2d78ba8 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed class BrowserSpecificReporter(int browserId, IReporter underlyingReporter) : IReporter { diff --git a/src/BuiltInTools/dotnet-watch/Internal/CommandLineUtilities.cs b/src/BuiltInTools/dotnet-watch/Internal/CommandLineUtilities.cs index ff710c7666b8..587087f49365 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/CommandLineUtilities.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/CommandLineUtilities.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // Copied from dotnet/runtime/src/libraries/System.Private.CoreLib/src/System/PasteArguments.cs -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal static class CommandLineUtilities { diff --git a/src/BuiltInTools/dotnet-watch/Internal/ConsoleInputReader.cs b/src/BuiltInTools/dotnet-watch/Internal/ConsoleInputReader.cs index c9483fe920ef..3d9a3d4eb09b 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ConsoleInputReader.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ConsoleInputReader.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { internal sealed class ConsoleInputReader(IConsole console, bool quiet, bool suppressEmojis) { diff --git a/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs index 0d1b8be10797..d50f49e8b1cc 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { /// /// This API supports infrastructure and is not intended to be used diff --git a/src/BuiltInTools/dotnet-watch/Internal/Ensure.cs b/src/BuiltInTools/dotnet-watch/Internal/Ensure.cs index fdd7bfaa33f9..21ab1478ab41 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/Ensure.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/Ensure.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { internal static class Ensure { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs index e1513b5a44dd..94d4323096f4 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal sealed class FileWatcher(IReporter reporter) : IDisposable { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs index 5fef3b698624..ca4cd28c9171 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Internal; +namespace Microsoft.DotNet.Watch; internal enum ChangeKind { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs index 9c94c7b49b81..508475247cc7 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/EventBasedDirectoryWatcher.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.ComponentModel; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal sealed class EventBasedDirectoryWatcher : IDirectoryWatcher { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs index c5431d1f100d..7baa775806eb 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/FileWatcherFactory.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal static class FileWatcherFactory { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs index 4cd187cb6fe0..6b1eb73671a9 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IDirectoryWatcher.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal interface IDirectoryWatcher : IDisposable { diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs index df49f214adce..1477e7239783 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingDirectoryWatcher.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal sealed class PollingDirectoryWatcher : IDirectoryWatcher { diff --git a/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs b/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs index 926642927498..0860a30eeae6 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IConsole.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { /// /// This API supports infrastructure and is not intended to be used diff --git a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs index b3d3532a89aa..20ff02183c39 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs @@ -4,11 +4,8 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Graph; -using Microsoft.Build.Tasks; -using Microsoft.DotNet.Watcher; -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { internal enum MessageSeverity { diff --git a/src/BuiltInTools/dotnet-watch/Internal/MSBuildFileSetResult.cs b/src/BuiltInTools/dotnet-watch/Internal/MSBuildFileSetResult.cs index c214abea2938..0067b8542d34 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MSBuildFileSetResult.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MSBuildFileSetResult.cs @@ -3,7 +3,7 @@ using System.Runtime.Serialization; -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { [DataContract] internal sealed class MSBuildFileSetResult diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs index d720550e3e1f..e2be958e813a 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs @@ -4,11 +4,8 @@ using System.Diagnostics; using System.Text.Json; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watch; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { /// /// Used to collect a set of files to watch. diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildProjectFinder.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildProjectFinder.cs index 0ee164e0233b..eb7ba724fa5c 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildProjectFinder.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildProjectFinder.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal class MsBuildProjectFinder { diff --git a/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs index 6812973c3b80..4e9ead24dcce 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { /// /// This API supports infrastructure and is not intended to be used diff --git a/src/BuiltInTools/dotnet-watch/Internal/OutputLine.cs b/src/BuiltInTools/dotnet-watch/Internal/OutputLine.cs index f80037321819..be29eb65cfc8 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/OutputLine.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/OutputLine.cs @@ -1,6 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Internal; +namespace Microsoft.DotNet.Watch; internal readonly record struct OutputLine(string Content, bool IsError); diff --git a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs index 26cba6baded9..3e3e14195dec 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/PhysicalConsole.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher; - -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch { /// /// This API supports infrastructure and is not intended to be used diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs index 415624c0bacf..40a42278e38f 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs @@ -3,9 +3,8 @@ using System.Diagnostics; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch { internal sealed class ProcessRunner { diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs index a46b9d078904..e2746996b589 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed class ProjectSpecificReporter(ProjectGraphNode node, IReporter underlyingReporter) : IReporter { diff --git a/src/BuiltInTools/dotnet-watch/Internal/ReporterTraceListener.cs b/src/BuiltInTools/dotnet-watch/Internal/ReporterTraceListener.cs index 756b62be0160..f67f58af6708 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ReporterTraceListener.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ReporterTraceListener.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal class ReporterTraceListener(IReporter reporter, string emoji) : TraceListener { diff --git a/src/BuiltInTools/dotnet-watch/LaunchSettingsProfile.cs b/src/BuiltInTools/dotnet-watch/LaunchSettingsProfile.cs index 0579ab45f0eb..c1ee9346924f 100644 --- a/src/BuiltInTools/dotnet-watch/LaunchSettingsProfile.cs +++ b/src/BuiltInTools/dotnet-watch/LaunchSettingsProfile.cs @@ -4,9 +4,8 @@ using System.Text.Json; using System.Text.Json.Serialization; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch { internal sealed class LaunchSettingsProfile { diff --git a/src/BuiltInTools/dotnet-watch/ProcessLaunchResult.cs b/src/BuiltInTools/dotnet-watch/ProcessLaunchResult.cs index 3c58c69946a9..6084bc11b213 100644 --- a/src/BuiltInTools/dotnet-watch/ProcessLaunchResult.cs +++ b/src/BuiltInTools/dotnet-watch/ProcessLaunchResult.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class ProcessLaunchResult { diff --git a/src/BuiltInTools/dotnet-watch/ProcessSpec.cs b/src/BuiltInTools/dotnet-watch/ProcessSpec.cs index c6b651c91b55..e8b9f7c53a7b 100644 --- a/src/BuiltInTools/dotnet-watch/ProcessSpec.cs +++ b/src/BuiltInTools/dotnet-watch/ProcessSpec.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class ProcessSpec { diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs index b41f0ab2e32a..ffe38eea3a13 100644 --- a/src/BuiltInTools/dotnet-watch/Program.cs +++ b/src/BuiltInTools/dotnet-watch/Program.cs @@ -5,14 +5,9 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.Loader; -using Microsoft.Build.Graph; using Microsoft.Build.Locator; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; -using IConsole = Microsoft.Extensions.Tools.Internal.IConsole; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal sealed class Program(IConsole console, IReporter reporter, ProjectOptions rootProjectOptions, CommandLineOptions options, EnvironmentOptions environmentOptions) { diff --git a/src/BuiltInTools/dotnet-watch/ProjectOptions.cs b/src/BuiltInTools/dotnet-watch/ProjectOptions.cs index ffb840f76a9e..12b8b889f1f7 100644 --- a/src/BuiltInTools/dotnet-watch/ProjectOptions.cs +++ b/src/BuiltInTools/dotnet-watch/ProjectOptions.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal sealed record ProjectOptions { diff --git a/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs b/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs index 199fc4eb9f91..3c9d85e0be4b 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/BuildUtilities.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Text.RegularExpressions; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watch; diff --git a/src/BuiltInTools/dotnet-watch/Utilities/Disposables.cs b/src/BuiltInTools/dotnet-watch/Utilities/Disposables.cs index 88f5373cdaf0..7aa9de719419 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/Disposables.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/Disposables.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal readonly record struct Disposables(List disposables) : IDisposable { diff --git a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs index 762811f2d372..dc758ef74305 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.Build.Graph; using Microsoft.DotNet.Cli; -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal static class ProjectGraphNodeExtensions { diff --git a/src/BuiltInTools/dotnet-watch/Utilities/Versions.cs b/src/BuiltInTools/dotnet-watch/Utilities/Versions.cs index 4a6f1acf29a2..3f32b1b7d9ad 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/Versions.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/Versions.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch; internal static class Versions { diff --git a/src/BuiltInTools/dotnet-watch/Watcher.cs b/src/BuiltInTools/dotnet-watch/Watcher.cs index b24a93f700e5..5a6f3240b20b 100644 --- a/src/BuiltInTools/dotnet-watch/Watcher.cs +++ b/src/BuiltInTools/dotnet-watch/Watcher.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Tools; -namespace Microsoft.DotNet.Watcher +namespace Microsoft.DotNet.Watch { internal abstract class Watcher(DotNetWatchContext context, MSBuildFileSetFactory rootFileSetFactory) { diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 17311445ab1e..2fb01d75ea7c 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -6,7 +6,7 @@ $(SdkTargetFramework) exe Command line tool to watch for source file changes during development and restart the dotnet command. - Microsoft.DotNet.Watcher.Tools + Microsoft.DotNet.Watch MicrosoftAspNetCore false diff --git a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs index ab1952b2f3e7..e398a63b5985 100644 --- a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs +++ b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs @@ -2,10 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Reflection; -using Microsoft.Extensions.HotReload; using Moq; -namespace Microsoft.Extensions.DotNetDeltaApplier +namespace Microsoft.DotNet.Watch.UnitTests { public class HotReloadAgentTest { diff --git a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs index b5e5467d37ea..547f0618f049 100644 --- a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs +++ b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.DotNetDeltaApplier +namespace Microsoft.DotNet.Watch.UnitTests { public class StartupHookTests { diff --git a/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs b/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs index 30ddc62054a3..d712649cad1d 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs @@ -9,10 +9,8 @@ using System.Net.WebSockets; using System.Security.Cryptography.X509Certificates; using System.Text.Json; -using Microsoft.WebTools.AspireServer.Helpers; -using Microsoft.WebTools.AspireServer.Models; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; public class AspireServerServiceTests(ITestOutputHelper output) { diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs index 19f6d17f15c3..b3b67af5974b 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Sockets; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; public static class Helpers { diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs index 3c805871fdf4..9b0439914320 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. -using Microsoft.WebTools.AspireServer.Contracts; using Moq; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; internal class IAspireServerEventsMock : MockFactory { diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs index c975028c392f..7ad43a448f25 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs @@ -3,7 +3,7 @@ using Moq; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; internal class IServiceProviderMock : MockFactory { diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs index ef9f4467013c..e06829a198fc 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs @@ -3,7 +3,7 @@ using Moq; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; public interface IMockFactory { diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs index 0b546ad5b20e..305e8ffddf5e 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using Moq; -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; public class Mocks { diff --git a/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs b/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs index 4012d02bf10c..38ab5221846d 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs +++ b/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs @@ -3,9 +3,7 @@ #nullable disable -using Microsoft.WebTools.AspireServer.Models; - -namespace Microsoft.WebTools.AspireServer.UnitTests; +namespace Aspire.Tools.Service.UnitTests; public class RunSessionRequestTests { diff --git a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs index 425a2ec5d6d1..5e69e0f83ce7 100644 --- a/test/dotnet-watch.Tests/CommandLineOptionsTests.cs +++ b/test/dotnet-watch.Tests/CommandLineOptionsTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { public class CommandLineOptionsTests { diff --git a/test/dotnet-watch.Tests/ConsoleReporterTests.cs b/test/dotnet-watch.Tests/ConsoleReporterTests.cs index da3155fee5ec..32149ad17ef6 100644 --- a/test/dotnet-watch.Tests/ConsoleReporterTests.cs +++ b/test/dotnet-watch.Tests/ConsoleReporterTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch.UnitTests { public class ReporterTests { diff --git a/test/dotnet-watch.Tests/FileSetSerializerTests.cs b/test/dotnet-watch.Tests/FileSetSerializerTests.cs index 7b03d81ac55f..94c6b8577086 100644 --- a/test/dotnet-watch.Tests/FileSetSerializerTests.cs +++ b/test/dotnet-watch.Tests/FileSetSerializerTests.cs @@ -1,14 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Runtime.CompilerServices; using System.Runtime.Serialization.Json; using System.Text.Json; using DotNetWatchTasks; -using Microsoft.DotNet.Watcher.Internal; using Microsoft.NET.Build.Tasks.UnitTests; -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch.UnitTests; public class FileSetSerializerTests(ITestOutputHelper output) { diff --git a/test/dotnet-watch.Tests/FileWatcherTests.cs b/test/dotnet-watch.Tests/FileWatcherTests.cs index 3614f25413e4..ab12f6c40f45 100644 --- a/test/dotnet-watch.Tests/FileWatcherTests.cs +++ b/test/dotnet-watch.Tests/FileWatcherTests.cs @@ -1,10 +1,7 @@ // 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.Testing; -using Microsoft.DotNet.Watcher.Internal; - -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { public class FileWatcherTests(ITestOutputHelper output) { diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 40f866231f90..c4c8b7a43b76 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -1,11 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Text.RegularExpressions; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { diff --git a/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs b/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs index a61609ad77e3..5720c24cc6cd 100644 --- a/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs +++ b/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs @@ -3,10 +3,7 @@ #nullable enable -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests; +namespace Microsoft.DotNet.Watch.UnitTests; public class CompilationHandlerTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index c87b4de72655..e3b84fb7633b 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -3,10 +3,7 @@ #nullable enable -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests; +namespace Microsoft.DotNet.Watch.UnitTests; public class RuntimeProcessLauncherTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { diff --git a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs index 36cd57fc92e4..75780eb586e6 100644 --- a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs +++ b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.HotReload; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class UpdatePayloadTests { diff --git a/test/dotnet-watch.Tests/Internal/EnvironmentVariablesBuilderTest.cs b/test/dotnet-watch.Tests/Internal/EnvironmentVariablesBuilderTest.cs index fb625d0ce6d8..75941f6762a6 100644 --- a/test/dotnet-watch.Tests/Internal/EnvironmentVariablesBuilderTest.cs +++ b/test/dotnet-watch.Tests/Internal/EnvironmentVariablesBuilderTest.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Tools; - -namespace Microsoft.DotNet.Watcher.Internal +namespace Microsoft.DotNet.Watch.UnitTests { public class EnvironmentVariablesBuilderTest { diff --git a/test/dotnet-watch.Tests/LaunchSettingsProfileTest.cs b/test/dotnet-watch.Tests/LaunchSettingsProfileTest.cs index 204691d9a583..c520c36f330b 100644 --- a/test/dotnet-watch.Tests/LaunchSettingsProfileTest.cs +++ b/test/dotnet-watch.Tests/LaunchSettingsProfileTest.cs @@ -1,10 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch.UnitTests; public class LaunchSettingsProfileTest { diff --git a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs index 901a26dd6fb3..84a9f9e5e095 100644 --- a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs +++ b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs @@ -1,10 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { public class MSBuildEvaluationFilterTest { diff --git a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs index 901cf1c65196..febeb098195a 100644 --- a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs +++ b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs @@ -3,11 +3,7 @@ #nullable enable -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -using Xunit.Sdk; - -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { public class MsBuildFileSetFactoryTest(ITestOutputHelper output) { diff --git a/test/dotnet-watch.Tests/NoRestoreTests.cs b/test/dotnet-watch.Tests/NoRestoreTests.cs index ed32a6afb213..2d12166a6bed 100644 --- a/test/dotnet-watch.Tests/NoRestoreTests.cs +++ b/test/dotnet-watch.Tests/NoRestoreTests.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { public class NoRestoreTests { diff --git a/test/dotnet-watch.Tests/Utilities/AssertEx.cs b/test/dotnet-watch.Tests/Utilities/AssertEx.cs index f6a8e7d7e036..6ed30d98987e 100644 --- a/test/dotnet-watch.Tests/Utilities/AssertEx.cs +++ b/test/dotnet-watch.Tests/Utilities/AssertEx.cs @@ -4,7 +4,7 @@ using System.Collections; using Xunit.Sdk; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { internal static class AssertEx { diff --git a/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs b/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs index c13ac86cdfbb..757bf46d20c1 100644 --- a/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs +++ b/test/dotnet-watch.Tests/Utilities/AwaitableProcess.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Threading.Tasks.Dataflow; -namespace Microsoft.DotNet.Watcher.Tools +namespace Microsoft.DotNet.Watch.UnitTests { internal class AwaitableProcess(DotnetCommand spec, ITestOutputHelper logger) : IDisposable { diff --git a/test/dotnet-watch.Tests/Utilities/DebugTestOutputLogger.cs b/test/dotnet-watch.Tests/Utilities/DebugTestOutputLogger.cs index d9acca6bb08f..e0d03de58c61 100644 --- a/test/dotnet-watch.Tests/Utilities/DebugTestOutputLogger.cs +++ b/test/dotnet-watch.Tests/Utilities/DebugTestOutputLogger.cs @@ -5,7 +5,7 @@ using System.Diagnostics; -namespace Microsoft.DotNet.Watcher.Tests; +namespace Microsoft.DotNet.Watch.UnitTests; public class DebugTestOutputLogger(ITestOutputHelper logger) : ITestOutputHelper { diff --git a/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs b/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs index 6222a5db348e..ba1d287369c6 100644 --- a/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs +++ b/test/dotnet-watch.Tests/Utilities/MockFileSetFactory.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch.UnitTests; internal class MockFileSetFactory() : MSBuildFileSetFactory( rootProjectFile: "test.csproj", diff --git a/test/dotnet-watch.Tests/Utilities/MockReporter.cs b/test/dotnet-watch.Tests/Utilities/MockReporter.cs index 9edeb48b3d4b..ce39c5cd308f 100644 --- a/test/dotnet-watch.Tests/Utilities/MockReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/MockReporter.cs @@ -4,10 +4,8 @@ #nullable enable using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher.Internal; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tools; +namespace Microsoft.DotNet.Watch.UnitTests; internal class MockReporter : IReporter { diff --git a/test/dotnet-watch.Tests/Utilities/TaskExtensions.cs b/test/dotnet-watch.Tests/Utilities/TaskExtensions.cs index 103fc51a39cb..d63492534d01 100644 --- a/test/dotnet-watch.Tests/Utilities/TaskExtensions.cs +++ b/test/dotnet-watch.Tests/Utilities/TaskExtensions.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -namespace Microsoft.AspNetCore.Testing +namespace Microsoft.DotNet.Watch.UnitTests { internal static class TaskExtensions { diff --git a/test/dotnet-watch.Tests/Utilities/TestConsole.cs b/test/dotnet-watch.Tests/Utilities/TestConsole.cs index 909e5e027f6b..080b574c890a 100644 --- a/test/dotnet-watch.Tests/Utilities/TestConsole.cs +++ b/test/dotnet-watch.Tests/Utilities/TestConsole.cs @@ -5,7 +5,7 @@ using System.Reflection; -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch.UnitTests { internal class TestConsole : IConsole { diff --git a/test/dotnet-watch.Tests/Utilities/TestOptions.cs b/test/dotnet-watch.Tests/Utilities/TestOptions.cs index bbc9b51d2e25..46c39e12386c 100644 --- a/test/dotnet-watch.Tests/Utilities/TestOptions.cs +++ b/test/dotnet-watch.Tests/Utilities/TestOptions.cs @@ -3,9 +3,7 @@ #nullable enable -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher; +namespace Microsoft.DotNet.Watch.UnitTests; internal static class TestOptions { diff --git a/test/dotnet-watch.Tests/Utilities/TestReporter.cs b/test/dotnet-watch.Tests/Utilities/TestReporter.cs index cba2d09751a1..0f402c2cce69 100644 --- a/test/dotnet-watch.Tests/Utilities/TestReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/TestReporter.cs @@ -5,10 +5,8 @@ using System.Diagnostics; using Microsoft.Build.Graph; -using Microsoft.DotNet.Watcher; -using Microsoft.DotNet.Watcher.Internal; -namespace Microsoft.Extensions.Tools.Internal +namespace Microsoft.DotNet.Watch.UnitTests { internal class TestReporter(ITestOutputHelper output) : IReporter { diff --git a/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs b/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs index df5b334163b3..b4714791cc86 100644 --- a/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs +++ b/test/dotnet-watch.Tests/Utilities/TestRuntimeProcessLauncher.cs @@ -5,7 +5,7 @@ using Microsoft.Build.Graph; -namespace Microsoft.DotNet.Watcher.Tests; +namespace Microsoft.DotNet.Watch.UnitTests; internal class TestRuntimeProcessLauncher(ProjectLauncher projectLauncher) : IRuntimeProcessLauncher { diff --git a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs index a17a7f8e2294..fc55382456ac 100644 --- a/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs +++ b/test/dotnet-watch.Tests/Watch/BrowserLaunchTests.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class BrowserLaunchTests : DotNetWatchTestBase { diff --git a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs index 50cbf578d2ce..d011b12fcd1e 100644 --- a/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs +++ b/test/dotnet-watch.Tests/Watch/DotNetWatcherTests.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; -using Microsoft.Extensions.Tools.Internal; -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class DotNetWatcherTests : DotNetWatchTestBase { diff --git a/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs b/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs index 4402dd1739c2..48ff617568cc 100644 --- a/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs +++ b/test/dotnet-watch.Tests/Watch/GlobbingAppTests.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Tools; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class GlobbingAppTests : DotNetWatchTestBase { diff --git a/test/dotnet-watch.Tests/Watch/NoDepsAppTests.cs b/test/dotnet-watch.Tests/Watch/NoDepsAppTests.cs index 98c90f9b4110..9614366519d9 100644 --- a/test/dotnet-watch.Tests/Watch/NoDepsAppTests.cs +++ b/test/dotnet-watch.Tests/Watch/NoDepsAppTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class NoDepsAppTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { diff --git a/test/dotnet-watch.Tests/Watch/ProgramTests.cs b/test/dotnet-watch.Tests/Watch/ProgramTests.cs index 43319ebdd215..8fc4f2d20d55 100644 --- a/test/dotnet-watch.Tests/Watch/ProgramTests.cs +++ b/test/dotnet-watch.Tests/Watch/ProgramTests.cs @@ -1,10 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { public class ProgramTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { diff --git a/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs b/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs index 70c38986a1b6..4650141560af 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/DotNetWatchTestBase.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.DotNet.Watcher.Internal; - -namespace Microsoft.DotNet.Watcher.Tests; +namespace Microsoft.DotNet.Watch.UnitTests; /// /// Base class for all tests that create dotnet watch process. diff --git a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs index 8a1b55cb609a..c949b46140bd 100644 --- a/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs +++ b/test/dotnet-watch.Tests/Watch/Utilities/WatchableApp.cs @@ -1,12 +1,7 @@ // 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; -using System.Runtime.CompilerServices; -using Microsoft.DotNet.Watcher.Tools; -using Microsoft.Extensions.Tools.Internal; - -namespace Microsoft.DotNet.Watcher.Tests +namespace Microsoft.DotNet.Watch.UnitTests { internal sealed class WatchableApp(ITestOutputHelper logger) : IDisposable { From 16026eae100436f926b2fc8ddbfed5cef56ecd01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 21:08:18 +0000 Subject: [PATCH 441/702] Update dependencies from https://github.com/dotnet/msbuild build 20241118.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24561-04 -> To Version 17.13.0-preview-24568-05 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db2c31953395..bc2ce184a545 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/msbuild - cb9e69a34c1a972ba43a9f26ac80ec2da919e24a + 37fc8280dd8516257e7d04b9fc5e426de33091f2 - + https://github.com/dotnet/msbuild - cb9e69a34c1a972ba43a9f26ac80ec2da919e24a + 37fc8280dd8516257e7d04b9fc5e426de33091f2 - + https://github.com/dotnet/msbuild - cb9e69a34c1a972ba43a9f26ac80ec2da919e24a + 37fc8280dd8516257e7d04b9fc5e426de33091f2 diff --git a/eng/Versions.props b/eng/Versions.props index cda60f8dd2a2..a7b10edf8e55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,8 +197,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24568-04 - 17.13.0-preview-24568-04 + 17.13.0-preview-24568-05 + 17.13.0-preview-24568-05 17.11.4 17.12 From 82135d695a7a0fd3db63697b523e98bfbfe10551 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 22:26:34 +0000 Subject: [PATCH 442/702] Update dependencies from https://github.com/dotnet/razor build 20241118.6 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24568.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82e143c6cb68..07be129a1cb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 + 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 - + https://github.com/dotnet/razor - 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 + 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 - + https://github.com/dotnet/razor - 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 + 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 - + https://github.com/dotnet/razor - 4d7ed74cf479f85f3025b19ba1dcc8ecbd63d709 + 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 diff --git a/eng/Versions.props b/eng/Versions.props index 144f166459aa..69701eb41395 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24566.1 - 9.0.0-preview.24566.1 - 9.0.0-preview.24566.1 + 9.0.0-preview.24568.6 + 9.0.0-preview.24568.6 + 9.0.0-preview.24568.6 From 2d9217dfb276e6e5299811f3d70e2c20e22e0748 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 00:42:28 +0000 Subject: [PATCH 443/702] Update dependencies from https://github.com/dotnet/razor build 20241118.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.24558.2 -> To Version 9.0.0-preview.24568.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07be129a1cb3..cc3f3636cff0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 + f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor - 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 + f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor - 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 + f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor - 85d74a439c3bbb233cc2d6e6425b6a9f315a5d06 + f3aaba93ee45b9d8aabfd7171019158a2a375696 diff --git a/eng/Versions.props b/eng/Versions.props index 69701eb41395..3ad4625f9d79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24568.6 - 9.0.0-preview.24568.6 - 9.0.0-preview.24568.6 + 9.0.0-preview.24568.7 + 9.0.0-preview.24568.7 + 9.0.0-preview.24568.7 From 83477efc1ed655f45fce4e6074e457cef15380cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 01:32:14 +0000 Subject: [PATCH 444/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241118.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.24561.1 -> To Version 9.0.0-beta.24568.2 --- 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 f45edb090fdf..8800a4287b98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink 234bdefe64fdaee50f0c9343d5eca283bd4342b5 diff --git a/eng/Versions.props b/eng/Versions.props index 7af6fe5e3c86..4b728bb722ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24568.1 - 9.0.0-beta.24568.1 - 9.0.0-beta.24568.1 - 9.0.0-beta.24568.1 - 9.0.0-beta.24568.1 - 9.0.0-beta.24568.1 + 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 From 87bd5a328ef072e17336578eb271c16a8755b8dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 11:33:01 +0000 Subject: [PATCH 445/702] Update dependencies from https://github.com/dotnet/razor build 20241119.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24569.1 --- 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 cc3f3636cff0..82b661958cbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor f3aaba93ee45b9d8aabfd7171019158a2a375696 - + https://github.com/dotnet/razor f3aaba93ee45b9d8aabfd7171019158a2a375696 diff --git a/eng/Versions.props b/eng/Versions.props index 3ad4625f9d79..eaeb2a7393b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24568.7 - 9.0.0-preview.24568.7 - 9.0.0-preview.24568.7 + 9.0.0-preview.24569.1 + 9.0.0-preview.24569.1 + 9.0.0-preview.24569.1 From 34083dc3f10db28f87b7eca315c00125818fbdea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 11:52:04 +0000 Subject: [PATCH 446/702] Update dependencies from https://github.com/dotnet/razor build 20241119.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24558.2 -> To Version 9.0.0-preview.24569.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82b661958cbd..8e17746ff4e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c70204ae3c91d2b48fa6d9b92b62265f368421b4 - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc diff --git a/eng/Versions.props b/eng/Versions.props index eaeb2a7393b4..7eac04fa976c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -248,9 +248,9 @@ - 9.0.0-preview.24569.1 - 9.0.0-preview.24569.1 - 9.0.0-preview.24569.1 + 9.0.0-preview.24569.2 + 9.0.0-preview.24569.2 + 9.0.0-preview.24569.2 From d2cbc75d60e39d1f5594b3dafc7ca7abea2edf06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 13:18:21 +0000 Subject: [PATCH 447/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241118.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.24562.2 -> To Version 9.0.0-beta.24568.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 76a6bedaac0e..c807210d5514 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 - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 diff --git a/eng/Versions.props b/eng/Versions.props index 630285e6ae7f..ebebc79458fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -293,12 +293,12 @@ - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.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.24568.2 From 5a7bcb94d7f6cbbddf035bcdfcfe73e4be869971 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 13:20:36 +0000 Subject: [PATCH 448/702] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241118.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24517.1 -> To Version 9.0.0-alpha.1.24568.3 --- 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 76a6bedaac0e..1bf0d0319af3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -451,9 +451,9 @@ - + https://github.com/dotnet/source-build-reference-packages - a2ad736b86ce484df4d2dfc967bd29cd9d1b5de9 + a3776f67d97bd5d9ada92122330454b284bfe915 From a8b203b5189f28d06ebf85d89b57c317ae139fb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 14:15:15 +0000 Subject: [PATCH 449/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241119.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.24561.1 -> To Version 9.0.0-beta.24569.1 --- 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 8800a4287b98..ee287a80c97c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,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 4b728bb722ff..e682a3eb77bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,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.1 + 9.0.0-beta.24569.1 + 9.0.0-beta.24569.1 + 9.0.0-beta.24569.1 + 9.0.0-beta.24569.1 + 9.0.0-beta.24569.1 From 9a762de33f6a2cbf285f17add8fa06a91367f3e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 14:49:01 +0000 Subject: [PATCH 450/702] Update dependencies from https://github.com/dotnet/msbuild build 20241119.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24569-01 --- NuGet.config | 65 ----------------------------------------- eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 4 +-- 3 files changed, 8 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7536d5c85b6a..a7db05246de0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,59 +6,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -85,36 +46,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9531d43191a0..084134366d80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 6db12431bcab128dc98f1457fe194b5b26a252fa - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 6db12431bcab128dc98f1457fe194b5b26a252fa - + https://github.com/dotnet/msbuild - 37fc8280dd8516257e7d04b9fc5e426de33091f2 + 6db12431bcab128dc98f1457fe194b5b26a252fa diff --git a/eng/Versions.props b/eng/Versions.props index e6d516519c2e..38d7ba8ec894 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -201,8 +201,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24568-05 - 17.13.0-preview-24568-05 + 17.13.0-preview-24569-01 + 17.13.0-preview-24569-01 17.11.4 17.12 From ccf8b9b60b9acad20b21a3a9a433f70e5ead9251 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 15:08:32 +0000 Subject: [PATCH 451/702] Update dependencies from https://github.com/dotnet/msbuild build 20241119.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24569-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 084134366d80..b7ced4a13e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 6db12431bcab128dc98f1457fe194b5b26a252fa + df9e3fc3bab5724f602046d158f7e70a794804e1 - + https://github.com/dotnet/msbuild - 6db12431bcab128dc98f1457fe194b5b26a252fa + df9e3fc3bab5724f602046d158f7e70a794804e1 - + https://github.com/dotnet/msbuild - 6db12431bcab128dc98f1457fe194b5b26a252fa + df9e3fc3bab5724f602046d158f7e70a794804e1 diff --git a/eng/Versions.props b/eng/Versions.props index 38d7ba8ec894..e105914ebcee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -201,8 +201,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24569-01 - 17.13.0-preview-24569-01 + 17.13.0-preview-24569-02 + 17.13.0-preview-24569-02 17.11.4 17.12 From b38e48a9e6be1b62a9a8a774196cf4346c4e9b5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 15:25:37 +0000 Subject: [PATCH 452/702] Update dependencies from https://github.com/dotnet/msbuild build 20241119.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24569-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7ced4a13e02..4a83ad2cd23b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - df9e3fc3bab5724f602046d158f7e70a794804e1 + ea8de8ef97a980c633b0079911c0461c3ffc1496 - + https://github.com/dotnet/msbuild - df9e3fc3bab5724f602046d158f7e70a794804e1 + ea8de8ef97a980c633b0079911c0461c3ffc1496 - + https://github.com/dotnet/msbuild - df9e3fc3bab5724f602046d158f7e70a794804e1 + ea8de8ef97a980c633b0079911c0461c3ffc1496 diff --git a/eng/Versions.props b/eng/Versions.props index e105914ebcee..7887b32ce8f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -201,8 +201,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24569-02 - 17.13.0-preview-24569-02 + 17.13.0-preview-24569-03 + 17.13.0-preview-24569-03 17.11.4 17.12 From ef20af8005dd00a7cd3a4ca339e26d33f10663db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 16:12:13 +0000 Subject: [PATCH 453/702] Update dependencies from https://github.com/dotnet/msbuild build 20241119.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24569-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a83ad2cd23b..f590afcf1a57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - ea8de8ef97a980c633b0079911c0461c3ffc1496 + 8f6b8ad0ace90c777c66711c907227fcfb6f2efe - + https://github.com/dotnet/msbuild - ea8de8ef97a980c633b0079911c0461c3ffc1496 + 8f6b8ad0ace90c777c66711c907227fcfb6f2efe - + https://github.com/dotnet/msbuild - ea8de8ef97a980c633b0079911c0461c3ffc1496 + 8f6b8ad0ace90c777c66711c907227fcfb6f2efe diff --git a/eng/Versions.props b/eng/Versions.props index 7887b32ce8f0..b519c05071f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -201,8 +201,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.13.0-preview-24569-03 - 17.13.0-preview-24569-03 + 17.13.0-preview-24569-04 + 17.13.0-preview-24569-04 17.11.4 17.12 From 03dd8589a443c1812d8cba02504042deeb1e0965 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 19 Nov 2024 08:41:52 -0800 Subject: [PATCH 454/702] Add COM workaround --- .../list/VisualStudioWorkloads.cs | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs index 43553bb769e9..914211211429 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs @@ -19,6 +19,8 @@ namespace Microsoft.DotNet.Workloads.Workload #endif internal static class VisualStudioWorkloads { + private static readonly object s_guard = new(); + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); /// @@ -204,44 +206,50 @@ internal static IEnumerable WriteSDKInstallRecordsForVSWorkloads(IIn /// A list of Visual Studio instances. private static List GetVisualStudioInstances() { - List vsInstances = new(); - - try + // The underlying COM API has a bug where-by it's not safe for concurrent calls. Until their + // bug fix is rolled out use a lock to ensure we don't concurrently access this API. + // https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2241752/ + lock (s_guard) { - SetupConfiguration setupConfiguration = new(); - ISetupConfiguration2 setupConfiguration2 = setupConfiguration; - IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); - ISetupInstance[] instances = new ISetupInstance[1]; - int fetched = 0; + List vsInstances = new(); - do + try { - setupInstances.Next(1, instances, out fetched); + SetupConfiguration setupConfiguration = new(); + ISetupConfiguration2 setupConfiguration2 = setupConfiguration; + IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); + ISetupInstance[] instances = new ISetupInstance[1]; + int fetched = 0; - if (fetched > 0) + do { - ISetupInstance2 instance = (ISetupInstance2)instances[0]; + setupInstances.Next(1, instances, out fetched); - // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs - // such as community, professional, and enterprise. - if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && - version.Major >= 17 && - s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + if (fetched > 0) { - vsInstances.Add(instances[0]); + ISetupInstance2 instance = (ISetupInstance2)instances[0]; + + // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs + // such as community, professional, and enterprise. + if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && + version.Major >= 17 && + s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + { + vsInstances.Add(instances[0]); + } } } + while (fetched > 0); + + } + catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) + { + // Query API not registered, good indication there are no VS installations of 15.0 or later. + // Other exceptions are passed through since that likely points to a real error. } - while (fetched > 0); + return vsInstances; } - catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) - { - // Query API not registered, good indication there are no VS installations of 15.0 or later. - // Other exceptions are passed through since that likely points to a real error. - } - - return vsInstances; } } } From 7fb5f08818a6c3be29573dcf3054dabfb7a40f69 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 19 Nov 2024 08:46:52 -0800 Subject: [PATCH 455/702] Add COM workaround --- .../list/VisualStudioWorkloads.cs | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs index fe7415bdac98..d172e76751ba 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs @@ -20,6 +20,8 @@ namespace Microsoft.DotNet.Workloads.Workload #endif internal static class VisualStudioWorkloads { + private static readonly object s_guard = new(); + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); /// @@ -158,44 +160,50 @@ internal static void WriteSDKInstallRecordsForVSWorkloads(IInstaller workloadIns /// A list of Visual Studio instances. private static List GetVisualStudioInstances() { - List vsInstances = new(); - - try + // The underlying COM API has a bug where-by it's not safe for concurrent calls. Until their + // bug fix is rolled out use a lock to ensure we don't concurrently access this API. + // https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2241752/ + lock (s_guard) { - SetupConfiguration setupConfiguration = new(); - ISetupConfiguration2 setupConfiguration2 = setupConfiguration; - IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); - ISetupInstance[] instances = new ISetupInstance[1]; - int fetched = 0; + List vsInstances = new(); - do + try { - setupInstances.Next(1, instances, out fetched); + SetupConfiguration setupConfiguration = new(); + ISetupConfiguration2 setupConfiguration2 = setupConfiguration; + IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); + ISetupInstance[] instances = new ISetupInstance[1]; + int fetched = 0; - if (fetched > 0) + do { - ISetupInstance2 instance = (ISetupInstance2)instances[0]; + setupInstances.Next(1, instances, out fetched); - // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs - // such as community, professional, and enterprise. - if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && - version.Major >= 17 && - s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + if (fetched > 0) { - vsInstances.Add(instances[0]); + ISetupInstance2 instance = (ISetupInstance2)instances[0]; + + // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs + // such as community, professional, and enterprise. + if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && + version.Major >= 17 && + s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + { + vsInstances.Add(instances[0]); + } } } + while (fetched > 0); + + } + catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) + { + // Query API not registered, good indication there are no VS installations of 15.0 or later. + // Other exceptions are passed through since that likely points to a real error. } - while (fetched > 0); + return vsInstances; } - catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) - { - // Query API not registered, good indication there are no VS installations of 15.0 or later. - // Other exceptions are passed through since that likely points to a real error. - } - - return vsInstances; } } } From 1678e3e0b2ff890945f4a581f6ebbbeff89f1c53 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Nov 2024 11:45:02 -0800 Subject: [PATCH 456/702] Fix failing tests because of "UseUwpTools" property (#44859) --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 6c3dac9ca3f5..46f9c2a07fa5 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -463,6 +463,7 @@ public void ItWarnsWhenBuildingAProjectWithUseUwpProperty() TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -484,6 +485,7 @@ public void ItErrorsWhenTargetingBelowNet6WithUseUwpProperty() TargetFrameworks = "netstandard2.0" }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -505,6 +507,7 @@ public void ItErrorsWhenTransitivelyReferencingWindowsUIXamlReferencesWithoutUse TargetFrameworks = "net9.0-windows10.0.22621.0" }; testProjectA.AdditionalProperties["UseUwp"] = "true"; + testProjectA.AdditionalProperties["UseUwpTools"] = "false"; TestProject testProjectB = new() { @@ -579,6 +582,7 @@ public void ItBuildsWhenReferencingWindowsUIXamlTypesWithUseUwpProperty() } }; testProject.AdditionalProperties["UseUwp"] = "true"; + testProject.AdditionalProperties["UseUwpTools"] = "false"; // Temporary until new projections flow to tests testProject.AdditionalProperties["WindowsSdkPackageVersion"] = "10.0.22621.39"; From 01f15a2f7f8482f7d2b15627559dd6f842264f14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Nov 2024 22:25:15 +0000 Subject: [PATCH 457/702] Update dependencies from https://github.com/dotnet/arcade build 20241112.13 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67386e44fbc1..d883399180a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -585,34 +585,34 @@ - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de diff --git a/eng/Versions.props b/eng/Versions.props index 55bd930c4217..b2f3a1946b05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -291,10 +291,10 @@ - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 diff --git a/global.json b/global.json index d2eb21c71695..21f2755cb612 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 5026a4153b7f2ba5fa5fa4d77d7332625076f72f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 13:18:49 +0000 Subject: [PATCH 458/702] Update dependencies from https://github.com/dotnet/source-build-externals build 20241118.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24516.3 -> To Version 9.0.0-alpha.1.24568.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 b2511646235c..3b26c67f78a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 4df883d781a4290873b3b968afc0ff0df7132507 + c65b1c1affed1f4847f9c3f81623dfa929d21e1a From ca11bc0eb4d19eb54061662ed1d23a0eb9d6928c Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 6 Nov 2024 15:11:14 -0800 Subject: [PATCH 459/702] Run 'AddImplicitDefineConstants' on 'BeforeCompile' --- .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 6f5100260835..71706dbc7843 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -251,11 +251,18 @@ Copyright (c) .NET Foundation. All rights reserved. - + + BeforeTargets="BeforeCompile" > $(DefineConstants);@(_ImplicitDefineConstant) $(FinalDefineConstants),@(_ImplicitDefineConstant->'%(Identity)=-1', ',') From 3811fa719520a8bf74b14eaeb61684a46e1c9947 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Nov 2024 22:08:43 +0000 Subject: [PATCH 460/702] Update dependencies from https://github.com/dotnet/razor build 20241119.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24569.2 -> To Version 9.0.0-preview.24569.3 --- NuGet.config | 65 ----------------------------------------- eng/Version.Details.xml | 16 +++++----- eng/Versions.props | 6 ++-- 3 files changed, 11 insertions(+), 76 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7536d5c85b6a..a7db05246de0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,59 +6,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -85,36 +46,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67386e44fbc1..0c057b3bf1ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 70303665960a0a97758b178c288e7c2f88905bcc + 58984fe5824f9b579a01d00f29fef5c8ac968712 - + https://github.com/dotnet/razor - 70303665960a0a97758b178c288e7c2f88905bcc + 58984fe5824f9b579a01d00f29fef5c8ac968712 - + https://github.com/dotnet/razor - 70303665960a0a97758b178c288e7c2f88905bcc + 58984fe5824f9b579a01d00f29fef5c8ac968712 - + https://github.com/dotnet/razor - 70303665960a0a97758b178c288e7c2f88905bcc + 58984fe5824f9b579a01d00f29fef5c8ac968712 diff --git a/eng/Versions.props b/eng/Versions.props index 2f871a4c88ba..74386e4623ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24569.2 - 9.0.0-preview.24569.2 - 9.0.0-preview.24569.2 + 9.0.0-preview.24569.3 + 9.0.0-preview.24569.3 + 9.0.0-preview.24569.3 From 155633403ee26b9e9fc3ae421a14f3b5f678ff64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 00:55:26 +0000 Subject: [PATCH 461/702] 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.24561.1 -> To Version 9.0.0-beta.24569.2 --- 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 ee287a80c97c..f6863ea1f0ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 - + https://github.com/dotnet/sourcelink a190fddd4aeb983b59b682c984692639c8c7d100 diff --git a/eng/Versions.props b/eng/Versions.props index e682a3eb77bf..ea3e91de2a52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -294,12 +294,12 @@ - 9.0.0-beta.24569.1 - 9.0.0-beta.24569.1 - 9.0.0-beta.24569.1 - 9.0.0-beta.24569.1 - 9.0.0-beta.24569.1 - 9.0.0-beta.24569.1 + 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 8e7d4726e8acfbde1161a129bf07e28d18f556d0 Mon Sep 17 00:00:00 2001 From: tmat Date: Sat, 16 Nov 2024 07:44:58 -0800 Subject: [PATCH 462/702] Apply xunit configuration to all tests for better test failure diagnostics --- test/Directory.Build.props | 3 +++ test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj | 1 - test/dotnet-new.Tests/xunit.runner.json | 5 ----- test/dotnet-watch.Tests/dotnet-watch.Tests.csproj | 3 --- test/dotnet.Tests/dotnet.Tests.csproj | 4 ---- test/dotnet.Tests/xunit.runner.json | 6 ------ test/{dotnet-watch.Tests => }/xunit.runner.json | 0 7 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 test/dotnet-new.Tests/xunit.runner.json delete mode 100644 test/dotnet.Tests/xunit.runner.json rename test/{dotnet-watch.Tests => }/xunit.runner.json (100%) diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 82e7362363f8..4840ad756143 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -38,4 +38,7 @@ + + + diff --git a/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj index ebbe79272df2..9fe5414c384d 100644 --- a/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj @@ -76,7 +76,6 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests - diff --git a/test/dotnet-new.Tests/xunit.runner.json b/test/dotnet-new.Tests/xunit.runner.json deleted file mode 100644 index 4dca131cc476..000000000000 --- a/test/dotnet-new.Tests/xunit.runner.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", - "diagnosticMessages": true, - "longRunningTestSeconds": 120 -} diff --git a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj index bf367142bbc3..774159200782 100644 --- a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj +++ b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj @@ -9,9 +9,6 @@ - - - diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 76d95d0b1c39..4bb8bfdc1df5 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -125,10 +125,6 @@ - - - - diff --git a/test/dotnet.Tests/xunit.runner.json b/test/dotnet.Tests/xunit.runner.json deleted file mode 100644 index d766d6750a82..000000000000 --- a/test/dotnet.Tests/xunit.runner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", - "diagnosticMessages": true, - "internalDiagnosticMessages": true, - "longRunningTestSeconds": 120 -} diff --git a/test/dotnet-watch.Tests/xunit.runner.json b/test/xunit.runner.json similarity index 100% rename from test/dotnet-watch.Tests/xunit.runner.json rename to test/xunit.runner.json From b12ef3b3a3e40de4fb2058662ac5968ad535d3f6 Mon Sep 17 00:00:00 2001 From: tmat Date: Sat, 16 Nov 2024 14:19:54 -0800 Subject: [PATCH 463/702] Fix --- test/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 4840ad756143..e7d9b9edccf3 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -39,6 +39,6 @@ - + From 3e99449c92657a33893b08eae36ecf334fe27e03 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 19 Nov 2024 11:31:16 -0800 Subject: [PATCH 464/702] Work around concurrency issue in COM API --- .../list/VisualStudioWorkloads.cs | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs index 43553bb769e9..914211211429 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs @@ -19,6 +19,8 @@ namespace Microsoft.DotNet.Workloads.Workload #endif internal static class VisualStudioWorkloads { + private static readonly object s_guard = new(); + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); /// @@ -204,44 +206,50 @@ internal static IEnumerable WriteSDKInstallRecordsForVSWorkloads(IIn /// A list of Visual Studio instances. private static List GetVisualStudioInstances() { - List vsInstances = new(); - - try + // The underlying COM API has a bug where-by it's not safe for concurrent calls. Until their + // bug fix is rolled out use a lock to ensure we don't concurrently access this API. + // https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2241752/ + lock (s_guard) { - SetupConfiguration setupConfiguration = new(); - ISetupConfiguration2 setupConfiguration2 = setupConfiguration; - IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); - ISetupInstance[] instances = new ISetupInstance[1]; - int fetched = 0; + List vsInstances = new(); - do + try { - setupInstances.Next(1, instances, out fetched); + SetupConfiguration setupConfiguration = new(); + ISetupConfiguration2 setupConfiguration2 = setupConfiguration; + IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); + ISetupInstance[] instances = new ISetupInstance[1]; + int fetched = 0; - if (fetched > 0) + do { - ISetupInstance2 instance = (ISetupInstance2)instances[0]; + setupInstances.Next(1, instances, out fetched); - // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs - // such as community, professional, and enterprise. - if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && - version.Major >= 17 && - s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + if (fetched > 0) { - vsInstances.Add(instances[0]); + ISetupInstance2 instance = (ISetupInstance2)instances[0]; + + // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs + // such as community, professional, and enterprise. + if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && + version.Major >= 17 && + s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + { + vsInstances.Add(instances[0]); + } } } + while (fetched > 0); + + } + catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) + { + // Query API not registered, good indication there are no VS installations of 15.0 or later. + // Other exceptions are passed through since that likely points to a real error. } - while (fetched > 0); + return vsInstances; } - catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) - { - // Query API not registered, good indication there are no VS installations of 15.0 or later. - // Other exceptions are passed through since that likely points to a real error. - } - - return vsInstances; } } } From da68a296d3a85944f143c6fe3b9dcfd3cf9d8989 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 02:23:39 +0000 Subject: [PATCH 465/702] Update dependencies from https://github.com/dotnet/razor build 20241119.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24569.2 -> To Version 9.0.0-preview.24569.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c057b3bf1ef..e6d7ffcb1cf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 58984fe5824f9b579a01d00f29fef5c8ac968712 + 7390745dcd9c8831d4459437ed2e9e94125f3dd3 - + https://github.com/dotnet/razor - 58984fe5824f9b579a01d00f29fef5c8ac968712 + 7390745dcd9c8831d4459437ed2e9e94125f3dd3 - + https://github.com/dotnet/razor - 58984fe5824f9b579a01d00f29fef5c8ac968712 + 7390745dcd9c8831d4459437ed2e9e94125f3dd3 - + https://github.com/dotnet/razor - 58984fe5824f9b579a01d00f29fef5c8ac968712 + 7390745dcd9c8831d4459437ed2e9e94125f3dd3 diff --git a/eng/Versions.props b/eng/Versions.props index 74386e4623ec..70bad22108c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24569.3 - 9.0.0-preview.24569.3 - 9.0.0-preview.24569.3 + 9.0.0-preview.24569.4 + 9.0.0-preview.24569.4 + 9.0.0-preview.24569.4 From 4f0bcf1ae59f914dd8b6a136ff501c422cdd026c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 19 Nov 2024 18:41:57 -0800 Subject: [PATCH 466/702] Workaround for MSBuildProjectLoader.LoadProjectInfoAsync throwing on unrecognized project language (#44927) --- .../HotReload/IncrementalMSBuildWorkspace.cs | 12 ++++- .../dotnet-watch/HotReloadDotNetWatcher.cs | 15 +++++- .../HotReload/ApplyDeltaTests.cs | 54 +++++++++++++++++++ 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs index 16095da7e1f9..38fcc3cc1afc 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -36,7 +36,17 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok var loader = new MSBuildProjectLoader(this); var projectMap = ProjectMap.Create(); - var projectInfos = await loader.LoadProjectInfoAsync(rootProjectPath, projectMap, progress: null, msbuildLogger: null, cancellationToken).ConfigureAwait(false); + + ImmutableArray projectInfos; + try + { + projectInfos = await loader.LoadProjectInfoAsync(rootProjectPath, projectMap, progress: null, msbuildLogger: null, cancellationToken).ConfigureAwait(false); + } + catch (InvalidOperationException) + { + // TODO: workaround for https://github.com/dotnet/roslyn/issues/75956 + projectInfos = []; + } var oldProjectIdsByPath = oldSolution.Projects.ToDictionary(keySelector: static p => p.FilePath!, elementSelector: static p => p.Id); diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index dc89b4a5c74a..45b0fc6d200d 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -93,12 +93,13 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke // use normalized MSBuild path so that we can index into the ProjectGraph rootProjectOptions = rootProjectOptions with { ProjectPath = rootProject.ProjectInstance.FullPath }; - if (rootProject.GetCapabilities().Contains(AspireServiceFactory.AppHostProjectCapability)) + var rootProjectCapabilities = rootProject.GetCapabilities(); + if (rootProjectCapabilities.Contains(AspireServiceFactory.AppHostProjectCapability)) { runtimeProcessLauncherFactory ??= AspireServiceFactory.Instance; Context.Reporter.Verbose("Using Aspire process launcher."); } - + await using var browserConnector = new BrowserConnector(Context); var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, Context.Reporter); compilationHandler = new CompilationHandler(Context.Reporter); @@ -231,6 +232,16 @@ void FileChangedCallback(string path, ChangeKind kind) continue; } + if (!rootProjectCapabilities.Contains("SupportsHotReload")) + { + Context.Reporter.Warn($"Project '{rootProject.GetDisplayName()}' does not support Hot Reload and must be rebuilt."); + + // file change already detected + waitForFileChangeBeforeRestarting = false; + iterationCancellationSource.Cancel(); + break; + } + HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.Main); var stopwatch = Stopwatch.StartNew(); diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index c4c8b7a43b76..a2060d3f9470 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -65,6 +65,60 @@ public static void Print() await App.AssertOutputLineStartsWith("Changed!"); } + [Fact] + public async Task ChangeFileInFSharpProject() + { + var testAsset = TestAssets.CopyTestAsset("FSharpTestAppSimple") + .WithSource(); + + App.Start(testAsset, []); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + + UpdateSourceFile(Path.Combine(testAsset.Path, "Program.fs"), content => content.Replace("Hello World!", "")); + + await App.AssertOutputLineStartsWith(""); + } + + [Fact] + public async Task ChangeFileInFSharpProjectWithLoop() + { + var testAsset = TestAssets.CopyTestAsset("FSharpTestAppSimple") + .WithSource(); + + var source = """ + module ConsoleApplication.Program + + open System + open System.Threading + + [] + let main argv = + while true do + printfn "Waiting" + Thread.Sleep(200) + 0 + """; + + var sourcePath = Path.Combine(testAsset.Path, "Program.fs"); + + File.WriteAllText(sourcePath, source); + + App.Start(testAsset, []); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForChanges); + + UpdateSourceFile(sourcePath, content => content.Replace("Waiting", "")); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForChanges, failure: _ => false); + await App.AssertOutputLineStartsWith(""); + + UpdateSourceFile(sourcePath, content => content.Replace("", "")); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForChanges, failure: _ => false); + await App.AssertOutputLineStartsWith(""); + } + // Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669 [CoreMSBuildOnlyFact] public async Task HandleTypeLoadFailure() From 00a11520eebc20b16e0ec7c66182cae64937a9fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 13:52:51 +0000 Subject: [PATCH 467/702] 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 468/702] 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 12e40a52f33c6528ab508723a3edfe100ea6b18f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 14:28:43 +0000 Subject: [PATCH 469/702] 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.24561.1 -> To Version 1.1.0-rtm.24570.1 --- NuGet.config | 65 ----------------------------------------- eng/Version.Details.xml | 8 ++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7536d5c85b6a..a7db05246de0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,59 +6,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -85,36 +46,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2aee42f88fd..2119134315e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,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 7cf48fb54921..45e4376ac6ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24568.1 + 1.1.0-rtm.24570.1 From 89f4a547fb2411156fe47106cb91a32d32ecffe4 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 20 Nov 2024 09:24:41 -0600 Subject: [PATCH 470/702] Add .npmrc to prevent npmjs usage, even accidentally The esproj tests don't run npm, but due to compliance requirements we cannot have any potential useage of npmjs.org directly --- .../TestProjects/ProjectWithEsProjReference/.npmrc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc b/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc new file mode 100644 index 000000000000..cc06a0c3ebff --- /dev/null +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc @@ -0,0 +1,5 @@ +# this file is never used during the tests that test esproj support, +# but is placed here to satisfy compilance rules for NPM usage. +registry=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ + +always-auth=true From 9d2f8cb861ccb0d99946fba08ba790ba38fa7443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 15:25:03 +0000 Subject: [PATCH 471/702] 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.24561.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 2119134315e0..a389120298c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,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 45e4376ac6ee..c6b6f3a4d10a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24570.1 + 1.1.0-rtm.24570.2 From b65fc0b71d929b600edbf5eb29ba7eb0c9fb245c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 15:25:04 +0000 Subject: [PATCH 472/702] 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 a63486ed8d35ff8a7ee4995570a244efdcd2ae8f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 20 Nov 2024 10:07:20 -0600 Subject: [PATCH 473/702] Update test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc Co-authored-by: Kalle Olavi Niemitalo --- test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc b/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc index cc06a0c3ebff..ac9779a9eaa4 100644 --- a/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc +++ b/test/TestAssets/TestProjects/ProjectWithEsProjReference/.npmrc @@ -1,5 +1,5 @@ # this file is never used during the tests that test esproj support, -# but is placed here to satisfy compilance rules for NPM usage. +# but is placed here to satisfy compliance rules for NPM usage. registry=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ always-auth=true From aa6668e5691cb019f8ce149305b568ce25ccc0d4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 20 Nov 2024 14:56:00 -0800 Subject: [PATCH 474/702] Increment branding to allow for post-GA hotfixes --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 934b21cc82b4..95443bc1d9ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 01 + 02 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 11)) + $([MSBuild]::Add($(VersionFeature), 10)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 612c99f63850c8424f273b95913dd8b053636f05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 20 Nov 2024 14:57:11 -0800 Subject: [PATCH 475/702] Remove AspNET substraction logic We removed the downlevel templates from 9.0.1xx but there was some cruft left behind likely from a merge. Let's clear this out. --- eng/Versions.props | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 934b21cc82b4..ed271b618199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,22 +40,6 @@ referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. --> <_NET70ILLinkPackVersion>7.0.100-1.23211.1 - - - $(VersionFeature) - - true - true - true - https://dotnetbuilds.blob.core.windows.net/public/ From d28b5e324997330a6ec1834400854f32283a91d4 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Thu, 21 Nov 2024 00:14:09 +0100 Subject: [PATCH 476/702] [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 f2135112aa6460fe72d5f072f2a74558fb8bd774 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Nov 2024 23:37:40 +0000 Subject: [PATCH 477/702] Update dependencies from https://github.com/dotnet/razor build 20241120.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24569.2 -> To Version 9.0.0-preview.24570.1 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index a7db05246de0..967259370182 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6d7ffcb1cf2..4a9ebfbe2cac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 7390745dcd9c8831d4459437ed2e9e94125f3dd3 + 2ce77ad9c94e9307fde228af196251de1d3b1d29 - + https://github.com/dotnet/razor - 7390745dcd9c8831d4459437ed2e9e94125f3dd3 + 2ce77ad9c94e9307fde228af196251de1d3b1d29 - + https://github.com/dotnet/razor - 7390745dcd9c8831d4459437ed2e9e94125f3dd3 + 2ce77ad9c94e9307fde228af196251de1d3b1d29 - + https://github.com/dotnet/razor - 7390745dcd9c8831d4459437ed2e9e94125f3dd3 + 2ce77ad9c94e9307fde228af196251de1d3b1d29 diff --git a/eng/Versions.props b/eng/Versions.props index 70bad22108c2..781c91f2e4bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24569.4 - 9.0.0-preview.24569.4 - 9.0.0-preview.24569.4 + 9.0.0-preview.24570.1 + 9.0.0-preview.24570.1 + 9.0.0-preview.24570.1 From ee50720369498f03ba2b8cb4deecef36df44d258 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 06:34:27 +0000 Subject: [PATCH 478/702] Update dependencies from https://github.com/dotnet/razor build 20241120.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24569.2 -> To Version 9.0.0-preview.24570.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a9ebfbe2cac..35b938081aac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 2ce77ad9c94e9307fde228af196251de1d3b1d29 + 2916c403e69983b639ff71bd9d6eee324828c2e1 - + https://github.com/dotnet/razor - 2ce77ad9c94e9307fde228af196251de1d3b1d29 + 2916c403e69983b639ff71bd9d6eee324828c2e1 - + https://github.com/dotnet/razor - 2ce77ad9c94e9307fde228af196251de1d3b1d29 + 2916c403e69983b639ff71bd9d6eee324828c2e1 - + https://github.com/dotnet/razor - 2ce77ad9c94e9307fde228af196251de1d3b1d29 + 2916c403e69983b639ff71bd9d6eee324828c2e1 diff --git a/eng/Versions.props b/eng/Versions.props index 781c91f2e4bf..fed1f5ef08e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24570.1 - 9.0.0-preview.24570.1 - 9.0.0-preview.24570.1 + 9.0.0-preview.24570.2 + 9.0.0-preview.24570.2 + 9.0.0-preview.24570.2 From 1b806f725fbdb30ab1661b99f07925adaa888920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Thu, 21 Nov 2024 10:12:27 +0100 Subject: [PATCH 479/702] Fix tests to list the new templates --- ...ests.Create_GetAllSuggestions.verified.txt | 51 ++++++++++++++++++- ...RootCommand_GetAllSuggestions.verified.txt | 49 ++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt index 3411c7106177..53a35151aee7 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt @@ -48,6 +48,27 @@ InsertText: globaljson, Documentation: A file for selecting the .NET SDK version. }, + { + Label: mstest, + Kind: Value, + SortText: mstest, + InsertText: mstest, + Documentation: A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS. + }, + { + Label: mstest-class, + Kind: Value, + SortText: mstest-class, + InsertText: mstest-class, + Documentation: Creates a new MSTest test class + }, + { + Label: mstest-playwright, + Kind: Value, + SortText: mstest-playwright, + InsertText: mstest-playwright, + Documentation: A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS. + }, { Label: nugetconfig, Kind: Value, @@ -55,6 +76,27 @@ InsertText: nugetconfig, Documentation: A file for configuring the locations NuGet will search for packages }, + { + Label: nunit, + Kind: Value, + SortText: nunit, + InsertText: nunit, + Documentation: A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS + }, + { + Label: nunit-playwright, + Kind: Value, + SortText: nunit-playwright, + InsertText: nunit-playwright, + Documentation: A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS. + }, + { + Label: nunit-test, + Kind: Value, + SortText: nunit-test, + InsertText: nunit-test, + Documentation: Creates a new NUnit test class + }, { Label: packagesprops, Kind: Value, @@ -83,6 +125,13 @@ InsertText: webconfig, Documentation: A file used to configure Web Application settings }, + { + Label: xunit, + Kind: Value, + SortText: xunit, + InsertText: xunit, + Documentation: A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS + }, { Label: --dry-run, Kind: Keyword, @@ -139,4 +188,4 @@ InsertText: -o, Detail: Location to place the generated output. } -] +] \ No newline at end of file diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt index af1ff1d17df9..30d300a9e16d 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt @@ -48,6 +48,27 @@ InsertText: globaljson, Documentation: A file for selecting the .NET SDK version. }, + { + Label: mstest, + Kind: Value, + SortText: mstest, + InsertText: mstest, + Documentation: A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS. + }, + { + Label: mstest-class, + Kind: Value, + SortText: mstest-class, + InsertText: mstest-class, + Documentation: Creates a new MSTest test class + }, + { + Label: mstest-playwright, + Kind: Value, + SortText: mstest-playwright, + InsertText: mstest-playwright, + Documentation: A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS. + }, { Label: nugetconfig, Kind: Value, @@ -55,6 +76,27 @@ InsertText: nugetconfig, Documentation: A file for configuring the locations NuGet will search for packages }, + { + Label: nunit, + Kind: Value, + SortText: nunit, + InsertText: nunit, + Documentation: A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS + }, + { + Label: nunit-playwright, + Kind: Value, + SortText: nunit-playwright, + InsertText: nunit-playwright, + Documentation: A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS. + }, + { + Label: nunit-test, + Kind: Value, + SortText: nunit-test, + InsertText: nunit-test, + Documentation: Creates a new NUnit test class + }, { Label: packagesprops, Kind: Value, @@ -83,6 +125,13 @@ InsertText: webconfig, Documentation: A file used to configure Web Application settings }, + { + Label: xunit, + Kind: Value, + SortText: xunit, + InsertText: xunit, + Documentation: A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS + }, { Label: --dry-run, Kind: Keyword, From 011e4f616eeefb1db9d7bda4ab9691837d7beaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Thu, 21 Nov 2024 10:12:41 +0100 Subject: [PATCH 480/702] Port changes from test-templates repo --- .../.template.config/localize/templatestrings.cs.json | 1 + .../.template.config/localize/templatestrings.de.json | 1 + .../.template.config/localize/templatestrings.en.json | 1 + .../.template.config/localize/templatestrings.es.json | 1 + .../.template.config/localize/templatestrings.fr.json | 1 + .../.template.config/localize/templatestrings.it.json | 1 + .../.template.config/localize/templatestrings.ja.json | 1 + .../.template.config/localize/templatestrings.ko.json | 1 + .../.template.config/localize/templatestrings.pl.json | 1 + .../.template.config/localize/templatestrings.pt-BR.json | 1 + .../.template.config/localize/templatestrings.ru.json | 1 + .../.template.config/localize/templatestrings.tr.json | 1 + .../localize/templatestrings.zh-Hans.json | 1 + .../localize/templatestrings.zh-Hant.json | 1 + .../.template.config/template.json | 1 + .../.template.config/localize/templatestrings.cs.json | 1 + .../.template.config/localize/templatestrings.de.json | 1 + .../.template.config/localize/templatestrings.en.json | 1 + .../.template.config/localize/templatestrings.es.json | 1 + .../.template.config/localize/templatestrings.fr.json | 1 + .../.template.config/localize/templatestrings.it.json | 1 + .../.template.config/localize/templatestrings.ja.json | 1 + .../.template.config/localize/templatestrings.ko.json | 1 + .../.template.config/localize/templatestrings.pl.json | 1 + .../.template.config/localize/templatestrings.pt-BR.json | 1 + .../.template.config/localize/templatestrings.ru.json | 1 + .../.template.config/localize/templatestrings.tr.json | 1 + .../localize/templatestrings.zh-Hans.json | 1 + .../localize/templatestrings.zh-Hant.json | 1 + .../.template.config/template.json | 1 + .../.template.config/localize/templatestrings.cs.json | 1 + .../.template.config/localize/templatestrings.de.json | 1 + .../.template.config/localize/templatestrings.en.json | 1 + .../.template.config/localize/templatestrings.es.json | 1 + .../.template.config/localize/templatestrings.fr.json | 1 + .../.template.config/localize/templatestrings.it.json | 1 + .../.template.config/localize/templatestrings.ja.json | 1 + .../.template.config/localize/templatestrings.ko.json | 1 + .../.template.config/localize/templatestrings.pl.json | 1 + .../.template.config/localize/templatestrings.pt-BR.json | 1 + .../.template.config/localize/templatestrings.ru.json | 1 + .../.template.config/localize/templatestrings.tr.json | 1 + .../localize/templatestrings.zh-Hans.json | 1 + .../localize/templatestrings.zh-Hant.json | 1 + .../.template.config/template.json | 1 + .../.template.config/localize/templatestrings.cs.json | 5 +++++ .../.template.config/localize/templatestrings.de.json | 5 +++++ .../.template.config/localize/templatestrings.en.json | 5 +++++ .../.template.config/localize/templatestrings.es.json | 5 +++++ .../.template.config/localize/templatestrings.fr.json | 5 +++++ .../.template.config/localize/templatestrings.it.json | 5 +++++ .../.template.config/localize/templatestrings.ja.json | 5 +++++ .../.template.config/localize/templatestrings.ko.json | 5 +++++ .../.template.config/localize/templatestrings.pl.json | 5 +++++ .../.template.config/localize/templatestrings.pt-BR.json | 5 +++++ .../.template.config/localize/templatestrings.ru.json | 5 +++++ .../.template.config/localize/templatestrings.tr.json | 5 +++++ .../localize/templatestrings.zh-Hans.json | 5 +++++ .../localize/templatestrings.zh-Hant.json | 5 +++++ .../content/MSTest-CSharp/.template.config/template.json | 9 +++++++-- .../.template.config/localize/templatestrings.cs.json | 5 +++++ .../.template.config/localize/templatestrings.de.json | 5 +++++ .../.template.config/localize/templatestrings.en.json | 5 +++++ .../.template.config/localize/templatestrings.es.json | 5 +++++ .../.template.config/localize/templatestrings.fr.json | 5 +++++ .../.template.config/localize/templatestrings.it.json | 5 +++++ .../.template.config/localize/templatestrings.ja.json | 5 +++++ .../.template.config/localize/templatestrings.ko.json | 5 +++++ .../.template.config/localize/templatestrings.pl.json | 5 +++++ .../.template.config/localize/templatestrings.pt-BR.json | 5 +++++ .../.template.config/localize/templatestrings.ru.json | 5 +++++ .../.template.config/localize/templatestrings.tr.json | 5 +++++ .../localize/templatestrings.zh-Hans.json | 5 +++++ .../localize/templatestrings.zh-Hant.json | 5 +++++ .../content/MSTest-FSharp/.template.config/template.json | 9 +++++++-- .../.template.config/localize/templatestrings.cs.json | 5 +++++ .../.template.config/localize/templatestrings.de.json | 5 +++++ .../.template.config/localize/templatestrings.en.json | 5 +++++ .../.template.config/localize/templatestrings.es.json | 5 +++++ .../.template.config/localize/templatestrings.fr.json | 5 +++++ .../.template.config/localize/templatestrings.it.json | 5 +++++ .../.template.config/localize/templatestrings.ja.json | 5 +++++ .../.template.config/localize/templatestrings.ko.json | 5 +++++ .../.template.config/localize/templatestrings.pl.json | 5 +++++ .../.template.config/localize/templatestrings.pt-BR.json | 5 +++++ .../.template.config/localize/templatestrings.ru.json | 5 +++++ .../.template.config/localize/templatestrings.tr.json | 5 +++++ .../localize/templatestrings.zh-Hans.json | 5 +++++ .../localize/templatestrings.zh-Hant.json | 5 +++++ .../MSTest-VisualBasic/.template.config/template.json | 9 +++++++-- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../content/NUnit-CSharp/.template.config/template.json | 8 ++++++-- .../content/NUnit-CSharp/Company.TestProject1.csproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../content/NUnit-FSharp/.template.config/template.json | 8 ++++++-- .../content/NUnit-FSharp/Company.TestProject1.fsproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../NUnit-VisualBasic/.template.config/template.json | 8 ++++++-- .../NUnit-VisualBasic/Company.TestProject1.vbproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 5 +++++ .../.template.config/localize/templatestrings.de.json | 5 +++++ .../.template.config/localize/templatestrings.en.json | 5 +++++ .../.template.config/localize/templatestrings.es.json | 5 +++++ .../.template.config/localize/templatestrings.fr.json | 5 +++++ .../.template.config/localize/templatestrings.it.json | 5 +++++ .../.template.config/localize/templatestrings.ja.json | 5 +++++ .../.template.config/localize/templatestrings.ko.json | 5 +++++ .../.template.config/localize/templatestrings.pl.json | 5 +++++ .../.template.config/localize/templatestrings.pt-BR.json | 5 +++++ .../.template.config/localize/templatestrings.ru.json | 5 +++++ .../.template.config/localize/templatestrings.tr.json | 5 +++++ .../localize/templatestrings.zh-Hans.json | 5 +++++ .../localize/templatestrings.zh-Hant.json | 5 +++++ .../.template.config/template.json | 9 +++++++-- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../.template.config/template.json | 8 ++++++-- .../Playwright-NUnit-CSharp/Company.TestProject1.csproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../content/XUnit-CSharp/.template.config/template.json | 8 ++++++-- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../content/XUnit-FSharp/.template.config/template.json | 8 ++++++-- .../.template.config/localize/templatestrings.cs.json | 4 ++++ .../.template.config/localize/templatestrings.de.json | 4 ++++ .../.template.config/localize/templatestrings.en.json | 4 ++++ .../.template.config/localize/templatestrings.es.json | 4 ++++ .../.template.config/localize/templatestrings.fr.json | 4 ++++ .../.template.config/localize/templatestrings.it.json | 4 ++++ .../.template.config/localize/templatestrings.ja.json | 4 ++++ .../.template.config/localize/templatestrings.ko.json | 4 ++++ .../.template.config/localize/templatestrings.pl.json | 4 ++++ .../.template.config/localize/templatestrings.pt-BR.json | 4 ++++ .../.template.config/localize/templatestrings.ru.json | 4 ++++ .../.template.config/localize/templatestrings.tr.json | 4 ++++ .../localize/templatestrings.zh-Hans.json | 4 ++++ .../localize/templatestrings.zh-Hant.json | 4 ++++ .../XUnit-VisualBasic/.template.config/template.json | 8 ++++++-- 214 files changed, 791 insertions(+), 26 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json index fb057aec3c65..40f39e794ed8 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.cs.json @@ -3,6 +3,7 @@ "name": "Třída testu MSTest", "description": "Vytvoří novou testovací třídu MSTest.", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json index 9ff62e6336df..dbfe12cfc3b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.de.json @@ -3,6 +3,7 @@ "name": "Testklasse \"MSTest\"", "description": "Erstellt eine neue MSTest-Testklasse", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json index 3808b2ba704d..707bd60cb2b3 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.en.json @@ -3,6 +3,7 @@ "name": "MSTest Test Class", "description": "Creates a new MSTest test class", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json index 0de85e7296f0..b22a33307bdb 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.es.json @@ -3,6 +3,7 @@ "name": "Clase de prueba de MSTest", "description": "Cree una nueva clase de prueba de MSTest", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json index b4c74b7e35c1..307a61aff329 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.fr.json @@ -3,6 +3,7 @@ "name": "Classe de test MSTest", "description": "Crée une classe de test MSTest", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json index 22835e619bbb..d28292454fed 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.it.json @@ -3,6 +3,7 @@ "name": "Classe test MSTest", "description": "Crea una nuova classe di test MSTest", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json index d77a3fceaf01..7a0344eca45c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ja.json @@ -3,6 +3,7 @@ "name": "MSTest テスト クラス", "description": "新しい MSTest テスト クラスを作成します", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json index 543ba69aef5b..fa9f9674c1d2 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ko.json @@ -3,6 +3,7 @@ "name": "MSTest 테스트 클래스", "description": "새 MSTest 테스트 클래스를 만듭니다.", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json index 5861a0eed9b1..9943917515ed 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pl.json @@ -3,6 +3,7 @@ "name": "Klasa testowa MSTest", "description": "Tworzy nową klasę testową MSTest", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json index af61634a7695..8f66e68bcf25 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json @@ -3,6 +3,7 @@ "name": "Classe de teste MSTest", "description": "Cria uma nova classe de teste do MSTest", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json index cf6df6cf2994..bfc1725b8187 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.ru.json @@ -3,6 +3,7 @@ "name": "Тестовый класс MSTest", "description": "Создает новый тестовый класс MSTest", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json index 54492121960a..c77e72aa2c94 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.tr.json @@ -3,6 +3,7 @@ "name": "MSTest Test Sınıfı", "description": "Yeni bir MSTest test sınıfı oluşturur", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json index e9cc3347cded..401438792814 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json @@ -3,6 +3,7 @@ "name": "MSTest 测试类", "description": "创建新的 MSTest 测试类", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json index f8c2a63ba94a..91e47962ed14 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json @@ -3,6 +3,7 @@ "name": "MSTest 測試類別", "description": "建立新的 MSTest 測試類別", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json index 5246c07c84e0..ef0644585695 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json @@ -72,6 +72,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json index fb057aec3c65..40f39e794ed8 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.cs.json @@ -3,6 +3,7 @@ "name": "Třída testu MSTest", "description": "Vytvoří novou testovací třídu MSTest.", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json index 9ff62e6336df..dbfe12cfc3b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.de.json @@ -3,6 +3,7 @@ "name": "Testklasse \"MSTest\"", "description": "Erstellt eine neue MSTest-Testklasse", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json index 3808b2ba704d..707bd60cb2b3 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.en.json @@ -3,6 +3,7 @@ "name": "MSTest Test Class", "description": "Creates a new MSTest test class", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json index 0de85e7296f0..b22a33307bdb 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.es.json @@ -3,6 +3,7 @@ "name": "Clase de prueba de MSTest", "description": "Cree una nueva clase de prueba de MSTest", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json index b4c74b7e35c1..307a61aff329 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.fr.json @@ -3,6 +3,7 @@ "name": "Classe de test MSTest", "description": "Crée une classe de test MSTest", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json index 22835e619bbb..d28292454fed 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.it.json @@ -3,6 +3,7 @@ "name": "Classe test MSTest", "description": "Crea una nuova classe di test MSTest", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json index d77a3fceaf01..7a0344eca45c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ja.json @@ -3,6 +3,7 @@ "name": "MSTest テスト クラス", "description": "新しい MSTest テスト クラスを作成します", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json index 543ba69aef5b..fa9f9674c1d2 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ko.json @@ -3,6 +3,7 @@ "name": "MSTest 테스트 클래스", "description": "새 MSTest 테스트 클래스를 만듭니다.", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json index 5861a0eed9b1..9943917515ed 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pl.json @@ -3,6 +3,7 @@ "name": "Klasa testowa MSTest", "description": "Tworzy nową klasę testową MSTest", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json index af61634a7695..8f66e68bcf25 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.pt-BR.json @@ -3,6 +3,7 @@ "name": "Classe de teste MSTest", "description": "Cria uma nova classe de teste do MSTest", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json index cf6df6cf2994..bfc1725b8187 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.ru.json @@ -3,6 +3,7 @@ "name": "Тестовый класс MSTest", "description": "Создает новый тестовый класс MSTest", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json index 54492121960a..c77e72aa2c94 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.tr.json @@ -3,6 +3,7 @@ "name": "MSTest Test Sınıfı", "description": "Yeni bir MSTest test sınıfı oluşturur", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json index e9cc3347cded..401438792814 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hans.json @@ -3,6 +3,7 @@ "name": "MSTest 测试类", "description": "创建新的 MSTest 测试类", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json index f8c2a63ba94a..91e47962ed14 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/localize/templatestrings.zh-Hant.json @@ -3,6 +3,7 @@ "name": "MSTest 測試類別", "description": "建立新的 MSTest 測試類別", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json index 296e97658631..56b15dde7d79 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-FSharp-TestClass/.template.config/template.json @@ -29,6 +29,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.cs.json index e254d5289e7b..70fe4ff2e351 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.cs.json @@ -3,6 +3,7 @@ "name": "Třída testu MSTest", "description": "Vytvoří novou testovací třídu MSTest.", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.de.json index ccb6aa26b8fd..edd3ab0014b9 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.de.json @@ -3,6 +3,7 @@ "name": "Testklasse \"MSTest\"", "description": "Erstellt eine neue MSTest-Testklasse", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.en.json index 554ccf79aa29..3e2514d1950a 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.en.json @@ -3,6 +3,7 @@ "name": "MSTest Test Class", "description": "Creates a new MSTest test class", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.es.json index d39719fc89a1..0c4ffc2d6d26 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.es.json @@ -3,6 +3,7 @@ "name": "Clase de prueba de MSTest", "description": "Cree una nueva clase de prueba de MSTest", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.fr.json index 2aac743f8e9d..a18771a9c9e4 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.fr.json @@ -3,6 +3,7 @@ "name": "Classe de test MSTest", "description": "Crée une classe de test MSTest", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.it.json index d53c68fb2baf..31f49f02643e 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.it.json @@ -3,6 +3,7 @@ "name": "Classe test MSTest", "description": "Crea una nuova classe di test MSTest", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ja.json index de97383e48e8..6c896823d76c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ja.json @@ -3,6 +3,7 @@ "name": "MSTest テスト クラス", "description": "新しい MSTest テスト クラスを作成します", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ko.json index bb13dcf22a59..41969b382cd3 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ko.json @@ -3,6 +3,7 @@ "name": "MSTest 테스트 클래스", "description": "새 MSTest 테스트 클래스를 만듭니다.", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pl.json index 5bf79aa5f92a..a82ff69758a4 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pl.json @@ -3,6 +3,7 @@ "name": "Klasa testowa MSTest", "description": "Tworzy nową klasę testową MSTest", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pt-BR.json index 0c5f90fc103f..fb2302f25989 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.pt-BR.json @@ -3,6 +3,7 @@ "name": "Classe de teste MSTest", "description": "Cria uma nova classe de teste do MSTest", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ru.json index 5caad1de93da..6a7787cdb168 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.ru.json @@ -3,6 +3,7 @@ "name": "Тестовый класс MSTest", "description": "Создает новый тестовый класс MSTest", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.tr.json index 13b11ea5ea65..bc641ca57f3b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.tr.json @@ -3,6 +3,7 @@ "name": "MSTest Test Sınıfı", "description": "Yeni bir MSTest test sınıfı oluşturur", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hans.json index c4a9db378ec9..72ace3ff3af4 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hans.json @@ -3,6 +3,7 @@ "name": "MSTest 测试类", "description": "创建新的 MSTest 测试类", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hant.json index b8933c978848..c7b1e187f516 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/localize/templatestrings.zh-Hant.json @@ -3,6 +3,7 @@ "name": "MSTest 測試類別", "description": "建立新的 MSTest 測試類別", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/template.json index 12545fc22f84..3f5a93f255cf 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-VisualBasic-TestClass/.template.config/template.json @@ -29,6 +29,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json index e7338927386c..7583b86cf1c6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,9 @@ "name": "Testovací projekt MSTest", "description": "Projekt obsahující testy MSTest, který se dá spustit na .NET v systémech Windows, Linux a MacOS.", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json index f57a40b37a84..6efc8d1d8cf8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,9 @@ "name": "MSTest-Testprojekt", "description": "Ein Projekt, das MSTest-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", "symbols/ExtensionsProfile/choices/None/displayName": "Keine", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json index 8b86b77f311a..d9bc6dc97a68 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,9 @@ "name": "MSTest Test Project", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", "symbols/ExtensionsProfile/choices/None/displayName": "None", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json index 0e708f3e03ac..305229b9a359 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,9 @@ "name": "Proyecto de prueba de MSTest", "description": "Proyecto que contiene pruebas de MSTest que se pueden ejecutar en .NET en Windows, Linux y MacOS.", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json index 77e321ce9480..e45be9f93711 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,9 @@ "name": "Projet de test MSTest", "description": "Un projet qui contient des tests MSTest pouvant être exécutés sur .NET sous Windows, Linux et MacOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json index c616b8446eb3..f5e8728d97f0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,9 @@ "name": "Progetto di test MSTest", "description": "Progetto che contiene i test MSTest eseguibili in .NET in Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Sostituisci framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Ignora ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json index 09321cdb1653..14c905b12790 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,9 @@ "name": "MSTest テスト プロジェクト", "description": "Windows、Linux、MacOS 上の .NET Core で実行できる MSTest テストを含むプロジェクト。", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", "symbols/ExtensionsProfile/choices/None/displayName": "なし", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json index e68a99877040..2fd4493ada1f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,9 @@ "name": "MSTest 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 MSTest 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", "symbols/ExtensionsProfile/choices/None/displayName": "없음", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json index c53d7265a1e9..ea2eac97efd4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,9 @@ "name": "MSTest — projekt testowy", "description": "Projekt zawierający testy MSTest, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i MacOS.", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Platforma", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", "symbols/ExtensionsProfile/choices/None/displayName": "Brak", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index 411b123e9f10..16fd3fa54a67 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,9 @@ "name": "Projeto de Teste MSTest", "description": "Um projeto que contém testes do MSTest que podem ser executados no .NET no Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json index 749193e1ce93..047c6cfe751b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,9 @@ "name": "Тестовый проект MSTest", "description": "Проект, содержащий тесты MSTest, которые могут работать на .NET в Windows, Linux и MacOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json index 42d34ca1cded..8b3bf65eaade 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,9 @@ "name": "MSTest Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen MSTest testlerini içeren bir proje.", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 7d517926052d..e66977ab72ac 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,9 @@ "name": "MSTest 测试项目", "description": "一个包含 MSTest 测试的项目，这些测试可在 Windows、Linux 和 MacOS 的 .NET 上运行。", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", "symbols/ExtensionsProfile/choices/None/displayName": "无", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index d32c47c8640f..ecd10175e093 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,9 @@ "name": "MSTest 測試專案", "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行的 MSTest 測試的專案。", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", "symbols/ExtensionsProfile/choices/None/displayName": "無", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json index 0c8a0f8fd9e2..ad72039df120 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "MSTest"], + "classifications": ["Test", "MSTest", "Desktop", "Web"], "name": "MSTest Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -100,6 +102,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { @@ -173,7 +176,8 @@ }, { "choice": "AllMicrosoft", - "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "displayName": "AllMicrosoft" } ] }, @@ -181,6 +185,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json index 455f78c33265..840926e34472 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,9 @@ "name": "Testovací projekt MSTest", "description": "Projekt obsahující testy MSTest, který se dá spustit na .NET v systémech Windows, Linux a MacOS.", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json index c21ddc5cb10e..dbc7c16b6a03 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,9 @@ "name": "MSTest-Testprojekt", "description": "Ein Projekt, das MSTest-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", "symbols/ExtensionsProfile/choices/None/displayName": "Keine", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json index e75f7d0f0a34..25995d0d38dc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,9 @@ "name": "MSTest Test Project", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", "symbols/ExtensionsProfile/choices/None/displayName": "None", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json index 2d02065e9a7c..3bc4d3e9bef8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,9 @@ "name": "Proyecto de prueba de MSTest", "description": "Proyecto que contiene pruebas de MSTest que se pueden ejecutar en .NET en Windows, Linux y MacOS.", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json index 23dc1927f2fe..550002afe6ec 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,9 @@ "name": "Projet de test MSTest", "description": "Un projet qui contient des tests MSTest pouvant être exécutés sur .NET sous Windows, Linux et MacOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json index 3db678af6144..8c88c602d95d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,9 @@ "name": "Progetto di test MSTest", "description": "Progetto che contiene i test MSTest eseguibili in .NET in Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json index f80b00f9fbb5..ccbdb25e928f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,9 @@ "name": "MSTest テスト プロジェクト", "description": "Windows、Linux、MacOS 上の .NET Core で実行できる MSTest テストを含むプロジェクト。", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", "symbols/ExtensionsProfile/choices/None/displayName": "なし", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json index da5128a2360d..8d49fc97c0d7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,9 @@ "name": "MSTest 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 MSTest 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", "symbols/ExtensionsProfile/choices/None/displayName": "없음", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json index abd4970b8b7a..48f6f6715065 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,9 @@ "name": "MSTest — projekt testowy", "description": "Projekt zawierający testy MSTest, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i MacOS.", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", "symbols/ExtensionsProfile/choices/None/displayName": "Brak", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json index b8a4ed5ce34c..f59995dc88b1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,9 @@ "name": "Projeto de Teste MSTest", "description": "Um projeto que contém testes do MSTest que podem ser executados no .NET no Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json index d1f5c0093310..d311df0bf35a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,9 @@ "name": "Тестовый проект MSTest", "description": "Проект, содержащий тесты MSTest, которые могут работать на .NET в Windows, Linux и MacOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json index e7754242a4ab..1de6366539af 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,9 @@ "name": "MSTest Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen MSTest testlerini içeren bir proje.", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 44975680716f..24f4160c6432 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,9 @@ "name": "MSTest 测试项目", "description": "一个包含 MSTest 测试的项目，这些测试可在 Windows、Linux 和 MacOS 的 .NET 上运行。", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", "symbols/ExtensionsProfile/choices/None/displayName": "无", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 09330aae0236..22b497209460 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,9 @@ "name": "MSTest 測試專案", "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行的 MSTest 測試的專案。", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", "symbols/ExtensionsProfile/choices/None/displayName": "無", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json index 4104522fca5a..1dff74b7dccc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "MSTest"], + "classifications": ["Test", "MSTest", "Desktop", "Web"], "name": "MSTest Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -100,6 +102,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { @@ -173,7 +176,8 @@ }, { "choice": "AllMicrosoft", - "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "displayName": "AllMicrosoft" } ] }, @@ -181,6 +185,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json index 20a000c2adc0..84992e4fa119 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,9 @@ "name": "Testovací projekt MSTest", "description": "Projekt obsahující testy MSTest, který se dá spustit na .NET v systémech Windows, Linux a MacOS.", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json index b9877cbff4b4..3a483a010d56 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json @@ -3,7 +3,9 @@ "name": "MSTest-Testprojekt", "description": "Ein Projekt, das MSTest-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", "symbols/ExtensionsProfile/choices/None/displayName": "Keine", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json index ab2374198543..9a72dcaf9eda 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json @@ -3,7 +3,9 @@ "name": "MSTest Test Project", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", "symbols/ExtensionsProfile/choices/None/displayName": "None", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json index 4fc706e2a4f4..7d02ba6ffbbb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json @@ -3,7 +3,9 @@ "name": "Proyecto de prueba de MSTest", "description": "Proyecto que contiene pruebas de MSTest que se pueden ejecutar en .NET en Windows, Linux y MacOS.", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json index 155a58913ee2..6679f4711bf1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,9 @@ "name": "Projet de test MSTest", "description": "Un projet qui contient des tests MSTest pouvant être exécutés sur .NET sous Windows, Linux et MacOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json index b0c32128a791..2de6e9b0d37c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json @@ -3,7 +3,9 @@ "name": "Progetto di test MSTest", "description": "Progetto che contiene i test MSTest eseguibili in .NET in Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Ignora ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json index d2a148ecf13d..a5a85dfa68ea 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,9 @@ "name": "MSTest テスト プロジェクト", "description": "Windows、Linux、MacOS 上の .NET Core で実行できる MSTest テストを含むプロジェクト。", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", "symbols/ExtensionsProfile/choices/None/displayName": "なし", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json index ed5b76979f77..f45b6f1fcd68 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,9 @@ "name": "MSTest 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 MSTest 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", "symbols/ExtensionsProfile/choices/None/displayName": "없음", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json index 2c95d919b71b..702b44d00f54 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,9 @@ "name": "MSTest — projekt testowy", "description": "Projekt zawierający testy MSTest, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i MacOS.", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Platforma", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", "symbols/ExtensionsProfile/choices/None/displayName": "Brak", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index 7824eaa54dda..a4d5aba9b4f8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,9 @@ "name": "Projeto de Teste MSTest", "description": "Um projeto que contém testes do MSTest que podem ser executados no .NET no Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json index c488bdc4780a..a240b80377d6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,9 @@ "name": "Тестовый проект MSTest", "description": "Проект, содержащий тесты MSTest, которые могут работать на .NET в Windows, Linux и MacOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json index 3d230cff235f..bc010fff2fb2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,9 @@ "name": "MSTest Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen MSTest testlerini içeren bir proje.", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index 03b7f124edaf..5cfad0340162 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,9 @@ "name": "MSTest 测试项目", "description": "一个包含 MSTest 测试的项目，这些测试可在 Windows、Linux 和 MacOS 的 .NET 上运行。", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", "symbols/ExtensionsProfile/choices/None/displayName": "无", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index 5ef080f7daae..d43072b1e195 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,9 @@ "name": "MSTest 測試專案", "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行的 MSTest 測試的專案。", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", "symbols/ExtensionsProfile/choices/None/displayName": "無", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json index c288374bc5be..e001b37b7f06 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "MSTest"], + "classifications": ["Test", "MSTest", "Desktop", "Web"], "name": "MSTest Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -100,6 +102,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { @@ -173,7 +176,8 @@ }, { "choice": "AllMicrosoft", - "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "displayName": "AllMicrosoft" } ] }, @@ -181,6 +185,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json index 6deeaed41841..9954de885524 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů NUnit 3", "description": "Projekt obsahující testy NUnit, který se dá spustit na .NET v systémech Windows, Linux a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json index 9fe39465a3d0..633ac5a5448d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "NUnit 3-Testprojekt", "description": "Ein Projekt, das NUnit-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json index 3b4c04b9cd14..3b001b8859e9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Project", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json index 719af44fe772..3004c46be3f7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de NUnit 3", "description": "Proyecto que contiene pruebas NUnit que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json index 61492bdbd489..a374d6ad2ca8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de tests NUnit 3", "description": "Un projet qui contient des tests NUnit pouvant être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json index 60257ea335a3..d03fa98d148d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test NUnit 3", "description": "Progetto che contiene i test NUnit eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json index 5c1ef823fe79..b0c87888a5af 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "NUnit 3 テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる NUnit テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json index 5c5c1cb49102..f76476604b65 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "NUnit 3 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 NUnit 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json index 91bd4a0a2063..af6dca1ab606 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "NUnit 3 — projekt testowy", "description": "Projekt zawierający testy NUnit, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index 1e632c677607..e730b9fec3cc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste NUnit 3", "description": "Um projeto que contém testes NUnit que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json index 76b078dd9088..f0c872ef07f1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект NUnit 3", "description": "Проект, содержащий тесты NUnit, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json index 2e7d651149aa..a38c3fe4313e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen NUnit testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 912d4a14e2d4..94f6cc688f7e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "NUnit 3 测试项目", "description": "一个包含 NUnit 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index f4b434474ef2..cc5e6f68594d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "NUnit 3 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 NUnit 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json index 32858f567048..a457114aa8f2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", - "classifications": [ "Test", "NUnit" ], + "classifications": [ "Test", "NUnit", "Desktop", "Web" ], "name": "NUnit 3 Test Project", "defaultName": "TestProject1", "generatorVersions": "[1.0.0.0-*)", @@ -20,6 +20,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -27,6 +28,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -41,7 +43,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -51,6 +54,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj index 6d6ebed1bfa2..55ae75cf2311 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj @@ -15,7 +15,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json index 23e4e1d928b6..44bce1dce044 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů NUnit 3", "description": "Projekt obsahující testy NUnit, který se dá spustit na .NET v systémech Windows, Linux a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json index 3443ab932ff4..8bcf0524f5f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "NUnit 3-Testprojekt", "description": "Ein Projekt, das NUnit-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json index a18b387cbbec..bd3ee8137ecd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Project", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json index 3928359f45a3..77de98763d73 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de NUnit 3", "description": "Proyecto que contiene pruebas NUnit que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json index ff91de2840b7..99261ea67f81 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de tests NUnit 3", "description": "Un projet qui contient des tests NUnit pouvant être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json index b6abf2d8962f..109564f221e5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test NUnit 3", "description": "Progetto che contiene i test NUnit eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json index edcc7abce68e..c2cfd377b0a1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "NUnit 3 テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる NUnit テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json index b4f932ced3c8..c8959254fa64 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "NUnit 3 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 NUnit 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json index 3e4125522476..e77daf82f5ae 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "NUnit 3 — projekt testowy", "description": "Projekt zawierający testy NUnit, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json index 01b81d84aec9..ddf10204eb91 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste NUnit 3", "description": "Um projeto que contém testes NUnit que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json index 2e0160cb6207..bc6018415c7f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект NUnit 3", "description": "Проект, содержащий тесты NUnit, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json index 5375d136767b..8e7226222ff5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen NUnit testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json index aab602481e11..bf2ac453ccac 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "NUnit 3 测试项目", "description": "一个包含 NUnit 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 3b1439da8474..0a9ca0e9c48a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "NUnit 3 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 NUnit 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json index 1cf15ceb1129..9198a9194f8d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", - "classifications": [ "Test", "NUnit" ], + "classifications": [ "Test", "NUnit", "Desktop", "Web" ], "name": "NUnit 3 Test Project", "defaultName": "TestProject1", "generatorVersions": "[1.0.0.0-*)", @@ -20,6 +20,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -27,6 +28,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -41,7 +43,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -51,6 +54,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj index 870348322747..78c1bf1e8ac4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj @@ -19,7 +19,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json index e0619ef08a1b..47c58110be13 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů NUnit 3", "description": "Projekt obsahující testy NUnit, který se dá spustit na .NET v systémech Windows, Linux a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json index 75b87e5fbd81..c4f6de71fdfb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "NUnit 3-Testprojekt", "description": "Ein Projekt, das NUnit-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json index ceae9fab10b2..cd09da07d35d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Project", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json index d7a66e679356..7646487e9a55 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de NUnit 3", "description": "Proyecto que contiene pruebas NUnit que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json index dce3751130e0..76baa5e9f88d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de tests NUnit 3", "description": "Un projet qui contient des tests NUnit pouvant être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json index f7492a5f5444..b45caf7660c0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test NUnit 3", "description": "Progetto che contiene i test NUnit eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json index 0f76cf28158c..85c60156ec55 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "NUnit 3 テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる NUnit テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json index fec682f4a975..4af8e48f6fb3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "NUnit 3 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 NUnit 테스트가 포함된 프로젝트", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json index cfdeb751364b..441b1c4a952e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "NUnit 3 — projekt testowy", "description": "Projekt zawierający testy NUnit, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index 285f58a6343f..8915b5105f24 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste NUnit 3", "description": "Um projeto que contém testes NUnit que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json index d89125160d56..993d3034811c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект NUnit 3", "description": "Проект, содержащий тесты NUnit, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json index b42b39480e0c..aee9a61a4513 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "NUnit 3 Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen NUnit testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index 20dbe6be3087..5676dc93f8d6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "NUnit 3 测试项目", "description": "一个包含 NUnit 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index d2743aa466c2..6416181da161 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "NUnit 3 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 NUnit 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json index e26728348b47..f968814bafa6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)", - "classifications": [ "Test", "NUnit" ], + "classifications": [ "Test", "NUnit", "Desktop", "Web" ], "name": "NUnit 3 Test Project", "defaultName": "TestProject1", "generatorVersions": "[1.0.0.0-*)", @@ -20,6 +20,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -27,6 +28,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -41,7 +43,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -51,6 +54,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj index 66c2e9d7e626..025be6c7efb8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj @@ -13,7 +13,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json index 3adab9cb3790..eef66383be40 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,9 @@ "name": "Testovací projekt MSTest Playwright", "description": "Projekt, který obsahuje testy Playwright pomocí testovací architektury MSTest, který se dá spustit v .NET ve Windows, Linuxu a MacOS.", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "symbols/UseMSTestSdk/description": "Použijte styl projektu MSTest.Sdk. Další informace najdete na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nejsou povolená žádná rozšíření.", "symbols/ExtensionsProfile/choices/None/displayName": "Žádné", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Vyberte typy testovacích součástí, které se mají zahrnout do projektu.", + "symbols/Fixture/displayName": "Testovací přípravek", "symbols/Fixture/choices/None/description": "Žádné metody testovacího přípravku", "symbols/Fixture/choices/None/displayName": "Žádné", "symbols/Fixture/choices/AssemblyInitialize/description": "Metoda testovacího přípravku AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json index 8f9027554279..7849c4e0eaba 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright-Testprojekt", "description": "Ein Projekt, das Playwright-Tests mit MSTest-Testframework enthält, das unter .NET unter Windows, Linux und MacOS ausgeführt werden kann.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "symbols/UseMSTestSdk/description": "Verwenden Sie den MSTest.Sdk-Projektstil. Weitere Informationen unter https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Keine Erweiterungen sind aktiviert", "symbols/ExtensionsProfile/choices/None/displayName": "Keine", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Alle von Microsoft gelieferten Erweiterungen aktivieren (einschließlich Erweiterungen mit einer restriktiven Lizenz)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wählen Sie die Fixturearten aus, die in das Projekt eingeschlossen werden sollen.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Keine Fixturemethoden", "symbols/Fixture/choices/None/displayName": "Keine", "symbols/Fixture/choices/AssemblyInitialize/description": "Fixturemethode \"AssemblyInitialize\"", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json index 7ce91b6482f3..05129394dbc2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright Test Project", "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "symbols/UseMSTestSdk/description": "Use MSTest.Sdk project style. More information at https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No extensions are enabled", "symbols/ExtensionsProfile/choices/None/displayName": "None", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Select the fixture kinds to include in the project.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "No fixture methods", "symbols/Fixture/choices/None/displayName": "None", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture method", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json index 88f77daf8d7c..c18173426fbb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,9 @@ "name": "Proyecto de prueba de MSTest Playwright", "description": "Proyecto que contiene pruebas de Playwright mediante el marco de pruebas de MSTest, que se puede ejecutar en .NET en Windows, Linux y MacOS.", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "symbols/UseMSTestSdk/description": "Use el estilo de proyecto MSTest.Sdk. Más información en https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "No hay extensiones habilitadas", "symbols/ExtensionsProfile/choices/None/displayName": "Ninguno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas las extensiones enviadas por Microsoft (incluidas las extensiones con una licencia restrictiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Seleccione los tipos de accesorio que desea incluir en el proyecto.", + "symbols/Fixture/displayName": "Accesorio", "symbols/Fixture/choices/None/description": "No hay métodos de accesorio", "symbols/Fixture/choices/None/displayName": "Ninguno", "symbols/Fixture/choices/AssemblyInitialize/description": "Método de accesorio AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json index c4b450232710..3cf4e3501ebb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,9 @@ "name": "Projet de test MSTest Playwright", "description": "Un projet qui contient des tests Playwright utilisant le framework de test MSTest, qui peut être exécuté sur .NET sur Windows, Linux et MacOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "symbols/UseMSTestSdk/description": "Utilisez le style de projet MSTest.Sdk. Plus d’informations sur https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Aucune extension n’est activée", "symbols/ExtensionsProfile/choices/None/displayName": "Aucun", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Activez toutes les extensions fournies par Microsoft (y compris les extensions avec une licence restrictive)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Sélectionnez les types de fixtures à inclure dans le projet.", + "symbols/Fixture/displayName": "Appareil", "symbols/Fixture/choices/None/description": "Aucune méthode de fixture", "symbols/Fixture/choices/None/displayName": "Aucun", "symbols/Fixture/choices/AssemblyInitialize/description": "Méthode de fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json index 2973dde71265..a5bf580dc1d6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,9 @@ "name": "Progetto di test playwright MSTest", "description": "Progetto che contiene test Playwright che usano il framework di test MSTest, eseguibile in .NET in Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Ignora ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "symbols/UseMSTestSdk/description": "Usare lo stile del progetto MSTest.Sdk. Per altre informazioni, vedere https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nessuna estensione abilitata", "symbols/ExtensionsProfile/choices/None/displayName": "Nessuno", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Abilita tutte le estensioni spedite da Microsoft (incluse le estensioni con una licenza restrittiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selezionare i tipi di fixture da includere nel progetto.", + "symbols/Fixture/displayName": "Fixture", "symbols/Fixture/choices/None/description": "Nessun metodo di fixture", "symbols/Fixture/choices/None/displayName": "Nessuno", "symbols/Fixture/choices/AssemblyInitialize/description": "Metodo fixture AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json index 29612731054a..ccefaf4b6587 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright テスト プロジェクト", "description": "Windows、Linux、MacOS 上の .NET で実行できる、MSTest テスト フレームワークを使用した Playwright テストを含むプロジェクト。", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "symbols/UseMSTestSdk/description": "MSTest.Sdk プロジェクト スタイルを使用します。https://aka.ms/mstest/sdk の詳細情報", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "有効になっている拡張機能がありません", "symbols/ExtensionsProfile/choices/None/displayName": "なし", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft が出荷するすべての拡張機能を有効にする (制限付きライセンスを持つ拡張機能を含む)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "プロジェクトに含めるフィクスチャの種類を選択します。", + "symbols/Fixture/displayName": "フィクスチャ", "symbols/Fixture/choices/None/description": "フィクスチャ メソッドがありません", "symbols/Fixture/choices/None/displayName": "なし", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize フィクスチャ メソッド", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json index 73b9c961b9fa..eeb8a52bce4b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright 테스트 프로젝트", "description": "Windows, Linux 및 MacOS의 .NET에서 실행할 수 있는 MSTest 테스트 프레임워크를 사용하는 Playwright 테스트를 포함하는 프로젝트입니다.", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "symbols/UseMSTestSdk/description": "MSTest.Sdk 프로젝트 스타일을 사용합니다. 자세한 내용은 https://aka.ms/mstest/sdk를 확인하세요.", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "사용하도록 설정된 확장이 없습니다.", "symbols/ExtensionsProfile/choices/None/displayName": "없음", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft에서 제공하는 모든 확장 사용(제한 라이선스가 있는 확장 포함)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "프로젝트에 포함할 픽스쳐 종류를 선택합니다.", + "symbols/Fixture/displayName": "픽스쳐", "symbols/Fixture/choices/None/description": "픽스쳐 메서드 없음", "symbols/Fixture/choices/None/displayName": "없음", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize fixture 메서드", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json index 979a21a61d89..d0552dd197a7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,9 @@ "name": "Projekt testowy MSTest Playwright", "description": "Projekt, który zawiera testy Playwright wykorzystujące strukturę testową MSTest, który można uruchomić na platformie .NET w systemach Windows, Linux i MacOS.", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "symbols/UseMSTestSdk/description": "Użyj stylu projektu MSTest.Sdk. Więcej informacji znajdziesz na https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nie włączono rozszerzeń", "symbols/ExtensionsProfile/choices/None/displayName": "Brak", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Włącz wszystkie rozszerzenia dostarczane przez firmę Microsoft (w tym rozszerzenia z restrykcyjną licencją)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Wybierz rodzaje warunków początkowych do uwzględnienia w projekcie.", + "symbols/Fixture/displayName": "Warunki początkowe", "symbols/Fixture/choices/None/description": "Brak metod początkowych", "symbols/Fixture/choices/None/displayName": "Brak", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize — metoda początkowa", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index 676a77d55c69..d6502e56a1b3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,9 @@ "name": "Projeto de Teste MSTest do Playwright", "description": "Um projeto que contém testes do Playwright usando a estrutura de teste MSTest, que pode ser executada no .NET no Windows, Linux e macOS.", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "symbols/UseMSTestSdk/description": "Use o estilo de projeto MSTest.Sdk. Mais informações em https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Nenhuma extensão está habilitada", "symbols/ExtensionsProfile/choices/None/displayName": "Nenhum", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Habilitar todas as extensões enviadas pela Microsoft (incluindo extensões com uma licença restritiva)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Selecione os tipos de acessório a serem incluídos no projeto.", + "symbols/Fixture/displayName": "Acessório", "symbols/Fixture/choices/None/description": "Nenhum método de acessório", "symbols/Fixture/choices/None/displayName": "Nenhum", "symbols/Fixture/choices/AssemblyInitialize/description": "Método acessório AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json index f950f2e948f1..db078e96eb56 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,9 @@ "name": "Тестовый проект MSTest Playwright", "description": "Проект, содержащий тесты Playwright с использованием инфраструктуры MSTest, которая может работать на .NET в Windows, Linux и MacOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "symbols/UseMSTestSdk/description": "Используйте стиль проекта MSTest.Sdk. Дополнительные сведения на https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Расширения не включены.", "symbols/ExtensionsProfile/choices/None/displayName": "Отсутствует", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Включить все расширения, поставляемые Майкрософт (включая расширения с ограничительной лицензией)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Выберите типы средств, которые необходимо включить в проект.", + "symbols/Fixture/displayName": "Средство", "symbols/Fixture/choices/None/description": "Нет методов работы со средствами", "symbols/Fixture/choices/None/displayName": "Отсутствует", "symbols/Fixture/choices/AssemblyInitialize/description": "Метод работы со средствами AssemblyInitialize", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json index e8d1c9bbd225..0e8882559087 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen ve MSTest test çerçevesini kullanan Playwright testlerini içeren bir proje.", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "symbols/UseMSTestSdk/description": "MSTest.Sdk proje stilini kullanın.. Daha fazla bilgi: https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "Uzantı etkinleştirilmedi", "symbols/ExtensionsProfile/choices/None/displayName": "Hiçbiri", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Microsoft'un gönderdiği tüm uzantıları etkinleştir (kısıtlayıcı lisansı olan uzantılar dahil)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "Projeye dahil edilecek düzen türlerini seçin.", + "symbols/Fixture/displayName": "Düzen", "symbols/Fixture/choices/None/description": "Düzen yöntemi yok", "symbols/Fixture/choices/None/displayName": "Hiçbiri", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize düzen yöntemi", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 9a6979a1bab5..03bc292abf19 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright 测试项目", "description": "一个包含使用 MSTest 测试框架的 Playwright 测试的项目，这些测试可在 Windows、Linux 和 MacOS 上的 .NET 上运行。", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 项目样式。有关详细信息，请访问 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未启用任何扩展", "symbols/ExtensionsProfile/choices/None/displayName": "无", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "启用 Microsoft 提供的所有扩展(包括具有限制性许可证的扩展)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "选择要包含在项目中的固定例程类型。", + "symbols/Fixture/displayName": "固定例程", "symbols/Fixture/choices/None/description": "无固定例程方法", "symbols/Fixture/choices/None/displayName": "无", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固定例程方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index c7f7d14f2bb8..fdb96e87b953 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,9 @@ "name": "MSTest Playwright 測試專案", "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行、使用 MSTest 測試架構的 Playwright 測試的專案。", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": ".NET 9", "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", @@ -20,6 +22,7 @@ "symbols/Framework/choices/net47/description": ".NET Framework 4.7", "symbols/Framework/choices/net462/description": ".NET Framework 4.6.2", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "symbols/UseMSTestSdk/description": "使用 MSTest.Sdk 專案樣式。如需詳細資訊，請參閱 https://aka.ms/mstest/sdk", @@ -39,7 +42,9 @@ "symbols/ExtensionsProfile/choices/None/description": "未啟用任何延伸模組", "symbols/ExtensionsProfile/choices/None/displayName": "無", "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "啟用由 Microsoft 提供的所有延伸模組 (包括具有有限制授權的延伸模組)", + "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft", "symbols/Fixture/description": "選取要併入專案中的固件類型。", + "symbols/Fixture/displayName": "固件", "symbols/Fixture/choices/None/description": "沒有固件方法", "symbols/Fixture/choices/None/displayName": "無", "symbols/Fixture/choices/AssemblyInitialize/description": "AssemblyInitialize 固件方法", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json index 95205c44b7ff..0ae4e448f112 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "MSTest", "Playwright"], + "classifications": ["Test", "MSTest", "Playwright", "Desktop", "Web"], "name": "MSTest Playwright Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -100,6 +102,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { @@ -173,7 +176,8 @@ }, { "choice": "AllMicrosoft", - "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)" + "description": "Enable all extensions shipped by Microsoft (including extensions with a restrictive license)", + "displayName": "AllMicrosoft" } ] }, @@ -181,6 +185,7 @@ "type": "parameter", "datatype": "choice", "description": "Select the fixture kinds to include in the project.", + "displayName": "Fixture", "allowMultipleValues": true, "enableQuotelessLiterals": true, "defaultValue": "None", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json index 68cd4614ff28..8e54470849b5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Testovací projekt NUnit Playwright", "description": "Projekt, který obsahuje testy Playwright pomocí testovací architektury NUnit, který se dá spustit v .NET ve Windows, Linuxu a MacOS.", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "symbols/langVersion/description": "Nastaví vlastnost LangVersion ve vytvořeném souboru projektu.", "symbols/langVersion/displayName": "Verze jazyka", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json index 5912d45665aa..766534361e3a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright-Testprojekt", "description": "Ein Projekt, das Playwright-Tests mit NUnit-Testframework enthält, das unter .NET unter Windows, Linux und MacOS ausgeführt werden kann.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "symbols/langVersion/description": "Legt die Eigenschaft „langVersion“ in der erstellten Projektdatei fest", "symbols/langVersion/displayName": "Sprachversion", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json index d661c9314654..9a25c57f5cb1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright Test Project", "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "symbols/langVersion/description": "Sets the LangVersion property in the created project file", "symbols/langVersion/displayName": "Language version", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json index 7f1e19741bca..1ad2bdb22d80 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de NUnit Playwright", "description": "Proyecto que contiene pruebas de Playwright mediante el marco de pruebas NUnit, que se puede ejecutar en .NET en Windows, Linux y MacOS.", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "symbols/langVersion/description": "Establece la propiedad LangVersion en el archivo de proyecto creado.", "symbols/langVersion/displayName": "Versión de lenguaje", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json index 81d83f7abe00..4adbfd743e7a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de test NUnit Playwright", "description": "Un projet qui contient des tests Playwright utilisant le framework de test NUnit, qui peut fonctionner sur .NET sous Windows, Linux et MacOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "symbols/langVersion/description": "Définit la propriété LangVersion dans le fichier projet créé", "symbols/langVersion/displayName": "Version du langage", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json index b8a9cd7a2617..066a2b7e8a28 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test playwright NUnit", "description": "Progetto che contiene test Playwright che usano il framework di test NUnit, eseguibile in .NET in Windows, Linux e MacOS.", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Ignora ripristino", "symbols/langVersion/description": "Imposta la proprietà LangVersion nel file di progetto creato", "symbols/langVersion/displayName": "Versione del linguaggio", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json index 34833e9df6df..6467f88fd9d7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright テスト プロジェクト", "description": "Windows、Linux、MacOS 上の .NET で実行できる、NUnit テスト フレームワークを使用した Playwright テストを含むプロジェクト。", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "symbols/langVersion/description": "作成されたプロジェクト ファイルで LangVersion プロパティを設定します", "symbols/langVersion/displayName": "言語バージョン", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json index 4ca3cd026d7c..990b58d734c8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright 테스트 프로젝트", "description": "Windows, Linux 및 MacOS의 .NET에서 실행할 수 있는 NUnit 테스트 프레임워크를 사용하는 Playwright 테스트를 포함하는 프로젝트입니다.", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "symbols/langVersion/description": "만든 프로젝트 파일에 LangVersion 속성을 설정합니다", "symbols/langVersion/displayName": "언어 버전", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json index af5007d4a8e3..5ee5a51f1e0c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "Projekt testowy NUnit Playwright", "description": "Projekt, który zawiera testy Playwright wykorzystujące strukturę testową NUnit, który można uruchomić na platformie .NET w systemach Windows, Linux i MacOS.", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "symbols/langVersion/description": "Ustawia właściwość LangVersion w utworzonym pliku projektu", "symbols/langVersion/displayName": "Wersja języka", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index fe67734cf73f..b62468189344 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste NUnit do Playwright", "description": "Um projeto que contém testes do Playwright usando a estrutura de teste NUnit, que pode ser executada no .NET no Windows, Linux e macOS.", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "symbols/langVersion/description": "Define a propriedade LangVersion no arquivo do projeto criado", "symbols/langVersion/displayName": "Versão do idioma", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json index 9cb19ca05c98..da495429668f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Проект тестирования NUnit Playwright", "description": "Проект, содержащий тесты Playwright с использованием инфраструктуры тестирования NUnit, которая может работать на .NET в Windows, Linux и MacOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "symbols/langVersion/description": "Задает свойство LangVersion в создаваемом файле проекта.", "symbols/langVersion/displayName": "Версия языка", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json index bc03a26cc9d8..ba3d48433658 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen ve NUnit test çerçevesini kullanan Playwright testlerini içeren bir proje.", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "symbols/langVersion/description": "Oluşturulan proje dosyasında LangVersion özelliğini ayarlar", "symbols/langVersion/displayName": "Dil sürümü", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index f5645b2d4652..91ddf6b8a37b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright 测试项目", "description": "一个包含使用 NUnit 测试框架的 Playwright 测试的项目，这些测试可在 Windows、Linux 和 MacOS 上的 .NET 上运行。", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "symbols/langVersion/description": "在创建的项目文件中设置 LangVersion 属性", "symbols/langVersion/displayName": "语言版本", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 95c7c1521a74..844dc1a6560b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "NUnit Playwright 測試專案", "description": "包含可以在 Windows、Linux 和 MacOS 版的 .NET 上執行、使用 NUnit 測試架構的 Playwright 測試的專案。", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "symbols/langVersion/description": "設定建立的專案檔中的 LangVersion 屬性", "symbols/langVersion/displayName": "語言版本", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json index d10f570b1542..fb724864a494 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "Test", "NUnit", "Playwright" ], + "classifications": [ "Test", "NUnit", "Playwright", "Desktop", "Web" ], "name": "NUnit Playwright Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -40,7 +42,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -50,6 +53,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" }, "langVersion": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj index 9a4e39bbdc87..5c8d18f679f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj @@ -16,7 +16,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json index a3118cb9c753..d0080f216ec4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů xUnit", "description": "Projekt obsahující testy xUnit.net, které je možné spustit na .NET ve Windows, Linuxu a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", "postActions/openInEditor/description": "Otevře Class1.cs v editoru." diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json index f0bf858fe2b0..c36da154c4f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "xUnit-Testprojekt", "description": "Ein Projekt, das xUnit.net-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", "postActions/openInEditor/description": "Öffnet Class1.cs“ im Editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json index 4673e27ea263..dbf6c2188a51 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "xUnit Test Project", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", "postActions/openInEditor/description": "Opens Class1.cs in the editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json index 692c13b22fb8..e3665a5882dc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de xUnit", "description": "Proyecto que contiene xUnit.net pruebas que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", "postActions/openInEditor/description": "Abrir Class1.cs en el editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json index 7630c01f8a00..bb0caa1c3a4e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de test xUnit", "description": "Un projet qui contient des tests xUnit.net qui peuvent être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", "postActions/openInEditor/description": "Ouvre Class1.cs dans l’éditeur" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json index ea193c5eea7f..c410d45dbbb9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test xUnit", "description": "Progetto che contiene i test xUnit.net eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", "postActions/openInEditor/description": "Apre Class1.cs nell'editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json index f01cbfce8fd9..f58e744cdd11 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "xUnit テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる xUnit.net テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", "postActions/openInEditor/description": "エディターで Class1.cs を開きます" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json index 33b029f674c8..4569dd2da09d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "xUnit 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 xUnit.net 테스트가 포함된 프로젝트입니다.", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", "postActions/openInEditor/description": "편집기에서 Class1.cs 열기" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json index f972ab63cc7c..d802efacf9d0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "xUnit — projekt testowy", "description": "Projekt zawierający testy xUnit.net, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Platforma", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", "postActions/openInEditor/description": "Otwiera plik Class1.cs w edytorze" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index 999d3e5b8f0f..a99c65709407 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste xUnit", "description": "Um projeto que contém testes xUnit.net que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", "postActions/openInEditor/description": "Abrir Class1.cs no editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json index 975926693559..a35d248e8b58 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект xUnit", "description": "Проект, содержащий тесты xUnit.net, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", "postActions/openInEditor/description": "Открывает файл Class1.cs в редакторе" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json index cb7c85c5af91..9c5935563bb9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "xUnit Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen xUnit.net testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", "postActions/openInEditor/description": "Düzenleyicide Class1.cs dosyasını açar" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index c3495b51b76e..8e011c975aba 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "xUnit 测试项目", "description": "一个包含 xUnit.net 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", "postActions/openInEditor/description": "在编辑器中打开 Class1.cs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 296eea1d56be..c45a20b5c6d5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "xUnit 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 xUnit.net 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", "postActions/openInEditor/description": "在編輯器中開啟 Class1.cs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json index 66f60be8350d..693bd7b31292 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "xUnit"], + "classifications": ["Test", "xUnit", "Desktop", "Web"], "name": "xUnit Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -40,7 +42,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -50,6 +53,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" } }, diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json index a2bc289c0be3..65c41424cc2e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů xUnit", "description": "Projekt obsahující testy xUnit.net, které je možné spustit na .NET ve Windows, Linuxu a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", "postActions/openInEditor/description": "Otevře Tests.fs v editoru." diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json index 3941f023ac01..388456f070ce 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "xUnit-Testprojekt", "description": "Ein Projekt, das xUnit.net-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", "postActions/openInEditor/description": "Öffnet Tests.fs im Editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json index 8cf274358b74..376d0b7e73b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "xUnit Test Project", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", "postActions/openInEditor/description": "Opens Tests.fs in the editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json index e8b76235f5ee..20d717c22293 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de xUnit", "description": "Proyecto que contiene xUnit.net pruebas que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", "postActions/openInEditor/description": "Abrir Tests.fs en el editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json index 0507c79eb9ca..6e6ba438a796 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de test xUnit", "description": "Un projet qui contient des tests xUnit.net qui peuvent être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", "postActions/openInEditor/description": "Ouvre Tests.fs dans l’éditeur" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json index 42d46af8631f..19e8fa7b022b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test xUnit", "description": "Progetto che contiene i test xUnit.net eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", "postActions/openInEditor/description": "Apre Tests.fs nell'editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json index f6ea166082e4..65525242dc69 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "xUnit テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる xUnit.net テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元のスキップ", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", "postActions/openInEditor/description": "エディターで Tests.fs を開きます" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json index 5502dfa0fa17..c4a462f2ff68 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "xUnit 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 xUnit.net 테스트가 포함된 프로젝트입니다.", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", "postActions/openInEditor/description": "편집기에서 Tests.fs 열기" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json index 13a871eeea4f..70f60366605d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "xUnit — projekt testowy", "description": "Projekt zawierający testy xUnit.net, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", "postActions/openInEditor/description": "Otwiera plik Tests.fs w edytorze" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json index c58ebb507f80..210719f75632 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste xUnit", "description": "Um projeto que contém testes xUnit.net que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", "postActions/openInEditor/description": "Abre o Tests.fs no editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json index 4d8eae9097b9..2361f4dd8cb9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект xUnit", "description": "Проект, содержащий тесты xUnit.net, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", "postActions/openInEditor/description": "Открывает Tests.fs в редакторе" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json index 1184dac519e4..527fff292d01 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "xUnit Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen xUnit.net testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", "postActions/openInEditor/description": "Tests.fs'yi düzenleyicide açar" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 41d865c026e9..8b68cc68b87b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "xUnit 测试项目", "description": "一个包含 xUnit.net 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", "postActions/openInEditor/description": "在编辑器中打开 Tests.fs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 754828f138bd..ce4a0c7c2ef4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "xUnit 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 xUnit.net 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", "postActions/openInEditor/description": "在編輯器中開啟 Tests.fs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json index a0207bf7fa86..38fa0bb0f31c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "xUnit"], + "classifications": ["Test", "xUnit", "Desktop", "Web"], "name": "xUnit Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -40,7 +42,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -50,6 +53,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" } }, diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json index a3118cb9c753..d0080f216ec4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -3,10 +3,14 @@ "name": "Projekt testů xUnit", "description": "Projekt obsahující testy xUnit.net, které je možné spustit na .NET ve Windows, Linuxu a macOS", "symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.", + "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", + "symbols/Framework/displayName": "Architektura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", + "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", + "symbols/skipRestore/displayName": "Přeskočit obnovení", "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore", "postActions/openInEditor/description": "Otevře Class1.cs v editoru." diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json index f0bf858fe2b0..c36da154c4f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json @@ -3,10 +3,14 @@ "name": "xUnit-Testprojekt", "description": "Ein Projekt, das xUnit.net-Tests enthält, die auf .NET unter Windows, Linux und macOS ausgeführt werden können.", "symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework", + "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Ziel net9.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", + "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", + "symbols/skipRestore/displayName": "Wiederherstellung überspringen", "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen", "postActions/openInEditor/description": "Öffnet Class1.cs“ im Editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json index 4673e27ea263..dbf6c2188a51 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json @@ -3,10 +3,14 @@ "name": "xUnit Test Project", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "symbols/TargetFrameworkOverride/description": "Overrides the target framework", + "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", + "symbols/skipRestore/displayName": "Skip restore", "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'", "postActions/openInEditor/description": "Opens Class1.cs in the editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json index 692c13b22fb8..e3665a5882dc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json @@ -3,10 +3,14 @@ "name": "Proyecto de prueba de xUnit", "description": "Proyecto que contiene xUnit.net pruebas que se pueden ejecutar en .NET en Windows, Linux y macOS", "symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino", + "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", + "symbols/Framework/displayName": "Marco", "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", + "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", + "symbols/skipRestore/displayName": "Omitir restauración", "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"", "postActions/openInEditor/description": "Abrir Class1.cs en el editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json index 7630c01f8a00..bb0caa1c3a4e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -3,10 +3,14 @@ "name": "Projet de test xUnit", "description": "Un projet qui contient des tests xUnit.net qui peuvent être exécutés sur .NET sous Windows, Linux et macOS.", "symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible", + "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", + "symbols/Framework/displayName": "Infrastructure", "symbols/Framework/choices/net9.0/description": "Net9.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", + "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", + "symbols/skipRestore/displayName": "Ignorer la restauration", "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »", "postActions/openInEditor/description": "Ouvre Class1.cs dans l’éditeur" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json index ea193c5eea7f..c410d45dbbb9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json @@ -3,10 +3,14 @@ "name": "Progetto di test xUnit", "description": "Progetto che contiene i test xUnit.net eseguibili in .NET in Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione", + "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", + "symbols/Framework/displayName": "Framework", "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", + "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", + "symbols/skipRestore/displayName": "Salta ripristino", "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'", "postActions/openInEditor/description": "Apre Class1.cs nell'editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json index f01cbfce8fd9..c7a225c1033d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -3,10 +3,14 @@ "name": "xUnit テスト プロジェクト", "description": "Windows、Linux、macOS 上の .NET で実行できる xUnit.net テストを含むプロジェクト", "symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドします", + "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", + "symbols/Framework/displayName": "フレームワーク", "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", + "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", + "symbols/skipRestore/displayName": "復元をスキップする", "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する", "postActions/openInEditor/description": "エディターで Class1.cs を開きます" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json index 33b029f674c8..4569dd2da09d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -3,10 +3,14 @@ "name": "xUnit 테스트 프로젝트", "description": "Windows, Linux 및 macOS의 .NET에서 실행할 수 있는 xUnit.net 테스트가 포함된 프로젝트입니다.", "symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다.", + "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", + "symbols/Framework/displayName": "프레임워크", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", + "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", + "symbols/skipRestore/displayName": "복원 건너뛰기", "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행", "postActions/openInEditor/description": "편집기에서 Class1.cs 열기" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json index f972ab63cc7c..11cfecf91103 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -3,10 +3,14 @@ "name": "xUnit — projekt testowy", "description": "Projekt zawierający testy xUnit.net, które mogą być uruchamiane na platformie .NET w systemach Windows, Linux i macOS", "symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową", + "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", + "symbols/Framework/displayName": "Struktura", "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", + "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", + "symbols/skipRestore/displayName": "Pomiń przywracanie", "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”", "postActions/openInEditor/description": "Otwiera plik Class1.cs w edytorze" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index 999d3e5b8f0f..a99c65709407 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -3,10 +3,14 @@ "name": "Projeto de Teste xUnit", "description": "Um projeto que contém testes xUnit.net que podem ser executados no .NET no Windows, Linux e macOS", "symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino", + "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", + "symbols/Framework/displayName": "Estrutura", "symbols/Framework/choices/net9.0/description": "Target net9.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", + "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", + "symbols/skipRestore/displayName": "Ignorar restauração", "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"", "postActions/openInEditor/description": "Abrir Class1.cs no editor" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json index 975926693559..a35d248e8b58 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -3,10 +3,14 @@ "name": "Тестовый проект xUnit", "description": "Проект, содержащий тесты xUnit.net, которые могут работать на .NET в Windows, Linux и macOS.", "symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу", + "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", + "symbols/Framework/displayName": "Платформа", "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", + "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", + "symbols/skipRestore/displayName": "Пропустить восстановление", "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"", "postActions/openInEditor/description": "Открывает файл Class1.cs в редакторе" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json index cb7c85c5af91..9c5935563bb9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -3,10 +3,14 @@ "name": "xUnit Test Projesi", "description": "Windows, Linux ve macOS üzerinde .NET'te çalışabilen xUnit.net testlerini içeren bir proje", "symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar", + "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", + "symbols/Framework/displayName": "Çerçeve", "symbols/Framework/choices/net9.0/description": "Hedef net9.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", + "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", + "symbols/skipRestore/displayName": "Geri yüklemeyi atla", "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır", "postActions/openInEditor/description": "Düzenleyicide Class1.cs dosyasını açar" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index c3495b51b76e..8e011c975aba 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -3,10 +3,14 @@ "name": "xUnit 测试项目", "description": "一个包含 xUnit.net 测试的项目，这些测试可在 Windows、Linux 和 macOS 的 .NET 上运行", "symbols/TargetFrameworkOverride/description": "替代目标框架", + "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", + "symbols/Framework/displayName": "框架", "symbols/Framework/choices/net9.0/description": "目标 net9.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", + "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", + "symbols/skipRestore/displayName": "跳过还原", "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。", "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"", "postActions/openInEditor/description": "在编辑器中打开 Class1.cs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index 296eea1d56be..c45a20b5c6d5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -3,10 +3,14 @@ "name": "xUnit 測試專案", "description": "包含可以在 Windows、Linux 和 macOS 版的 .NET 上執行的 xUnit.net 測試的專案", "symbols/TargetFrameworkOverride/description": "覆寫目標 Framework", + "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", + "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net9.0/description": "目標 net9.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", + "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", + "symbols/skipRestore/displayName": "跳過還原", "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。", "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'", "postActions/openInEditor/description": "在編輯器中開啟 Class1.cs" diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json index df7dd28a46f5..b7a71a5f0699 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Test", "xUnit"], + "classifications": ["Test", "xUnit", "Desktop", "Web"], "name": "xUnit Test Project", "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", @@ -19,6 +19,7 @@ "TargetFrameworkOverride": { "type": "parameter", "description": "Overrides the target framework", + "displayName": "Target framework override", "replaces": "TargetFrameworkOverride", "datatype": "string", "defaultValue": "" @@ -26,6 +27,7 @@ "Framework": { "type": "parameter", "description": "The target framework for the project.", + "displayName": "Framework", "datatype": "choice", "choices": [ { @@ -40,7 +42,8 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project." + "description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", + "displayName": "Enable pack" }, "HostIdentifier": { "type": "bind", @@ -50,6 +53,7 @@ "type": "parameter", "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", + "displayName": "Skip restore", "defaultValue": "false" } }, From aa8917aa5f22dfff2b0652ec06e6bb74c9a6c0eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 11:26:17 +0000 Subject: [PATCH 481/702] Update dependencies from https://github.com/dotnet/razor build 20241121.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24571.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf4a4f857409..e3de3fe67904 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 2916c403e69983b639ff71bd9d6eee324828c2e1 + fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 - + https://github.com/dotnet/razor - 2916c403e69983b639ff71bd9d6eee324828c2e1 + fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 - + https://github.com/dotnet/razor - 2916c403e69983b639ff71bd9d6eee324828c2e1 + fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 - + https://github.com/dotnet/razor - 2916c403e69983b639ff71bd9d6eee324828c2e1 + fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 diff --git a/eng/Versions.props b/eng/Versions.props index 5100e7500c3d..1a8c004acda5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24570.2 - 9.0.0-preview.24570.2 - 9.0.0-preview.24570.2 + 9.0.0-preview.24571.1 + 9.0.0-preview.24571.1 + 9.0.0-preview.24571.1 From 92f6ed53b02f09e3864fdd9c27fbaf367245950b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Thu, 21 Nov 2024 14:01:28 +0100 Subject: [PATCH 482/702] Fix integ test --- ...yCommandIsUsed_common.Windows.verified.txt | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 15390f6ef3cc..da511357b1fc 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -4,50 +4,50 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Windows Forms App winforms [C#],VB Common/WinForms -Windows Forms Class Library winformslib [C#],VB Common/WinForms -Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms -Worker Service worker [C#],F# Common/Worker/Web -WPF Application wpf [C#],VB Common/WPF -WPF Class Library wpflib [C#],VB Common/WPF -WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF -WPF User Control Library wpfusercontrollib [C#],VB Common/WPF -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Windows Forms App winforms [C#],VB Common/WinForms +Windows Forms Class Library winformslib [C#],VB Common/WinForms +Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms +Worker Service worker [C#],F# Common/Worker/Web +WPF Application wpf [C#],VB Common/WPF +WPF Class Library wpflib [C#],VB Common/WPF +WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF +WPF User Control Library wpfusercontrollib [C#],VB Common/WPF +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file From bf9e89f9ff992d680ce54a08b4a7954dd1010723 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 13:47:53 +0000 Subject: [PATCH 483/702] 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 484/702] 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 485/702] 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 486/702] [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 14f0a304b3600c2dd2bae7acff79fe254cebe394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Thu, 21 Nov 2024 21:08:57 +0100 Subject: [PATCH 487/702] Reduce expected size for --- --- ...asicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index da511357b1fc..f1d69b2432b6 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -5,7 +5,7 @@ For more information, run: These templates matched your input: Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------------------------------- +-------------------------------------------- -------------------------- ---------- ---------------------------------- API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service From 06427b9d6b2e854f853870024523bda0c3b43007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Thu, 21 Nov 2024 21:58:40 +0100 Subject: [PATCH 488/702] Fix invalid local setup --- ...yCommandIsUsed_common.Windows.verified.txt | 85 +++++++++---------- 1 file changed, 39 insertions(+), 46 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index f1d69b2432b6..1b8aada399de 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -4,50 +4,43 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- ---------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Windows Forms App winforms [C#],VB Common/WinForms -Windows Forms Class Library winformslib [C#],VB Common/WinForms -Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms -Worker Service worker [C#],F# Common/Worker/Web -WPF Application wpf [C#],VB Common/WPF -WPF Class Library wpflib [C#],VB Common/WPF -WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF -WPF User Control Library wpfusercontrollib [C#],VB Common/WPF -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file From c5d6ef90c9cae4e8228b73e02873e8b72580d46b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 01:41:17 +0000 Subject: [PATCH 489/702] Update dependencies from https://github.com/dotnet/razor build 20241121.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24571.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3de3fe67904..10af6048af6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 + eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor - fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 + eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor - fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 + eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor - fa5b57f1c7823e60c8bfab5016bd6d3c746fff12 + eef0189b5fbef8ad4446dc0e409163448dff81e9 diff --git a/eng/Versions.props b/eng/Versions.props index 1a8c004acda5..9d046c1c0007 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24571.1 - 9.0.0-preview.24571.1 - 9.0.0-preview.24571.1 + 9.0.0-preview.24571.2 + 9.0.0-preview.24571.2 + 9.0.0-preview.24571.2 From aef12bad75101da169f94b77f23dff50693f6318 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 21 Nov 2024 18:03:15 -0800 Subject: [PATCH 490/702] 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 a2a3942a80c1803db5d77ee6fdc06d4e98200a3e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 21 Nov 2024 22:53:34 -0800 Subject: [PATCH 491/702] Revert the code from the arcade flow --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e23009c131eb..61dc4df66c3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -585,34 +585,34 @@ - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d diff --git a/eng/Versions.props b/eng/Versions.props index 0e83ca80cf84..f03358b69bc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -289,10 +289,10 @@ - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 diff --git a/global.json b/global.json index 4bdf72d4abec..d7f1244344d8 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From f4c688f8279d77bdb9694bb6953fad3b5fc3474e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 14:33:23 +0000 Subject: [PATCH 492/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241122.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.24569.2 -> To Version 9.0.0-beta.24572.1 --- 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 b4968dc2c138..07e8c29cca2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,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 048525a4936f..e579cbf3d671 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,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.1 + 9.0.0-beta.24572.1 + 9.0.0-beta.24572.1 + 9.0.0-beta.24572.1 + 9.0.0-beta.24572.1 + 9.0.0-beta.24572.1 From d68423b491f7968b46330474dfd40655a2ac22a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 17:20:16 +0000 Subject: [PATCH 493/702] 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 5b8943e4baa26addc2a45b78860b247b7e0c4426 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Nov 2024 20:50:05 +0000 Subject: [PATCH 494/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.69 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.62 -> To Version 6.13.0-preview.1.69 --- 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 b4968dc2c138..4e5e0b09dc90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f - + https://github.com/nuget/nuget.client - ce95a567627472f8abd9d155047392e22142ff72 + 46b470cbc5033821d470add040adffe3a1ddf76f https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 048525a4936f..833186cf8b1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,18 +156,18 @@ - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 - 6.13.0-preview.1.62 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 + 6.13.0-preview.1.69 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 495/702] [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 065a5736f32d64c46785b2a6dae2ada2fce04ae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Nov 2024 20:27:35 +0000 Subject: [PATCH 496/702] Update dependencies from https://github.com/dotnet/templating build 20241121.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.101-servicing.24565.5 -> To Version 9.0.102-servicing.24571.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7409d3265d40..44fb258a0ecd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88defe4bf43..b2d22c1f9a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - e660cd905cc907f7167c0826e2c30eb57a87e4da + 2be9b5681fc025fd25eaf1e059ca41852f62fa01 - + https://github.com/dotnet/templating - e660cd905cc907f7167c0826e2c30eb57a87e4da + 2be9b5681fc025fd25eaf1e059ca41852f62fa01 - + https://github.com/dotnet/templating - e660cd905cc907f7167c0826e2c30eb57a87e4da + 2be9b5681fc025fd25eaf1e059ca41852f62fa01 diff --git a/eng/Versions.props b/eng/Versions.props index 593676230051..5993eeab2e3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,13 +203,13 @@ - 9.0.101 + 9.0.102 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.101-servicing.24565.5 + 9.0.102-servicing.24571.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From e39bc3cdd7a8bf35473c92c689f5b971030b72d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 20 Nov 2024 10:16:35 +0100 Subject: [PATCH 497/702] Split GivenThatWeWantToRunILLink test class into multiple so Helix can run them separately Fixes https://github.com/dotnet/sdk/issues/44895 --- .../GivenThatWeWantToRunILLink.cs | 266 ++++++++++-------- 1 file changed, 141 insertions(+), 125 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 280f9199491d..c6c583240ef8 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -11,12 +11,14 @@ using Microsoft.NET.Build.Tasks; using Newtonsoft.Json.Linq; using static Microsoft.NET.Publish.Tests.PublishTestUtils; +using static Microsoft.NET.Publish.Tests.ILLinkTestUtils; namespace Microsoft.NET.Publish.Tests { - public class GivenThatWeWantToRunILLink : SdkTest + // this test class is split up arbitrarily so Helix can run tests in multiple workitems + public class GivenThatWeWantToRunILLink1 : SdkTest { - public GivenThatWeWantToRunILLink(ITestOutputHelper log) : base(log) + public GivenThatWeWantToRunILLink1(ITestOutputHelper log) : base(log) { } @@ -28,7 +30,7 @@ public void ILLink_only_runs_when_switch_is_enabled(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -42,7 +44,7 @@ public void ILLink_only_runs_when_switch_is_enabled(string targetFramework) var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); var unusedDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); - var unusedFrameworkDll = Path.Combine(publishDirectory, $"{unusedFrameworkAssembly}.dll"); + var unusedFrameworkDll = Path.Combine(publishDirectory, $"{UnusedFrameworkAssembly}.dll"); // Linker inputs are kept, including unused assemblies File.Exists(publishedDll).Should().BeTrue(); @@ -51,7 +53,7 @@ public void ILLink_only_runs_when_switch_is_enabled(string targetFramework) var depsFile = Path.Combine(publishDirectory, $"{projectName}.deps.json"); DoesDepsFileHaveAssembly(depsFile, referenceProjectName).Should().BeTrue(); - DoesDepsFileHaveAssembly(depsFile, unusedFrameworkAssembly).Should().BeTrue(); + DoesDepsFileHaveAssembly(depsFile, UnusedFrameworkAssembly).Should().BeTrue(); } [RequiresMSBuildVersionTheory("17.0.0.32901")] @@ -65,7 +67,7 @@ public void ILLink_runs_and_creates_linked_app(string targetFramework, bool refe var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, referenceClassLibAsPackage); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, referenceClassLibAsPackage); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework + referenceClassLibAsPackage) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)); @@ -81,7 +83,7 @@ public void ILLink_runs_and_creates_linked_app(string targetFramework, bool refe var linkedDll = Path.Combine(linkedDirectory, $"{projectName}.dll"); var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); var unusedDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); - var unusedFrameworkDll = Path.Combine(publishDirectory, $"{unusedFrameworkAssembly}.dll"); + var unusedFrameworkDll = Path.Combine(publishDirectory, $"{UnusedFrameworkAssembly}.dll"); // Intermediate assembly is kept by linker and published, but not unused assemblies File.Exists(linkedDll).Should().BeTrue(); @@ -92,7 +94,7 @@ public void ILLink_runs_and_creates_linked_app(string targetFramework, bool refe var depsFile = Path.Combine(publishDirectory, $"{projectName}.deps.json"); DoesDepsFileHaveAssembly(depsFile, projectName).Should().BeTrue(); DoesDepsFileHaveAssembly(depsFile, referenceProjectName).Should().BeFalse(); - DoesDepsFileHaveAssembly(depsFile, unusedFrameworkAssembly).Should().BeFalse(); + DoesDepsFileHaveAssembly(depsFile, UnusedFrameworkAssembly).Should().BeFalse(); } [RequiresMSBuildVersionTheory("17.0.0.32901")] @@ -104,7 +106,7 @@ public void ILLink_links_simple_app_without_analysis_warnings_and_it_runs(string var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); testProject.AdditionalProperties["PublishTrimmed"] = "true"; var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework + trimMode); @@ -132,7 +134,7 @@ public void PublishTrimmed_fails_when_no_matching_pack_is_found(string targetFra var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => { @@ -161,7 +163,7 @@ public void PublishTrimmed_fails_for_unsupported_target_framework(string targetF var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); testProject.AdditionalProperties["PublishTrimmed"] = "true"; testProject.AdditionalProperties["NoWarn"] = "NETSDK1138"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); @@ -194,7 +196,7 @@ public void IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libr var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFrameworks); - var testProject = CreateTestProjectForILLinkTesting(targetFrameworks, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFrameworks, projectName); testProject.AdditionalProperties["IsTrimmable"] = "true"; testProject.AdditionalProperties["NoWarn"] = "NETSDK1138"; // Silence warning about targeting EOL TFMs var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks) @@ -221,7 +223,7 @@ public void RequiresILLinkPack_errors_for_unsupported_target_framework(string ta var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); testProject.AdditionalProperties["_RequiresILLinkPack"] = "true"; var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); @@ -255,7 +257,7 @@ public void PrepareForILLink_can_set_IsTrimmable(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => SetMetadata(project, referenceProjectName, "IsTrimmable", "True")); @@ -280,7 +282,7 @@ public void PrepareForILLink_can_set_TrimMode(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => SetMetadata(project, referenceProjectName, "TrimMode", "link")); @@ -310,7 +312,7 @@ public void ILLink_respects_global_TrimMode(string targetFramework, string trimM var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework + trimMode) .WithProjectChanges(project => SetGlobalTrimMode(project, trimMode)) .WithProjectChanges(project => SetMetadata(project, referenceProjectName, "IsTrimmable", "True")) @@ -346,7 +348,7 @@ public void ILLink_roots_IntermediateAssembly(string targetFramework) var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => SetGlobalTrimMode(project, "link")) .WithProjectChanges(project => SetMetadata(project, projectName, "IsTrimmable", "True")); @@ -371,7 +373,7 @@ public void ILLink_respects_TrimmableAssembly(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); testProject.AddItem("TrimmableAssembly", "Include", referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); @@ -748,7 +750,7 @@ public void ILLink_errors_fail_the_build(string targetFramework) var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); // Set up a project with an invalid feature substitution, just to produce an error. - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); testProject.SourceFiles[$"{projectName}.xml"] = $@" @@ -775,6 +777,14 @@ public void ILLink_errors_fail_the_build(string targetFramework) File.Exists(linkSemaphore).Should().BeFalse(); File.Exists(publishedDll).Should().BeFalse(); } + } + + // this test class is split up arbitrarily so Helix can run tests in multiple workitems + public class GivenThatWeWantToRunILLink2 : SdkTest + { + public GivenThatWeWantToRunILLink2(ITestOutputHelper log) : base(log) + { + } [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(Net6Plus), MemberType = typeof(PublishTestUtils))] @@ -815,7 +825,7 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused(s }); } - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); @@ -897,7 +907,7 @@ public void ILLink_verify_analysis_warnings_framework_assemblies(string targetFr }); } - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); @@ -916,7 +926,7 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link(strin var projectName = "AnalysisWarningsOnHelloWorldApp"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); @@ -932,7 +942,7 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link_5_0() var projectName = "AnalysisWarningsOnHelloWorldApp"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); @@ -942,61 +952,6 @@ public void ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link_5_0() ValidateWarningsOnHelloWorldApp(publishCommand, result, new List(), targetFramework, rid); } - private void ValidateWarningsOnHelloWorldApp(PublishCommand publishCommand, CommandResult result, List expectedWarnings, string targetFramework, string rid, bool useRegex = false) - { - // This checks that there are no unexpected warnings, but does not cause failures for missing expected warnings. - var warnings = result.StdOut.Split('\n', '\r').Where(line => line.Contains("warning IL")); - - // This should also detect unexpected duplicates of expected warnings. - // Each expected warning string/regex matches at most one warning. - List extraWarnings = new(); - foreach (var warning in warnings) - { - bool expected = false; - for (int i = 0; i < expectedWarnings.Count; i++) - { - if ((useRegex && Regex.IsMatch(warning, expectedWarnings[i])) || - (!useRegex && warning.Contains(expectedWarnings[i]))) - { - expectedWarnings.RemoveAt(i); - expected = true; - break; - } - } - - if (!expected) - { - extraWarnings.Add(warning); - } - } - - StringBuilder errorMessage = new(); - - if (extraWarnings.Any()) - { - // Print additional information to recognize which framework assemblies are being used. - errorMessage.AppendLine($"Target framework from test: {targetFramework}"); - errorMessage.AppendLine($"Runtime identifier: {rid}"); - - // Get the array of runtime assemblies inside the publish folder. - string[] runtimeAssemblies = Directory.GetFiles(publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName, "*.dll"); - var paths = new List(runtimeAssemblies); - var resolver = new PathAssemblyResolver(paths); - var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib"); - using (mlc) - { - Assembly assembly = mlc.LoadFromAssemblyPath(Path.Combine(publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName, "System.Private.CoreLib.dll")); - string assemblyVersionInfo = (string)assembly.CustomAttributes.Where(ca => ca.AttributeType.Name == "AssemblyInformationalVersionAttribute").Select(ca => ca.ConstructorArguments[0].Value).FirstOrDefault(); - errorMessage.AppendLine($"Runtime Assembly Informational Version: {assemblyVersionInfo}"); - } - errorMessage.AppendLine($"The execution of a hello world app generated a diff in the number of warnings the app produces{Environment.NewLine}"); - errorMessage.AppendLine("Test output contained the following extra linker warnings:"); - foreach (var extraWarning in extraWarnings) - errorMessage.AppendLine($"+ {extraWarning}"); - } - Assert.True(!extraWarnings.Any(), errorMessage.ToString()); - } - [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(SupportedTfms), MemberType = typeof(PublishTestUtils))] public void TrimmingOptions_are_defaulted_correctly_on_trimmed_apps(string targetFramework) @@ -1004,7 +959,7 @@ public void TrimmingOptions_are_defaulted_correctly_on_trimmed_apps(string targe var projectName = "HelloWorld"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: projectName + targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1077,7 +1032,7 @@ public void ILLink_accepts_root_descriptor(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)) .WithProjectChanges(project => AddRootDescriptor(project, $"{referenceProjectName}.xml")); @@ -1117,7 +1072,7 @@ public void ILLink_error_on_nonboolean_optimization_flag(string property) var targetFramework = "net5.0"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: property); var publishCommand = new PublishCommand(testAsset); @@ -1133,7 +1088,7 @@ public void ILLink_respects_feature_settings_from_host_config() var targetFramework = "net5.0"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, // Reference the classlib to ensure its XML is processed. addAssemblyReference: true, // Set up a conditional feature substitution for the "FeatureDisabled" property @@ -1166,7 +1121,7 @@ public void ILLink_ignores_host_config_settings_with_link_false() var targetFramework = "net5.0"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, // Reference the classlib to ensure its XML is processed. addAssemblyReference: true, // Set up a conditional feature substitution for the "FeatureDisabled" property @@ -1199,7 +1154,7 @@ public void ILLink_runs_incrementally(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1230,7 +1185,7 @@ public void ILLink_old_defaults_keep_nonframework(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1245,7 +1200,7 @@ public void ILLink_old_defaults_keep_nonframework(string targetFramework) var linkedDll = Path.Combine(linkedDirectory, $"{projectName}.dll"); var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); var unusedDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); - var unusedFrameworkDll = Path.Combine(publishDirectory, $"{unusedFrameworkAssembly}.dll"); + var unusedFrameworkDll = Path.Combine(publishDirectory, $"{UnusedFrameworkAssembly}.dll"); File.Exists(linkedDll).Should().BeTrue(); File.Exists(publishedDll).Should().BeTrue(); @@ -1255,7 +1210,7 @@ public void ILLink_old_defaults_keep_nonframework(string targetFramework) var depsFile = Path.Combine(publishDirectory, $"{projectName}.deps.json"); DoesDepsFileHaveAssembly(depsFile, projectName).Should().BeTrue(); DoesDepsFileHaveAssembly(depsFile, referenceProjectName).Should().BeTrue(); - DoesDepsFileHaveAssembly(depsFile, unusedFrameworkAssembly).Should().BeFalse(); + DoesDepsFileHaveAssembly(depsFile, UnusedFrameworkAssembly).Should().BeFalse(); } [RequiresMSBuildVersionFact("17.0.0.32901")] @@ -1266,7 +1221,7 @@ public void ILLink_net7_defaults_trim_nonframework() var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1281,7 +1236,7 @@ public void ILLink_net7_defaults_trim_nonframework() var linkedDll = Path.Combine(linkedDirectory, $"{projectName}.dll"); var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); var unusedDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); - var unusedFrameworkDll = Path.Combine(publishDirectory, $"{unusedFrameworkAssembly}.dll"); + var unusedFrameworkDll = Path.Combine(publishDirectory, $"{UnusedFrameworkAssembly}.dll"); File.Exists(linkedDll).Should().BeTrue(); File.Exists(publishedDll).Should().BeTrue(); @@ -1291,7 +1246,7 @@ public void ILLink_net7_defaults_trim_nonframework() var depsFile = Path.Combine(publishDirectory, $"{projectName}.deps.json"); DoesDepsFileHaveAssembly(depsFile, projectName).Should().BeTrue(); DoesDepsFileHaveAssembly(depsFile, referenceProjectName).Should().BeFalse(); - DoesDepsFileHaveAssembly(depsFile, unusedFrameworkAssembly).Should().BeFalse(); + DoesDepsFileHaveAssembly(depsFile, UnusedFrameworkAssembly).Should().BeFalse(); } [RequiresMSBuildVersionTheory("17.0.0.32901")] @@ -1302,7 +1257,7 @@ public void ILLink_does_not_include_leftover_artifacts_on_second_run(string targ var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, referenceProjectIdentifier: targetFramework); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)) .WithProjectChanges(project => AddRootDescriptor(project, $"{referenceProjectName}.xml")); @@ -1355,7 +1310,7 @@ public void ILLink_keeps_symbols_by_default(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)); @@ -1388,7 +1343,7 @@ public void ILLink_removes_symbols_when_debugger_support_is_disabled(string targ var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)); @@ -1407,6 +1362,14 @@ public void ILLink_removes_symbols_when_debugger_support_is_disabled(string targ File.Exists(linkedPdb).Should().BeFalse(); File.Exists(publishedPdb).Should().BeFalse(); } + } + + // this test class is split up arbitrarily so Helix can run tests in multiple workitems + public class GivenThatWeWantToRunILLink3 : SdkTest + { + public GivenThatWeWantToRunILLink3(ITestOutputHelper log) : base(log) + { + } [RequiresMSBuildVersionTheory("17.0.0.32901")] [MemberData(nameof(SupportedTfms), MemberType = typeof(PublishTestUtils))] @@ -1416,7 +1379,7 @@ public void ILLink_accepts_option_to_remove_symbols(string targetFramework) var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)); @@ -1444,7 +1407,7 @@ public void ILLink_symbols_option_can_override_defaults_from_debugger_support(st var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework) .WithProjectChanges(project => EnableNonFrameworkTrimming(project)); @@ -1596,7 +1559,7 @@ public void ILLink_error_on_portable_app(string targetFramework) var projectName = "HelloWorld"; var referenceProjectName = "ClassLibForILLink"; - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName, setSelfContained: false); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName, setSelfContained: false); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1614,7 +1577,7 @@ public void ILLink_displays_informational_warning_up_to_net5_by_default(string t var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1631,7 +1594,7 @@ public void ILLink_displays_informational_warning_when_trim_analysis_warnings_ar var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1649,7 +1612,7 @@ public void ILLink_dont_display_informational_warning_by_default_on_net6plus(str var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1667,7 +1630,7 @@ public void ILLink_dont_display_time_awareness_message_on_incremental_build(stri var referenceProjectName = "ClassLibForILLink"; var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testProject = CreateTestProjectForILLinkTesting(_testAssetsManager, targetFramework, projectName, referenceProjectName); var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); var publishCommand = new PublishCommand(testAsset); @@ -1748,8 +1711,13 @@ public void Build_respects_PublishTrimmed_property(string targetFramework) // just setting PublishTrimmed doesn't inject the IsTrimmable attribute AssemblyInfo.Get(assemblyPath).ContainsKey("AssemblyMetadataAttribute").Should().BeFalse(); } + } + + internal static class ILLinkTestUtils + { + public static string UnusedFrameworkAssembly = "System.IO"; - private static bool DoesImageHaveMethod(string path, string methodNameToCheck) + public static bool DoesImageHaveMethod(string path, string methodNameToCheck) { using (FileStream fs = new(path, FileMode.Open, FileAccess.Read)) using (var peReader = new PEReader(fs)) @@ -1766,7 +1734,7 @@ private static bool DoesImageHaveMethod(string path, string methodNameToCheck) return false; } - private static bool DoesDepsFileHaveAssembly(string depsFilePath, string assemblyName) + public static bool DoesDepsFileHaveAssembly(string depsFilePath, string assemblyName) { DependencyContext dependencyContext; using (var fs = File.OpenRead(depsFilePath)) @@ -1780,15 +1748,7 @@ private static bool DoesDepsFileHaveAssembly(string depsFilePath, string assembl Path.GetFileName(f) == $"{assemblyName}.dll"))); } - static string unusedFrameworkAssembly = "System.IO"; - - private TestAsset GetProjectReference(TestProject project, string callingMethod, string identifier) - { - var asset = _testAssetsManager.CreateTestProject(project, callingMethod: callingMethod, identifier: identifier); - return asset; - } - - private void AddRootDescriptor(XDocument project, string rootDescriptorFileName) + public static void AddRootDescriptor(XDocument project, string rootDescriptorFileName) { var ns = project.Root.Name.Namespace; @@ -1798,7 +1758,7 @@ private void AddRootDescriptor(XDocument project, string rootDescriptorFileName) new XAttribute("Include", rootDescriptorFileName))); } - private void RemoveRootDescriptor(XDocument project) + public static void RemoveRootDescriptor(XDocument project) { var ns = project.Root.Name.Namespace; @@ -1807,7 +1767,7 @@ private void RemoveRootDescriptor(XDocument project) .First().Remove(); } - private void SetMetadata(XDocument project, string assemblyName, string key, string value) + public static void SetMetadata(XDocument project, string assemblyName, string key, string value) { var ns = project.Root.Name.Namespace; var targetName = "SetTrimmerMetadata"; @@ -1829,7 +1789,7 @@ private void SetMetadata(XDocument project, string assemblyName, string key, str new XAttribute(key, value)))); } - private void SetGlobalTrimMode(XDocument project, string trimMode) + public static void SetGlobalTrimMode(XDocument project, string trimMode) { var ns = project.Root.Name.Namespace; @@ -1839,7 +1799,7 @@ private void SetGlobalTrimMode(XDocument project, string trimMode) trimMode)); } - private void SetTrimmerDefaultAction(XDocument project, string action) + public static void SetTrimmerDefaultAction(XDocument project, string action) { var ns = project.Root.Name.Namespace; @@ -1848,7 +1808,7 @@ private void SetTrimmerDefaultAction(XDocument project, string action) properties.Add(new XElement(ns + "TrimmerDefaultAction", action)); } - private void EnableNonFrameworkTrimming(XDocument project) + public static void EnableNonFrameworkTrimming(XDocument project) { // Used to override the default linker options for testing // purposes. The default roots non-framework assemblies, @@ -1871,10 +1831,10 @@ private void EnableNonFrameworkTrimming(XDocument project) new XAttribute("Include", "@(IntermediateAssembly->'%(FullPath)')"))); } - static readonly string substitutionsFilename = "ILLink.Substitutions.xml"; - - private void AddFeatureDefinition(TestProject testProject, string assemblyName) + public static void AddFeatureDefinition(TestProject testProject, string assemblyName) { + const string substitutionsFilename = "ILLink.Substitutions.xml"; + // Add a feature definition that replaces the FeatureDisabled property when DisableFeature is true. testProject.EmbeddedResources[substitutionsFilename] = $@" @@ -1893,7 +1853,7 @@ private void AddFeatureDefinition(TestProject testProject, string assemblyName) }); } - private void AddRuntimeConfigOption(XDocument project, bool trim) + public static void AddRuntimeConfigOption(XDocument project, bool trim) { var ns = project.Root.Name.Namespace; @@ -1904,7 +1864,7 @@ private void AddRuntimeConfigOption(XDocument project, bool trim) new XAttribute("Trim", trim.ToString())))); } - private TestProject CreateTestProjectWithAnalysisWarnings(string targetFramework, string projectName, bool isExe = true) + public static TestProject CreateTestProjectWithAnalysisWarnings(string targetFramework, string projectName, bool isExe = true) { var testProject = new TestProject() { @@ -1978,7 +1938,7 @@ public override void IL_2046() {} return testProject; } - private TestProject CreateTestProjectWithIsTrimmableAttributes( + public static TestProject CreateTestProjectWithIsTrimmableAttributes( string targetFramework, string projectName) { @@ -2083,7 +2043,8 @@ public static void UnusedMethod() return testProject; } - private TestProject CreateTestProjectForILLinkTesting( + public static TestProject CreateTestProjectForILLinkTesting( + TestAssetsManager testAssetsManager, string targetFrameworks, string mainProjectName, string referenceProjectName = null, @@ -2188,7 +2149,7 @@ public static void FeatureImplementation() if (usePackageReference) { - var referenceAsset = GetProjectReference(referenceProject, callingMethod, referenceProjectIdentifier ?? targetFrameworks); + var referenceAsset = testAssetsManager.CreateTestProject(referenceProject, callingMethod, referenceProjectIdentifier ?? targetFrameworks); testProject.ReferencedProjects.Add(referenceAsset.TestProject); } else @@ -2211,7 +2172,7 @@ public static void FeatureImplementation() return testProject; } - private void CheckILLinkVersion(TestAsset testAsset, string targetFramework) + public static void CheckILLinkVersion(TestAsset testAsset, string targetFramework) { var getKnownPacks = new GetValuesCommand(testAsset, "KnownILLinkPack", GetValuesCommand.ValueType.Item, targetFramework) { @@ -2231,5 +2192,60 @@ private void CheckILLinkVersion(TestAsset testAsset, string targetFramework) var illinkVersion = Path.GetFileName(Path.GetDirectoryName(Path.GetDirectoryName(illinkTargetsPath))); illinkVersion.Should().Be(expectedVersion); } + + public static void ValidateWarningsOnHelloWorldApp(PublishCommand publishCommand, CommandResult result, List expectedWarnings, string targetFramework, string rid, bool useRegex = false) + { + // This checks that there are no unexpected warnings, but does not cause failures for missing expected warnings. + var warnings = result.StdOut.Split('\n', '\r').Where(line => line.Contains("warning IL")); + + // This should also detect unexpected duplicates of expected warnings. + // Each expected warning string/regex matches at most one warning. + List extraWarnings = new(); + foreach (var warning in warnings) + { + bool expected = false; + for (int i = 0; i < expectedWarnings.Count; i++) + { + if ((useRegex && Regex.IsMatch(warning, expectedWarnings[i])) || + (!useRegex && warning.Contains(expectedWarnings[i]))) + { + expectedWarnings.RemoveAt(i); + expected = true; + break; + } + } + + if (!expected) + { + extraWarnings.Add(warning); + } + } + + StringBuilder errorMessage = new(); + + if (extraWarnings.Any()) + { + // Print additional information to recognize which framework assemblies are being used. + errorMessage.AppendLine($"Target framework from test: {targetFramework}"); + errorMessage.AppendLine($"Runtime identifier: {rid}"); + + // Get the array of runtime assemblies inside the publish folder. + string[] runtimeAssemblies = Directory.GetFiles(publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName, "*.dll"); + var paths = new List(runtimeAssemblies); + var resolver = new PathAssemblyResolver(paths); + var mlc = new MetadataLoadContext(resolver, "System.Private.CoreLib"); + using (mlc) + { + Assembly assembly = mlc.LoadFromAssemblyPath(Path.Combine(publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName, "System.Private.CoreLib.dll")); + string assemblyVersionInfo = (string)assembly.CustomAttributes.Where(ca => ca.AttributeType.Name == "AssemblyInformationalVersionAttribute").Select(ca => ca.ConstructorArguments[0].Value).FirstOrDefault(); + errorMessage.AppendLine($"Runtime Assembly Informational Version: {assemblyVersionInfo}"); + } + errorMessage.AppendLine($"The execution of a hello world app generated a diff in the number of warnings the app produces{Environment.NewLine}"); + errorMessage.AppendLine("Test output contained the following extra linker warnings:"); + foreach (var extraWarning in extraWarnings) + errorMessage.AppendLine($"+ {extraWarning}"); + } + Assert.True(!extraWarnings.Any(), errorMessage.ToString()); + } } } From 122de6b4fc2f4ff070c28615d1a0ff9616dd5c40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 00:55:37 +0000 Subject: [PATCH 498/702] Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24572.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98ed2afd83c3..ecefc57e6c55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -585,34 +585,34 @@ - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 diff --git a/eng/Versions.props b/eng/Versions.props index 0397bebb2525..80b0b4699255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -289,10 +289,10 @@ - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9a..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a574..aa94fb174596 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 21f2755cb612..10b7560a80ab 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 83b208a4538193a1a820d29cd2eb826513b2fdcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 01:04:11 +0000 Subject: [PATCH 499/702] 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 | 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 07e8c29cca2e..9b35587beb6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,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 e579cbf3d671..e9667c39fb59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24572.1 - 9.0.0-beta.24572.1 - 9.0.0-beta.24572.1 - 9.0.0-beta.24572.1 - 9.0.0-beta.24572.1 - 9.0.0-beta.24572.1 + 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 468115e6eb2e02dbb1e57af5c3162d4ce7b7030c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 12:26:00 +0000 Subject: [PATCH 500/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.71 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.62 -> To Version 6.13.0-preview.1.71 --- 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 4e5e0b09dc90..93fb509a6902 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 - + https://github.com/nuget/nuget.client - 46b470cbc5033821d470add040adffe3a1ddf76f + c0d3837b40a353b5178cd02953db2924aacb8712 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 833186cf8b1a..18604619250d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,18 +156,18 @@ - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 - 6.13.0-preview.1.69 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 + 6.13.0-preview.1.71 From f3b5ba02af67cedb14424dcef8dfe53a7076e3bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:24:16 +0000 Subject: [PATCH 501/702] Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdc605415b62..08366cc17283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index af8c285303a8..65d6011fedce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24562.12 + 8.0.0-beta.24570.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24562.12 + 8.0.0-beta.24570.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 265d3b6f8cf6..6dc38f7387fd 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24562.12" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24570.5" } } From 9e67da528e4cabddbb4e49d6b5c158de2f9e6666 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:33:43 +0000 Subject: [PATCH 502/702] Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b0f7c44be3a..4fc296c28c7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4bd7dff45265..de0cb1a85dfe 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.24562.12 + 8.0.0-beta.24570.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24562.12 + 8.0.0-beta.24570.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 265d3b6f8cf6..6dc38f7387fd 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24562.12" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24570.5" } } From 1c6924db217b4b4ab92c16d8cbe787701b59be52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:41:46 +0000 Subject: [PATCH 503/702] 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 504/702] 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 06650cdbce4530c2bcf565d2431566343a89f558 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 13:49:13 +0000 Subject: [PATCH 505/702] Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a88defe4bf43..2249a5953564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 diff --git a/eng/Versions.props b/eng/Versions.props index 593676230051..d0b0d4efd250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -286,10 +286,10 @@ - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9a..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a574..aa94fb174596 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 4bdf72d4abec..10b7560a80ab 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 18ea0eb66b27ad89bcc760ac92f55fdc66732f73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Nov 2024 16:13:37 +0000 Subject: [PATCH 506/702] Update dependencies from https://github.com/dotnet/templating build 20241123.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.101-servicing.24565.5 -> To Version 9.0.102-servicing.24573.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44fb258a0ecd..9e7c6f414207 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d22c1f9a58..8aec1f818d0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 2be9b5681fc025fd25eaf1e059ca41852f62fa01 + 46906601959159886b83bd125a9b253f38ac2d0d - + https://github.com/dotnet/templating - 2be9b5681fc025fd25eaf1e059ca41852f62fa01 + 46906601959159886b83bd125a9b253f38ac2d0d - + https://github.com/dotnet/templating - 2be9b5681fc025fd25eaf1e059ca41852f62fa01 + 46906601959159886b83bd125a9b253f38ac2d0d diff --git a/eng/Versions.props b/eng/Versions.props index 5993eeab2e3f..ce8fe505d97c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -209,7 +209,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.102-servicing.24571.2 + 9.0.102-servicing.24573.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 065ade1ee12808dc08c8fcecda7a0f86bec1b926 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 13:32:50 +0000 Subject: [PATCH 507/702] Update dependencies from https://github.com/dotnet/roslyn build 20241118.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.12 -> To Version 4.13.0-2.24568.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4968dc2c138..e969c8ab4f43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 - + https://github.com/dotnet/roslyn - c0b2f366d0fb54cf49040a82f0d044bb959a9e73 + 324fd25331c969cd742ba68eee09ffd4b6fd29e3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b2a719958c48..5bbd294825c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 - 4.13.0-2.24558.12 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 + 4.13.0-2.24568.2 From 474a0b03cb01c6495850f378a8c96f72040e20af Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Thu, 14 Nov 2024 13:44:04 -0800 Subject: [PATCH 508/702] Update to new Roslyn APIs --- .../HotReload/CompilationHandler.cs | 31 ++++++++++++------- .../dotnet-watch/HotReloadDotNetWatcher.cs | 17 +++++----- .../dotnet-watch/Internal/IReporter.cs | 2 +- .../HotReload/ApplyDeltaTests.cs | 24 ++++++-------- .../HotReload/RuntimeProcessLauncherTests.cs | 9 +++--- 5 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index b64873f7a74d..2d2903f4b665 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -72,7 +72,7 @@ public async ValueTask TerminateNonRootProcessesAndDispose(CancellationToken can Dispose(); } - public ValueTask RestartSessionAsync(ImmutableDictionary projectsToBeRebuilt, CancellationToken cancellationToken) + public void DiscardProjectBaselines(ImmutableDictionary projectsToBeRebuilt, CancellationToken cancellationToken) { // Remove previous updates to all modules that were affected by rude edits. // All running projects that statically reference these modules have been terminated. @@ -85,9 +85,13 @@ public ValueTask RestartSessionAsync(ImmutableDictionary proj _previousUpdates = _previousUpdates.RemoveAll(update => projectsToBeRebuilt.ContainsKey(update.ProjectId)); } - _hotReloadService.EndSession(); - _reporter.Report(MessageDescriptor.HotReloadSessionEnded); - return StartSessionAsync(cancellationToken); + _hotReloadService.UpdateBaselines(Workspace.CurrentSolution, projectsToBeRebuilt.Keys.ToImmutableArray()); + } + + public void UpdateProjectBaselines(ImmutableDictionary projectsToBeRebuilt, CancellationToken cancellationToken) + { + _hotReloadService.UpdateBaselines(Workspace.CurrentSolution, projectsToBeRebuilt.Keys.ToImmutableArray()); + _reporter.Report(MessageDescriptor.ProjectBaselinesUpdated); } public async ValueTask StartSessionAsync(CancellationToken cancellationToken) @@ -275,14 +279,19 @@ private static void PrepareCompilations(Solution solution, string projectPath, C } public async ValueTask<(ImmutableDictionary projectsToRebuild, ImmutableArray terminatedProjects)> HandleFileChangesAsync( - Func, CancellationToken, Task> restartPrompt, + Func, CancellationToken, Task> restartPrompt, CancellationToken cancellationToken) { var currentSolution = Workspace.CurrentSolution; var runningProjects = _runningProjects; - var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, isRunningProject: p => runningProjects.ContainsKey(p.FilePath!), cancellationToken); - var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0; + var runningProjectIds = currentSolution.Projects + .Where(project => project.FilePath != null && runningProjects.ContainsKey(project.FilePath)) + .Select(project => project.Id) + .ToImmutableHashSet(); + + var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, runningProjectIds, cancellationToken); + var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty; await DisplayResultsAsync(updates, cancellationToken); @@ -300,13 +309,13 @@ private static void PrepareCompilations(Solution solution, string projectPath, C return (ImmutableDictionary.Empty, []); } - await restartPrompt.Invoke(updates.ProjectsToRestart, cancellationToken); + await restartPrompt.Invoke(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.Name), cancellationToken); // Terminate all tracked processes that need to be restarted, // except for the root process, which will terminate later on. - var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectsToRestart.Select(p => p.FilePath!), cancellationToken); + var terminatedProjects = await TerminateNonRootProcessesAsync(updates.ProjectIdsToRestart.Select(id => currentSolution.GetProject(id)!.FilePath!), cancellationToken); - return (updates.ProjectsToRebuild.ToImmutableDictionary(keySelector: p => p.Id, elementSelector: p => p.FilePath!), terminatedProjects); + return (updates.ProjectIdsToRebuild.ToImmutableDictionary(keySelector: id => id, elementSelector: id => currentSolution.GetProject(id)!.FilePath!), terminatedProjects); } Debug.Assert(updates.Status == ModuleUpdateStatus.Ready); @@ -351,7 +360,7 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates updates, CancellationToken cancellationToken) { - var anyProcessNeedsRestart = updates.ProjectsToRestart.Count > 0; + var anyProcessNeedsRestart = !updates.ProjectIdsToRestart.IsEmpty; switch (updates.Status) { diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 45b0fc6d200d..89124521e6f0 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -255,7 +255,7 @@ void FileChangedCallback(string path, ChangeKind kind) HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.CompilationHandler); - var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projects, cancellationToken) => + var (projectsToRebuild, projectsToRestart) = await compilationHandler.HandleFileChangesAsync(restartPrompt: async (projectNames, cancellationToken) => { if (_rudeEditRestartPrompt != null) { @@ -271,9 +271,9 @@ void FileChangedCallback(string path, ChangeKind kind) { Context.Reporter.Output("Affected projects:"); - foreach (var project in projects.OrderBy(p => p.Name)) + foreach (var projectName in projectNames.OrderBy(n => n)) { - Context.Reporter.Output(" " + project.Name); + Context.Reporter.Output(" " + projectName); } question = "Do you want to restart these projects?"; @@ -289,9 +289,9 @@ void FileChangedCallback(string path, ChangeKind kind) { Context.Reporter.Verbose("Restarting without prompt since dotnet-watch is running in non-interactive mode."); - foreach (var project in projects) + foreach (var projectName in projectNames) { - Context.Reporter.Verbose($" Project to restart: '{project.Name}'"); + Context.Reporter.Verbose($" Project to restart: '{projectName}'"); } } }, iterationCancellationToken); @@ -312,6 +312,9 @@ void FileChangedCallback(string path, ChangeKind kind) if (projectsToRebuild.Count > 0) { + // Discard baselines before build. + compilationHandler.DiscardProjectBaselines(projectsToRebuild, iterationCancellationToken); + while (true) { iterationCancellationToken.ThrowIfCancellationRequested(); @@ -347,8 +350,8 @@ void FileChangedCallback(string path, ChangeKind kind) // Apply them to the workspace. _ = await CaptureChangedFilesSnapshot(projectsToRebuild); - // Restart session to capture new baseline that reflects the changes to the restarted projects. - await compilationHandler.RestartSessionAsync(projectsToRebuild, iterationCancellationToken); + // Update project baselines to reflect changes to the restarted projects. + compilationHandler.UpdateProjectBaselines(projectsToRebuild, iterationCancellationToken); } if (projectsToRestart is not []) diff --git a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs index 20ff02183c39..932c92d59fdd 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs @@ -52,7 +52,7 @@ public bool TryGetMessage(string? prefix, object?[] args, [NotNullWhen(true)] ou // predefined messages used for testing: public static readonly MessageDescriptor HotReloadSessionStarting = new(Format: null, Emoji: null, MessageSeverity.None, s_id++); public static readonly MessageDescriptor HotReloadSessionStarted = new("Hot reload session started.", "🔥", MessageSeverity.Verbose, s_id++); - public static readonly MessageDescriptor HotReloadSessionEnded = new("Hot reload session ended.", "🔥", MessageSeverity.Verbose, s_id++); + public static readonly MessageDescriptor ProjectBaselinesUpdated = new("Project baselines updated.", "🔥", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor FixBuildError = new("Fix the error to continue or press Ctrl+C to exit.", "⌚", MessageSeverity.Warning, s_id++); public static readonly MessageDescriptor WaitingForChanges = new("Waiting for changes", "⌚", MessageSeverity.Verbose, s_id++); public static readonly MessageDescriptor LaunchedProcess = new("Launched '{0}' with arguments '{1}': process id {2}", "🚀", MessageSeverity.Verbose, s_id++); diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index a2060d3f9470..275dab47e8f0 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -459,7 +459,6 @@ public async Task Aspire() Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: "))); App.Process.ClearOutput(); -#if TODO // needs Roslyn update // rude edit with build error: UpdateSourceFile( serviceSourcePath, @@ -484,23 +483,15 @@ public async Task Aspire() } else { - App.AssertOutputContains("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Exited"); + // Unix process may return exit code = 128 + SIGTERM + // dotnet watch ❌ [WatchAspire.ApiService (net9.0)] Exited with error code 143 + App.AssertOutputContains("[WatchAspire.ApiService (net9.0)] Exited"); } App.AssertOutputContains($"dotnet watch ⌚ Building '{serviceProjectPath}' ..."); App.AssertOutputContains("error CS0246: The type or namespace name 'WeatherForecast' could not be found"); App.Process.ClearOutput(); - // TODO: remove - Log("dotnet build-server shutdown"); - var workloadInstallCommandSpec = new DotnetCommand(Logger, ["build-server", "shutdown"]) - { - WorkingDirectory = testAsset.Path, - }; - - var result = workloadInstallCommandSpec.Execute(); - Assert.Equal(0, result.ExitCode); - // fix build error: UpdateSourceFile( serviceSourcePath, @@ -509,8 +500,9 @@ public async Task Aspire() await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Capabilities"); App.AssertOutputContains("dotnet watch ⌚ Build succeeded."); + App.AssertOutputContains("dotnet watch 🔥 Project baselines updated."); App.AssertOutputContains($"dotnet watch ⭐ Starting project: {serviceProjectPath}"); -#endif + App.SendControlC(); await App.AssertOutputLineStartsWith("dotnet watch 🛑 Shutdown requested. Press Ctrl+C again to force exit."); @@ -523,8 +515,10 @@ public async Task Aspire() } else { - await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.ApiService (net9.0)] Exited"); - await App.AssertOutputLineStartsWith("dotnet watch ⌚ [WatchAspire.AppHost (net9.0)] Exited"); + // Unix process may return exit code = 128 + SIGTERM + // dotnet watch ❌ [WatchAspire.ApiService (net9.0)] Exited with error code 143 + await App.AssertOutputLine(line => line.Contains("[WatchAspire.ApiService (net9.0)] Exited"), failure: _ => false); + await App.AssertOutputLine(line => line.Contains("[WatchAspire.AppHost (net9.0)] Exited"), failure: _ => false); } await App.AssertOutputLineStartsWith("dotnet watch ⭐ Waiting for server to shutdown ..."); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index e3b84fb7633b..c4ab7b0db357 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -130,7 +130,8 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) var changeHandled = reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); var sessionStarted = reporter.RegisterSemaphore(MessageDescriptor.HotReloadSessionStarted); - + var projectBaselinesUpdated = reporter.RegisterSemaphore(MessageDescriptor.ProjectBaselinesUpdated); + await launchCompletionA.Task; await launchCompletionB.Task; @@ -146,10 +147,10 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) Log("Waiting for changed handled ..."); await changeHandled.WaitAsync(); - // Wait for a new session to start, so that we capture the new solution snapshot + // Wait for project baselines to be updated, so that we capture the new solution snapshot // and further changes are treated as another update. - Log("Waiting for session started..."); - await sessionStarted.WaitAsync(); + Log("Waiting for baselines updated..."); + await projectBaselinesUpdated.WaitAsync(); await MakeValidDependencyChange(); From abd66180c1e5baa670bc94ce2367c86aa45d009e Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Sat, 23 Nov 2024 14:39:24 -0800 Subject: [PATCH 509/702] dotnet-watch: Fix buffer size --- .../dotnet-watch/HotReload/DefaultDeltaApplier.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs index fd5a94da5380..2ccd307bd6e1 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs @@ -140,10 +140,11 @@ private async Task ReceiveApplyUpdateResult(CancellationToken cancellation var status = ArrayPool.Shared.Rent(1); try { - var statusBytesRead = await _pipe.ReadAsync(status, cancellationToken); + var statusBytesRead = await _pipe.ReadAsync(status, offset: 0, count: 1, cancellationToken); if (statusBytesRead != 1 || status[0] != UpdatePayload.ApplySuccessValue) { - Reporter.Error($"Change failed to apply (error code: '{BitConverter.ToString(status, 0, statusBytesRead)}'). Further changes won't be applied to this process."); + var message = (statusBytesRead == 0) ? "received no data" : $"received status 0x{status[0]:x2}"; + Reporter.Error($"Change failed to apply ({message}). Further changes won't be applied to this process."); return false; } From 85e84a0bf37f613fcab7a2267f508825a67c98b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 22 Nov 2024 17:00:21 -0800 Subject: [PATCH 510/702] Disable test ItUsesArtifactsOutputPathForPublish --- test/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs b/test/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs index 4afaaa3a9074..4a4c86049f40 100644 --- a/test/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs +++ b/test/Microsoft.NET.Build.Tests/ArtifactsOutputPathTests.cs @@ -94,7 +94,7 @@ public void ItUsesArtifactsOutputPathForBuild() } } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45057")] public void ItUsesArtifactsOutputPathForPublish() { var (testProjects, testAsset) = GetTestProjects(); From b41920189a736074210bc69ee5605caafba33c1d Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Sat, 23 Nov 2024 07:51:17 -0800 Subject: [PATCH 511/702] Fix GivenDotnetTestBuildsAndRunsTestFromCsproj tests --- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 1af8c78c493d..85d6749e07a5 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -18,7 +18,7 @@ public GivenDotnetTestBuildsAndRunsTestFromCsproj(ITestOutputHelper log) : base( [Fact] public void MSTestSingleTFM() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("3"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); // Call test CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true) @@ -160,7 +160,7 @@ public void GivenAFailingTestItDisplaysFailureDetails() public void ItAcceptsMultipleLoggersAsCliArguments() { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("10"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); var trxFileNamePattern = "custom*.trx"; string trxLoggerDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -197,7 +197,7 @@ public void ItAcceptsMultipleLoggersAsCliArguments() public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven() { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("5"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; string expectedError = Path.Combine(testProjectDirectory, "bin", configuration, ToolsetInfo.CurrentTargetFramework, "VSTestCore.dll"); @@ -225,7 +225,7 @@ public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven() public void TestWillCreateTrxLoggerInTheSpecifiedResultsDirectoryBySwitch() { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("6"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string trxLoggerDirectory = Path.Combine(testProjectDirectory, "TR", "x.y"); @@ -256,7 +256,7 @@ public void TestWillCreateTrxLoggerInTheSpecifiedResultsDirectoryBySwitch() public void ItCreatesTrxReportInTheSpecifiedResultsDirectoryByArgs() { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("7"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); var trxFileNamePattern = "custom*.trx"; string trxLoggerDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -342,7 +342,7 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory() public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests(string verbosity, bool shouldShowPassedTests) { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp($"9_{verbosity}"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([verbosity, shouldShowPassedTests]); // Call test CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true) @@ -414,7 +414,7 @@ public void ItTestsWithTheSpecifiedRuntimeOption() public void ItAcceptsNoLogoAsCliArguments() { // Copy and restore VSTestCore project in output directory of project dotnet-vstest.Tests - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("14"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); // Call test with logger enable CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true) @@ -434,7 +434,7 @@ public void ItAcceptsNoLogoAsCliArguments() [PlatformSpecificFact(TestPlatforms.Windows)] public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("11"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string resultsDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -475,7 +475,7 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings() [PlatformSpecificFact(TestPlatforms.Windows | TestPlatforms.OSX | TestPlatforms.Linux)] public void ItCreatesCoverageFileInResultsDirectory() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("12"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string resultsDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -511,7 +511,7 @@ public void ItCreatesCoverageFileInResultsDirectory() [PlatformSpecificFact(TestPlatforms.Windows | TestPlatforms.OSX | TestPlatforms.Linux)] public void ItCreatesCoberturaFileProvidedByCommandInResultsDirectory() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("15"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string resultsDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -547,7 +547,7 @@ public void ItCreatesCoberturaFileProvidedByCommandInResultsDirectory() [PlatformSpecificFact(TestPlatforms.Windows)] public void ItHandlesMultipleCollectCommandInResultsDirectory() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("16"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); string resultsDirectory = Path.Combine(testProjectDirectory, "RD"); @@ -588,7 +588,7 @@ public void ItHandlesMultipleCollectCommandInResultsDirectory() [PlatformSpecificFact(TestPlatforms.FreeBSD)] public void ItShouldShowWarningMessageOnCollectCodeCoverage() { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("13"); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([]); // Call test CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true) @@ -714,7 +714,7 @@ public void FilterPropertyCorrectlyHandlesComma(string filter, string folderSuff [InlineData("--results-directory")] public void EnsureOutputPathEscaped(string flag) { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp(flag); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([flag]); var pathWithComma = Path.Combine(AppContext.BaseDirectory, "a,b"); @@ -763,7 +763,7 @@ public void PathEndsWithSlashOrBackslash(string flag, string slashesOrBackslashe { // NOTE: We also want to test with forward slashes because on Windows they // are converted to backslashes and so need to be handled correctly. - string testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp(Guid.NewGuid().ToString()); + string testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([flag, slashesOrBackslashes]); string flagDirectory = Path.Combine(testProjectDirectory, "flag-dir"); // Call test @@ -788,7 +788,7 @@ public void PathEndsWithSlashOrBackslash(string flag, string slashesOrBackslashe [InlineData("-e:foo=barexe")] public void ArgumentsEndWithDllOrExeShouldNotFail(string arg) { - var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp(); + var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp([arg]); // Call test CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true) @@ -804,12 +804,12 @@ public void ArgumentsEndWithDllOrExeShouldNotFail(string arg) } } - private string CopyAndRestoreVSTestDotNetCoreTestApp([CallerMemberName] string callingMethod = "") + private string CopyAndRestoreVSTestDotNetCoreTestApp(object[] parameters, [CallerMemberName] string callingMethod = "") { // Copy VSTestCore project in output directory of project dotnet-vstest.Tests string testAppName = "VSTestCore"; - var testInstance = _testAssetsManager.CopyTestAsset(testAppName, callingMethod: callingMethod) + var testInstance = _testAssetsManager.CopyTestAsset(testAppName, callingMethod: callingMethod, identifier: string.Join(",", parameters.Select(p => p.ToString()))) .WithSource() .WithVersionVariables(); From 464231bf71693697171e019a70b117add5697ea0 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Sat, 23 Nov 2024 17:50:52 -0800 Subject: [PATCH 512/702] Write command output to test output as soon as available --- .../Commands/TestCommand.cs | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs b/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs index 55b8c0181e83..91d10b15d4c4 100644 --- a/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs +++ b/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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; @@ -120,19 +120,30 @@ private static bool SuccessOrNotTransientRestoreError(CommandResult result) public virtual CommandResult Execute(IEnumerable args) { - var command = CreateCommandSpec(args) + var spec = CreateCommandSpec(args); + + var command = spec .ToCommand(_doNotEscapeArguments) .CaptureStdOut() .CaptureStdErr(); - if (CommandOutputHandler != null) + command.OnOutputLine(line => { - command.OnOutputLine(CommandOutputHandler); - } + Log.WriteLine($"》{line}"); + CommandOutputHandler?.Invoke(line); + }); - var result = ((Command)command).Execute(ProcessStartedHandler); + command.OnErrorLine(line => + { + Log.WriteLine($"❌{line}"); + CommandOutputHandler?.Invoke(line); + }); + + var display = $"dotnet {string.Join(" ", spec.Arguments)}"; - LogCommandResult(Log, result); + Log.WriteLine($"Executing '{display}':"); + var result = ((Command)command).Execute(ProcessStartedHandler); + Log.WriteLine($"Command '{display}' exited with exit code {result.ExitCode}."); return result; } From 7c360403ba591e539ba81fd0fd93fd94ed434354 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Sat, 23 Nov 2024 17:51:40 -0800 Subject: [PATCH 513/702] Fix --- test/Microsoft.NET.TestFramework/Commands/TestCommand.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs b/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs index 91d10b15d4c4..ebbdcadba8e2 100644 --- a/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs +++ b/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs @@ -136,7 +136,6 @@ public virtual CommandResult Execute(IEnumerable args) command.OnErrorLine(line => { Log.WriteLine($"❌{line}"); - CommandOutputHandler?.Invoke(line); }); var display = $"dotnet {string.Join(" ", spec.Arguments)}"; From ed355b0eb1b6ea5fa7cb4195a214a9784a7c93d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 02:57:24 +0000 Subject: [PATCH 514/702] Update dependencies from https://github.com/dotnet/roslyn build 20241123.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24558.12 -> To Version 4.13.0-2.24573.1 --- 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 e969c8ab4f43..c6fd30ac8153 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn - 324fd25331c969cd742ba68eee09ffd4b6fd29e3 + 235c3b8625197dfdcc0c3b13186d104f362df2e8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5bbd294825c8..5e9b7162a7a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 - 4.13.0-2.24568.2 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 + 4.13.0-2.24573.1 From d1e80194b8d9ba8c168cb95a81da9e62cb896bfe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 09:19:08 +0000 Subject: [PATCH 515/702] 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.24569.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 9b35587beb6c..20c6b3101a99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,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 e9667c39fb59..2edb6405f3a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,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 242172b5e29bbe0404f11bd6299487792bb609aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 09:19:32 +0000 Subject: [PATCH 516/702] 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 517/702] 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 e9797ad9b826f79c31ee49936b4edbf3997ebf6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 09:58:29 +0000 Subject: [PATCH 518/702] Update dependencies from https://github.com/dotnet/razor build 20241124.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24574.3 --- 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 10af6048af6a..62c172ce2d40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor eef0189b5fbef8ad4446dc0e409163448dff81e9 - + https://github.com/dotnet/razor eef0189b5fbef8ad4446dc0e409163448dff81e9 diff --git a/eng/Versions.props b/eng/Versions.props index 9d046c1c0007..08cc2725d5e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24571.2 - 9.0.0-preview.24571.2 - 9.0.0-preview.24571.2 + 9.0.0-preview.24574.3 + 9.0.0-preview.24574.3 + 9.0.0-preview.24574.3 From 40327f0bd94e42ebb20db122d9d66c901e218718 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 10:58:08 +0000 Subject: [PATCH 519/702] Update dependencies from https://github.com/dotnet/roslyn build 20241124.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24573.1 -> To Version 4.13.0-2.24574.5 --- 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 c6fd30ac8153..7ef929dc6074 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,41 +93,41 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 - + https://github.com/dotnet/roslyn 235c3b8625197dfdcc0c3b13186d104f362df2e8 diff --git a/eng/Versions.props b/eng/Versions.props index 5e9b7162a7a7..abf2f8459f26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 - 4.13.0-2.24573.1 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 + 4.13.0-2.24574.5 From 8e386bb55016ea0366a9645f51264e6dc5d6bc80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:38:16 +0000 Subject: [PATCH 520/702] Update dependencies from https://github.com/dotnet/razor build 20241124.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24565.5 -> To Version 7.0.0-preview.24574.6 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdc605415b62..d09abef5820a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://github.com/dotnet/razor aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f - + https://github.com/dotnet/razor aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f - + https://github.com/dotnet/razor aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f diff --git a/eng/Versions.props b/eng/Versions.props index af8c285303a8..f2b326cff17d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.24565.5 - 7.0.0-preview.24565.5 - 7.0.0-preview.24565.5 + 7.0.0-preview.24574.6 + 7.0.0-preview.24574.6 + 7.0.0-preview.24574.6 From 330cb862000e46438ab53439fe1045ccc7514b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:38:41 +0000 Subject: [PATCH 521/702] Update dependencies from https://github.com/dotnet/roslyn build 20241124.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.10.0-3.24531.5 -> To Version 4.10.0-3.24574.6 --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdc605415b62..bcd23b99d5bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,32 +82,32 @@ 86f5186deeea364bd8541d51657e52a54b2a96b2 - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa - + https://github.com/dotnet/roslyn 64e323ff5a3f88b1eae1c6d728441e73a38a9daa diff --git a/eng/Versions.props b/eng/Versions.props index af8c285303a8..1ce45d239f55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,13 +158,13 @@ - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 - 4.10.0-3.24531.5 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 + 4.10.0-3.24574.6 $(MicrosoftNetCompilersToolsetPackageVersion) From 2c2ba2626641408e3b2d12fc1b1c0fbbeb62c132 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:39:03 +0000 Subject: [PATCH 522/702] Update dependencies from https://github.com/dotnet/templating build 20241123.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.308-servicing.24565.3 -> To Version 8.0.308-servicing.24573.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 6a911019bf6f..0c37cedfa2ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdc605415b62..8ede5923e2b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - dfb7edc7ef4de70574d68009fa9005303f4afa48 + b9e9dd0bebf592758ca5aec85ddff3aff049eb4e - + https://github.com/dotnet/templating - dfb7edc7ef4de70574d68009fa9005303f4afa48 + b9e9dd0bebf592758ca5aec85ddff3aff049eb4e - + https://github.com/dotnet/templating - dfb7edc7ef4de70574d68009fa9005303f4afa48 + b9e9dd0bebf592758ca5aec85ddff3aff049eb4e diff --git a/eng/Versions.props b/eng/Versions.props index af8c285303a8..60882d1ff865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.308-servicing.24565.3 + 8.0.308-servicing.24573.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 6cd589d98d5890436ec34826cac825c6b5155367 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:45:34 +0000 Subject: [PATCH 523/702] Update dependencies from https://github.com/dotnet/templating build 20241123.7 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.405-servicing.24565.4 -> To Version 8.0.405-servicing.24573.7 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 78925e61aa05..4b0af54df1fe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b0f7c44be3a..1e4cd4c29808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 269d0dd65ab3129df509709a807b9f1821996bef + 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 - + https://github.com/dotnet/templating - 269d0dd65ab3129df509709a807b9f1821996bef + 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 - + https://github.com/dotnet/templating - 269d0dd65ab3129df509709a807b9f1821996bef + 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 diff --git a/eng/Versions.props b/eng/Versions.props index 4bd7dff45265..2eefe6d5a6db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.405-servicing.24565.4 + 8.0.405-servicing.24573.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From b82cb303893049fc5ade7c0b224102adc1dcfbae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:45:57 +0000 Subject: [PATCH 524/702] Update dependencies from https://github.com/dotnet/razor build 20241124.4 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.7 -> To Version 9.0.0-preview.24574.4 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b0f7c44be3a..baf6a781c065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://github.com/dotnet/razor b4ba32397a657a228890b10fd6cd84c9fa7035a8 - + https://github.com/dotnet/razor b4ba32397a657a228890b10fd6cd84c9fa7035a8 - + https://github.com/dotnet/razor b4ba32397a657a228890b10fd6cd84c9fa7035a8 diff --git a/eng/Versions.props b/eng/Versions.props index 4bd7dff45265..1ccdd4b38236 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 9.0.0-preview.24565.7 - 9.0.0-preview.24565.7 - 9.0.0-preview.24565.7 + 9.0.0-preview.24574.4 + 9.0.0-preview.24574.4 + 9.0.0-preview.24574.4 From 8f0fe517f1ffebb0c21a437001c95a22fa0aba71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 13:47:38 +0000 Subject: [PATCH 525/702] 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 526/702] 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 e9da11e4f511f22c9c17f4a2cf65e2e229378de7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 18:06:17 +0000 Subject: [PATCH 527/702] Update dependencies from https://github.com/dotnet/razor build 20241124.8 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.24570.2 -> To Version 9.0.0-preview.24574.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62c172ce2d40..adbefb21ed63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - eef0189b5fbef8ad4446dc0e409163448dff81e9 + 9a20f419997f0f9aae4a66e6336da9ad433607fb - + https://github.com/dotnet/razor - eef0189b5fbef8ad4446dc0e409163448dff81e9 + 9a20f419997f0f9aae4a66e6336da9ad433607fb - + https://github.com/dotnet/razor - eef0189b5fbef8ad4446dc0e409163448dff81e9 + 9a20f419997f0f9aae4a66e6336da9ad433607fb - + https://github.com/dotnet/razor - eef0189b5fbef8ad4446dc0e409163448dff81e9 + 9a20f419997f0f9aae4a66e6336da9ad433607fb diff --git a/eng/Versions.props b/eng/Versions.props index 08cc2725d5e1..a6f5c3461b84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24574.3 - 9.0.0-preview.24574.3 - 9.0.0-preview.24574.3 + 9.0.0-preview.24574.8 + 9.0.0-preview.24574.8 + 9.0.0-preview.24574.8 From b1802910f502c226077b6a3dc97cc55de53dee2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Sun, 24 Nov 2024 20:55:40 +0100 Subject: [PATCH 528/702] More verified template updates --- ...acyCommandIsUsed_common.Linux.verified.txt | 80 ++++++++-------- ...egacyCommandIsUsed_common.OSX.verified.txt | 80 ++++++++-------- ...t_WhenListCommandIsUsed.Linux.verified.txt | 78 ++++++++-------- ...est_WhenListCommandIsUsed.OSX.verified.txt | 78 ++++++++-------- ...WhenListCommandIsUsed.Windows.verified.txt | 92 +++++++++---------- 5 files changed, 204 insertions(+), 204 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index d591abac471b..1b8aada399de 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -4,43 +4,43 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ---------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index d591abac471b..1b8aada399de 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -4,43 +4,43 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ---------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index 8785836d6ba0..1baab0938bb3 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -1,42 +1,42 @@ These templates matched your input: Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +-------------------------------------------- -------------------------- ---------- ---------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 8785836d6ba0..1baab0938bb3 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -1,42 +1,42 @@ These templates matched your input: Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +-------------------------------------------- -------------------------- ---------- ---------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index bc91a771e91e..4afaabb3987f 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -1,49 +1,49 @@ These templates matched your input: Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ------------------------------ -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Windows Forms App winforms [C#],VB Common/WinForms -Windows Forms Class Library winformslib [C#],VB Common/WinForms -Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms -Worker Service worker [C#],F# Common/Worker/Web -WPF Application wpf [C#],VB Common/WPF -WPF Class Library wpflib [C#],VB Common/WPF -WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF -WPF User Control Library wpfusercontrollib [C#],VB Common/WPF -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +-------------------------------------------- -------------------------- ---------- ---------------------------------- +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Windows Forms App winforms [C#],VB Common/WinForms +Windows Forms Class Library winformslib [C#],VB Common/WinForms +Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms +Worker Service worker [C#],F# Common/Worker/Web +WPF Application wpf [C#],VB Common/WPF +WPF Class Library wpflib [C#],VB Common/WPF +WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF +WPF User Control Library wpfusercontrollib [C#],VB Common/WPF +xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file From 91d8590044751f78fd729467aa80832a61220ce3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Nov 2024 20:16:34 +0000 Subject: [PATCH 529/702] Update dependencies from https://github.com/dotnet/roslyn build 20241124.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-2.24574.5 -> To Version 4.13.0-3.24574.9 --- 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 7ef929dc6074..81589d1e2fcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 - + https://github.com/dotnet/roslyn - 235c3b8625197dfdcc0c3b13186d104f362df2e8 + 571017b1773149cd5b01bbc46bece8f789f30744 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index abf2f8459f26..67b073fbb02b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 - 4.13.0-2.24574.5 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 + 4.13.0-3.24574.9 From 0394c68bce6a5b61d41887b1be8d051c65313b48 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Sun, 24 Nov 2024 16:54:22 -0800 Subject: [PATCH 530/702] Work around COM concurrency issue when accessing VS instances --- .../list/VisualStudioWorkloads.cs | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs index 2c3bc306405a..59686295f2ab 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/VisualStudioWorkloads.cs @@ -20,6 +20,8 @@ namespace Microsoft.DotNet.Workloads.Workload #endif internal static class VisualStudioWorkloads { + private static readonly object s_guard = new(); + private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154); /// @@ -164,44 +166,50 @@ internal static IEnumerable WriteSDKInstallRecordsForVSWorkloads(IIn /// A list of Visual Studio instances. private static List GetVisualStudioInstances() { - List vsInstances = new(); - - try + // The underlying COM API has a bug where-by it's not safe for concurrent calls. Until their + // bug fix is rolled out use a lock to ensure we don't concurrently access this API. + // https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2241752/ + lock (s_guard) { - SetupConfiguration setupConfiguration = new(); - ISetupConfiguration2 setupConfiguration2 = setupConfiguration; - IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); - ISetupInstance[] instances = new ISetupInstance[1]; - int fetched = 0; + List vsInstances = new(); - do + try { - setupInstances.Next(1, instances, out fetched); + SetupConfiguration setupConfiguration = new(); + ISetupConfiguration2 setupConfiguration2 = setupConfiguration; + IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances(); + ISetupInstance[] instances = new ISetupInstance[1]; + int fetched = 0; - if (fetched > 0) + do { - ISetupInstance2 instance = (ISetupInstance2)instances[0]; + setupInstances.Next(1, instances, out fetched); - // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs - // such as community, professional, and enterprise. - if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && - version.Major >= 17 && - s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + if (fetched > 0) { - vsInstances.Add(instances[0]); + ISetupInstance2 instance = (ISetupInstance2)instances[0]; + + // .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs + // such as community, professional, and enterprise. + if (Version.TryParse(instance.GetInstallationVersion(), out Version version) && + version.Major >= 17 && + s_visualStudioProducts.Contains(instance.GetProduct().GetId())) + { + vsInstances.Add(instances[0]); + } } } + while (fetched > 0); + + } + catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) + { + // Query API not registered, good indication there are no VS installations of 15.0 or later. + // Other exceptions are passed through since that likely points to a real error. } - while (fetched > 0); + return vsInstances; } - catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG) - { - // Query API not registered, good indication there are no VS installations of 15.0 or later. - // Other exceptions are passed through since that likely points to a real error. - } - - return vsInstances; } } } From cd7fd2028be860dffbd3530c488605a15e97b7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Mon, 25 Nov 2024 09:05:26 +0100 Subject: [PATCH 531/702] Now it should be green --- ...Tests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 6 +++--- ...stTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 6 +++--- ...sts.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index 1baab0938bb3..6e33f11f5e09 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -1,6 +1,6 @@ These templates matched your input: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- ---------------------------------- API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core Empty web [C#],F# Web/Empty @@ -22,13 +22,13 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web Protocol Buffer File proto Web/gRPC diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 1baab0938bb3..6e33f11f5e09 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -1,6 +1,6 @@ These templates matched your input: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- ---------------------------------- API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core Empty web [C#],F# Web/Empty @@ -22,13 +22,13 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web Protocol Buffer File proto Web/gRPC diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 4afaabb3987f..08816255fbd0 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -1,6 +1,6 @@ These templates matched your input: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- ---------------------------------- API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core Empty web [C#],F# Web/Empty @@ -22,13 +22,13 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest/Desktop/Web +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit/Desktop/Web +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web Protocol Buffer File proto Web/gRPC From e1fdfc722f28be5a6ec15c498101b94653f94893 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 09:25:05 +0000 Subject: [PATCH 532/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.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 61a2066078ad..db41f8341fbb 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 - 2adf5822dc94d97d0f6e1584129fcf65ba837097 + af350c6868a8f858e82235d27d1c0a582d3c6a37 - + https://github.com/dotnet/test-templates - 2adf5822dc94d97d0f6e1584129fcf65ba837097 + af350c6868a8f858e82235d27d1c0a582d3c6a37 diff --git a/eng/Versions.props b/eng/Versions.props index 31f54e24d8ca..b9cf7343187a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24570.2 + 1.1.0-rtm.24575.1 From 5149c0fa2f476b28ace999a5452a5b5c9628b96d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 09:25:06 +0000 Subject: [PATCH 533/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.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 40da85db54a8..8b8f356c37a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 2adf5822dc94d97d0f6e1584129fcf65ba837097 + af350c6868a8f858e82235d27d1c0a582d3c6a37 - + https://github.com/dotnet/test-templates - 2adf5822dc94d97d0f6e1584129fcf65ba837097 + af350c6868a8f858e82235d27d1c0a582d3c6a37 diff --git a/eng/Versions.props b/eng/Versions.props index 6217900d1bf3..d1d4eb13d539 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24570.2 + 1.1.0-rtm.24575.1 From e0b9b70cf0df2cc7f2e2d826bd65cef1136ab0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Mon, 25 Nov 2024 11:23:39 +0100 Subject: [PATCH 534/702] Not sure why mac are not showing the expected tags --- ...egacyCommandIsUsed_common.OSX.verified.txt | 80 +++++++++---------- ...est_WhenListCommandIsUsed.OSX.verified.txt | 80 +++++++++---------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index 1b8aada399de..d591abac471b 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -4,43 +4,43 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ---------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 6e33f11f5e09..8785836d6ba0 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -1,42 +1,42 @@ These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- ---------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright/Desktop/Web -MSTest Test Class mstest-class [C#],F#,VB Test/MSTest -MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit/Desktop/Web -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright/Desktop/Web -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit/Desktop/Web \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +ASP.NET Core Web App (Razor Pages) webapp,razor [C#] Web/MVC/Razor Pages +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSBuild Directory.Packages.props file packagesprops MSBuild/packages/props/CPM +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Class mstest-class [C#],F#,VB Test/MSTest +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file From e5153707afd35aded83b7f1cef5248f4ce2beea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Mon, 25 Nov 2024 11:26:38 +0100 Subject: [PATCH 535/702] Bump test dependencies versions --- .../content/MSTest-CSharp/Company.TestProject1.csproj | 8 ++++---- .../content/MSTest-FSharp/Company.TestProject1.fsproj | 8 ++++---- .../MSTest-VisualBasic/Company.TestProject1.vbproj | 8 ++++---- .../content/NUnit-CSharp/Company.TestProject1.csproj | 2 +- .../content/NUnit-FSharp/Company.TestProject1.fsproj | 2 +- .../NUnit-VisualBasic/Company.TestProject1.vbproj | 2 +- .../Company.TestProject1.csproj | 10 +++++----- .../Company.TestProject1.csproj | 2 +- .../content/XUnit-CSharp/Company.TestProject1.csproj | 2 +- .../content/XUnit-FSharp/Company.TestProject1.fsproj | 2 +- .../XUnit-VisualBasic/Company.TestProject1.vbproj | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj index 59a43fb59608..caa5b15e2d06 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj @@ -1,5 +1,5 @@ - + net9.0 @@ -54,14 +54,14 @@ - + - + - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj index 32f1d7f35847..27f64ac9f1b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj @@ -1,5 +1,5 @@ - + net9.0 @@ -59,14 +59,14 @@ - + - + - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj index 59a43fb59608..caa5b15e2d06 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj @@ -1,5 +1,5 @@ - + net9.0 @@ -54,14 +54,14 @@ - + - + - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj index 55ae75cf2311..54f2e899613a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj @@ -13,7 +13,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj index 78c1bf1e8ac4..a92fbf4f17bd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj @@ -17,7 +17,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj index 025be6c7efb8..06a8cce31deb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj @@ -11,7 +11,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj index 3200841aa38d..4ff20f517af8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj @@ -1,5 +1,5 @@ - + net9.0 @@ -55,15 +55,15 @@ - - + + - + - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj index 5c8d18f679f4..73ad86c6315f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj @@ -13,7 +13,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj index ef421fbd17d4..f8dfe44840f8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj @@ -12,7 +12,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj index e79a1fa36206..c48820765553 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj @@ -16,7 +16,7 @@ - + diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj index bf0268128c62..666df509d85e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj @@ -10,7 +10,7 @@ - + From ef24df7407d2cd03bd4233471a24e6e566545363 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 10:32:26 +0000 Subject: [PATCH 536/702] Update dependencies from https://github.com/dotnet/templating build 20241125.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.101-servicing.24565.5 -> To Version 9.0.102-servicing.24575.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 9e7c6f414207..498fba71527c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8aec1f818d0c..bdbafaff2e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 46906601959159886b83bd125a9b253f38ac2d0d + 3b27191a9169f1c5cd881850754d526e394d504e - + https://github.com/dotnet/templating - 46906601959159886b83bd125a9b253f38ac2d0d + 3b27191a9169f1c5cd881850754d526e394d504e - + https://github.com/dotnet/templating - 46906601959159886b83bd125a9b253f38ac2d0d + 3b27191a9169f1c5cd881850754d526e394d504e diff --git a/eng/Versions.props b/eng/Versions.props index ce8fe505d97c..101941eeee88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -209,7 +209,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.102-servicing.24573.4 + 9.0.102-servicing.24575.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2f86240d3005d012c7b78125303a789b549dccca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 11:42:34 +0000 Subject: [PATCH 537/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.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 db41f8341fbb..362aed542198 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 - af350c6868a8f858e82235d27d1c0a582d3c6a37 + 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 - + https://github.com/dotnet/test-templates - af350c6868a8f858e82235d27d1c0a582d3c6a37 + 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 diff --git a/eng/Versions.props b/eng/Versions.props index b9cf7343187a..79f4f36e494c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24575.1 + 1.1.0-rtm.24575.2 From 4c16a4a0785bc322dc311d404d15af423f8051cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 11:42:35 +0000 Subject: [PATCH 538/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.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 8b8f356c37a0..d8fc01857b36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - af350c6868a8f858e82235d27d1c0a582d3c6a37 + 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 - + https://github.com/dotnet/test-templates - af350c6868a8f858e82235d27d1c0a582d3c6a37 + 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 diff --git a/eng/Versions.props b/eng/Versions.props index d1d4eb13d539..3b777ae1738a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24575.1 + 1.1.0-rtm.24575.2 From 181047a24413f2a3524b51e0e6fa7144ed9eb3d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 13:06:07 +0000 Subject: [PATCH 539/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.3 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.3 --- 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 362aed542198..a69f41802e3b 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 - 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 + f0304c844992d470ca7379b7d36e4c1274482d5e - + https://github.com/dotnet/test-templates - 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 + f0304c844992d470ca7379b7d36e4c1274482d5e diff --git a/eng/Versions.props b/eng/Versions.props index 79f4f36e494c..c9ad80806236 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 1.1.0-rtm.24575.2 + 1.1.0-rtm.24575.3 From feb4dba91c8a8ec3e4f674b544862e8102d88d7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 13:06:10 +0000 Subject: [PATCH 540/702] Update dependencies from https://github.com/dotnet/test-templates build 20241125.3 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.3 --- 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 d8fc01857b36..e9849b28d5ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 + f0304c844992d470ca7379b7d36e4c1274482d5e - + https://github.com/dotnet/test-templates - 65fe2e74116d3ceef968bd8bc811c3d9b5204aa1 + f0304c844992d470ca7379b7d36e4c1274482d5e diff --git a/eng/Versions.props b/eng/Versions.props index 3b777ae1738a..ebe2c5dfe228 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24575.2 + 1.1.0-rtm.24575.3 From f9471f345c8382291c2895c9c966d7bc95f352f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 13:07:42 +0000 Subject: [PATCH 541/702] Update dependencies from https://github.com/dotnet/templating build 20241125.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.405-servicing.24573.7 -> To Version 8.0.405-servicing.24575.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b0af54df1fe..b3afc8a524a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b280ba922f2a..e75e3ee4fe45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 + b8edc79137b4beddbee6c98794638fa0110b40df - + https://github.com/dotnet/templating - 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 + b8edc79137b4beddbee6c98794638fa0110b40df - + https://github.com/dotnet/templating - 7c8e39ec70e3d0d3ed81d070113758d429dd7b45 + b8edc79137b4beddbee6c98794638fa0110b40df diff --git a/eng/Versions.props b/eng/Versions.props index f7ccc05cebef..bf16cd9ffe8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.405-servicing.24573.7 + 8.0.405-servicing.24575.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 993e0790399ab86709e8ddc9d651f91e802d5e3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 13:15:36 +0000 Subject: [PATCH 542/702] Update dependencies from https://github.com/dotnet/razor build 20241125.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24574.8 -> To Version 9.0.0-preview.24575.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59cf3005bda5..a9e0f4c6deb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 9a20f419997f0f9aae4a66e6336da9ad433607fb + 8b4123ff1187959a2c6d70faed5c0e93df72dc61 - + https://github.com/dotnet/razor - 9a20f419997f0f9aae4a66e6336da9ad433607fb + 8b4123ff1187959a2c6d70faed5c0e93df72dc61 - + https://github.com/dotnet/razor - 9a20f419997f0f9aae4a66e6336da9ad433607fb + 8b4123ff1187959a2c6d70faed5c0e93df72dc61 - + https://github.com/dotnet/razor - 9a20f419997f0f9aae4a66e6336da9ad433607fb + 8b4123ff1187959a2c6d70faed5c0e93df72dc61 diff --git a/eng/Versions.props b/eng/Versions.props index 1b20a73ed480..ce54c295fbcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24574.8 - 9.0.0-preview.24574.8 - 9.0.0-preview.24574.8 + 9.0.0-preview.24575.2 + 9.0.0-preview.24575.2 + 9.0.0-preview.24575.2 From f061e3db5f22b5c561a499ac6bda0f379401edce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 14:27:05 +0000 Subject: [PATCH 543/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24574.9 -> To Version 4.13.0-3.24575.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59cf3005bda5..0c3adb101d2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 - + https://github.com/dotnet/roslyn - 571017b1773149cd5b01bbc46bece8f789f30744 + f86856dda7a9acbe86f2bbf356420596d9d72c23 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1b20a73ed480..8a5c1e8ac6be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 - 4.13.0-3.24574.9 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 + 4.13.0-3.24575.2 From 912e7c7c10e9f47daa52910e4ca6864f0fb2f13b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 14:48:01 +0000 Subject: [PATCH 544/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241125.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.24574.1 -> To Version 9.0.0-beta.24575.1 --- 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 59cf3005bda5..01538a4503f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb diff --git a/eng/Versions.props b/eng/Versions.props index 1b20a73ed480..f6a094a1e338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 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 + 9.0.0-beta.24575.1 + 9.0.0-beta.24575.1 + 9.0.0-beta.24575.1 + 9.0.0-beta.24575.1 + 9.0.0-beta.24575.1 + 9.0.0-beta.24575.1 From 10e3426c596c82bfb8d4718989bc04d99df6c6a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 19:00:05 +0000 Subject: [PATCH 545/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24574.9 -> To Version 4.13.0-3.24575.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c3adb101d2a..5ac6844c339a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 - + https://github.com/dotnet/roslyn - f86856dda7a9acbe86f2bbf356420596d9d72c23 + 7e34ee58e06532bbf9cd60a234206c0bc289bd00 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8a5c1e8ac6be..6df925b40de2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 - 4.13.0-3.24575.2 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 + 4.13.0-3.24575.5 From 338a8ee5426ee49ba2d42466224d67304df48808 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 19:15:26 +0000 Subject: [PATCH 546/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.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.13.0-3.24574.9 -> To Version 4.13.0-3.24575.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 5ac6844c339a..55c6609ef64c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 - + https://github.com/dotnet/roslyn - 7e34ee58e06532bbf9cd60a234206c0bc289bd00 + 079c50772a8c09ad82075790b8d6a38073224854 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6df925b40de2..1d339ed0b3b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 - 4.13.0-3.24575.5 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 + 4.13.0-3.24575.6 From 482109b753b384d1f925c2d62869b1e023f815bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 21:12:53 +0000 Subject: [PATCH 547/702] Update dependencies from https://github.com/dotnet/razor build 20241125.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24574.8 -> To Version 9.0.0-preview.24575.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9e0f4c6deb7..291f92355007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 8b4123ff1187959a2c6d70faed5c0e93df72dc61 + 37874809ac59eae0b942f23fbb636bd8dff023a5 - + https://github.com/dotnet/razor - 8b4123ff1187959a2c6d70faed5c0e93df72dc61 + 37874809ac59eae0b942f23fbb636bd8dff023a5 - + https://github.com/dotnet/razor - 8b4123ff1187959a2c6d70faed5c0e93df72dc61 + 37874809ac59eae0b942f23fbb636bd8dff023a5 - + https://github.com/dotnet/razor - 8b4123ff1187959a2c6d70faed5c0e93df72dc61 + 37874809ac59eae0b942f23fbb636bd8dff023a5 diff --git a/eng/Versions.props b/eng/Versions.props index ce54c295fbcf..d6813090a9e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24575.2 - 9.0.0-preview.24575.2 - 9.0.0-preview.24575.2 + 9.0.0-preview.24575.4 + 9.0.0-preview.24575.4 + 9.0.0-preview.24575.4 From 6c228aed5a0307bc7ff76e0ceed73c2dfb9c0f70 Mon Sep 17 00:00:00 2001 From: tmat Date: Mon, 25 Nov 2024 13:14:36 -0800 Subject: [PATCH 548/702] Add accidentally removed JS functions back --- .../BrowserRefresh/WebSocketScriptInjection.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js index e90cd86c7017..befd2f818976 100644 --- a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js +++ b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js @@ -174,6 +174,19 @@ setTimeout(async function () { } } + function sendDeltaApplied() { + connection.send(new Uint8Array([1]).buffer); + } + + function sendDeltaNotApplied(error) { + if (error) { + let encoder = new TextEncoder() + connection.send(encoder.encode("\0" + error.message + "\0" + error.stack)); + } else { + connection.send(new Uint8Array([0]).buffer); + } + } + async function applyBlazorDeltas(serverSecret, updateId, deltas, responseLoggingLevel) { if (sharedSecret && (serverSecret != sharedSecret.encodedSharedSecret)) { // Validate the shared secret if it was specified. It might be unspecified in older versions of VS From 0055cfe725a196117d93bd0cb9a442c3663bb07b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 21:17:04 +0000 Subject: [PATCH 549/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.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.13.0-3.24575.6 -> To Version 4.13.0-3.24575.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 dd9c45d142a9..ff2f53dd0b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b - + https://github.com/dotnet/roslyn - 079c50772a8c09ad82075790b8d6a38073224854 + 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 05e33134bd6b..3cfaed70404f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 - 4.13.0-3.24575.6 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 + 4.13.0-3.24575.7 From 9fe53f8c6d137e668551aef7bc52eae1f1e6ba83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 22:07:26 +0000 Subject: [PATCH 550/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.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.13.0-3.24575.6 -> To Version 4.13.0-3.24575.8 --- 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 ff2f53dd0b86..4251c10919cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba - + https://github.com/dotnet/roslyn - 30411a25036f2ecd6dbc6c85b2f5d5f3385c706b + 6a5a8d92b53f9b65fa281b9411af84076637beba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3cfaed70404f..0c5eb4b7e5d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 - 4.13.0-3.24575.7 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 + 4.13.0-3.24575.8 From 8d7ae924444ba21d46df7396ba4312ca3a355da4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 00:44:50 +0000 Subject: [PATCH 551/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.9 --- 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 4251c10919cb..5ab6ff8373e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 - + https://github.com/dotnet/roslyn - 6a5a8d92b53f9b65fa281b9411af84076637beba + 0752c16c18346d67a43fe95ad37042e0da560537 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0c5eb4b7e5d4..e93674fb5d0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 - 4.13.0-3.24575.8 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 + 4.13.0-3.24575.9 From 128d6287bb48e1dcda30bf272124b7acf5402c04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 01:04:54 +0000 Subject: [PATCH 552/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.10 --- 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 5ab6ff8373e3..35c4a44d9dc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 - + https://github.com/dotnet/roslyn - 0752c16c18346d67a43fe95ad37042e0da560537 + 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e93674fb5d0e..0f5f0abe490a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 - 4.13.0-3.24575.9 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 + 4.13.0-3.24575.10 From 00f3370d2bf15e212bdf5e1efa0d69255e87416f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 01:07:10 +0000 Subject: [PATCH 553/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241125.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.24575.1 -> To Version 9.0.0-beta.24575.2 --- 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 dd9c45d142a9..16aadb349bd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink cb197e7177e288db2eba6357982f9e7c397951bb diff --git a/eng/Versions.props b/eng/Versions.props index 05e33134bd6b..f5af78f8b95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24575.1 - 9.0.0-beta.24575.1 - 9.0.0-beta.24575.1 - 9.0.0-beta.24575.1 - 9.0.0-beta.24575.1 - 9.0.0-beta.24575.1 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 From 8d75bfe3e7480088771a192c91379ec3932c6a4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 01:18:56 +0000 Subject: [PATCH 554/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.11 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35c4a44d9dc4..8b117a840a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 - + https://github.com/dotnet/roslyn - 1ab631d881cdf4e2b69fbd82d6a199cfa8a071f6 + fec0a944536320fb691939862f94835194ebfcb6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0f5f0abe490a..ebed116ab26e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 - 4.13.0-3.24575.10 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 + 4.13.0-3.24575.11 From 5cee35e54845f024c45db5f1c9308397972544e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 01:24:53 +0000 Subject: [PATCH 555/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.12 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.12 --- 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 8b117a840a76..48c7e4a650a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd - + https://github.com/dotnet/roslyn - fec0a944536320fb691939862f94835194ebfcb6 + 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ebed116ab26e..abcc7c0bde99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 - 4.13.0-3.24575.11 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 + 4.13.0-3.24575.12 From 12a8505c1aeb926521d5d9d76ea43cf1cd1ce6a1 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:40:46 -0800 Subject: [PATCH 556/702] Swap lines --- .../dotnet-workload/restore/WorkloadRestoreCommand.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs index 94c40d95dc4c..41fa1049bf3b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs @@ -50,10 +50,12 @@ public override int Execute() recorder.Run(() => { - // First update manifests and install a workload set as necessary + // First discover projects. This may return an error if no projects are found, and we shouldn't delay until after Update if that's the case. + var allProjects = DiscoverAllProjects(Directory.GetCurrentDirectory(), _slnOrProjectArgument).Distinct(); + + // Then update manifests and install a workload set as necessary new WorkloadUpdateCommand(_result, recorder: recorder, isRestoring: true).Execute(); - var allProjects = DiscoverAllProjects(Directory.GetCurrentDirectory(), _slnOrProjectArgument).Distinct(); List allWorkloadId = RunTargetToGetWorkloadIds(allProjects); Reporter.WriteLine(string.Format(LocalizableStrings.InstallingWorkloads, string.Join(" ", allWorkloadId))); From 551dda180b5917ae4f854da50e15258575373549 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 02:13:15 +0000 Subject: [PATCH 557/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.14 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.14 --- 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 48c7e4a650a2..098a927d5d97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a - + https://github.com/dotnet/roslyn - 2f5093c458d19b3a562b32a9e9a7dbad799ec3fd + 151e2d7e229ee421834f22b28ee8abb10161ed2a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index abcc7c0bde99..33249ad11d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 - 4.13.0-3.24575.12 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 + 4.13.0-3.24575.14 From f9d000201774cfeb6319cdd676e61176fc4fffc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 02:21:58 +0000 Subject: [PATCH 558/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.13 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.13 --- 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 098a927d5d97..339c1f9b47a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 - + https://github.com/dotnet/roslyn - 151e2d7e229ee421834f22b28ee8abb10161ed2a + 40881effa56ce091f87ac3abbef3b44a15da50f3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 33249ad11d87..64fb8d09563c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 - 4.13.0-3.24575.14 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 + 4.13.0-3.24575.13 From f422ba04d0606fc72518c85d675253dfbfdb29a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 03:44:36 +0000 Subject: [PATCH 559/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.15 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.15 --- 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 339c1f9b47a1..7ba768d30781 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee - + https://github.com/dotnet/roslyn - 40881effa56ce091f87ac3abbef3b44a15da50f3 + 6a5f9d76235e678e07cc3884a3e2920b4fd275ee https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 64fb8d09563c..e558b5f797b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 - 4.13.0-3.24575.13 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 + 4.13.0-3.24575.15 From fafacb92dc774330bb134f998d1a438703c8babb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 04:49:02 +0000 Subject: [PATCH 560/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.16 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.16 --- 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 7ba768d30781..235571dea3bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 - + https://github.com/dotnet/roslyn - 6a5f9d76235e678e07cc3884a3e2920b4fd275ee + 9d83aafaf852a86ea4b49545d12e8bff713a6349 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e558b5f797b2..eb76d3877afb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 - 4.13.0-3.24575.15 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 + 4.13.0-3.24575.16 From b895fc4eb752b78020653f1334de5d5b7b05c058 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 06:01:00 +0000 Subject: [PATCH 561/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.17 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.17 --- 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 235571dea3bf..db1511d9947a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf - + https://github.com/dotnet/roslyn - 9d83aafaf852a86ea4b49545d12e8bff713a6349 + 6fa1a3b309b676ed6ec28b024f0898aaa98919cf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index eb76d3877afb..f94c7257be55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 - 4.13.0-3.24575.16 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 + 4.13.0-3.24575.17 From 526c49011e74a0d3e58665b3c0d6141419b1bbf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 06:37:09 +0000 Subject: [PATCH 562/702] Update dependencies from https://github.com/dotnet/roslyn build 20241125.18 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.18 --- 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 db1511d9947a..b13ccc54c830 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 - + https://github.com/dotnet/roslyn - 6fa1a3b309b676ed6ec28b024f0898aaa98919cf + f20e4d3e49b4e2d0b615e57c64fac5c356b25079 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f94c7257be55..adf2ba433cfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 - 4.13.0-3.24575.17 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 + 4.13.0-3.24575.18 From da77a154af3410f5829da0a52dfdcf561cdf80e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Tue, 26 Nov 2024 10:29:10 +0100 Subject: [PATCH 563/702] Update codeowners --- CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 4c48269fd3e0..9f5157802082 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -50,6 +50,10 @@ /src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin /test/dotnet-test.Tests @dotnet/dotnet-testing-admin /test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin +/test/dotnet-new.Tests @dotnet/dotnet-testing-admin +/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin +/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin +/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin # Area-Templates /src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers From b1a6b1da84d9ddadbeaabc164e032ebf36abb986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 13:56:10 +0000 Subject: [PATCH 564/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241125.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.24574.1 -> To Version 9.0.0-beta.24575.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 fe9374d1ba40..16c186366e5f 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 - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb - + https://github.com/dotnet/sourcelink - 084a76b3adf59dfbdc5c3f7614979e309910fa50 + cb197e7177e288db2eba6357982f9e7c397951bb diff --git a/eng/Versions.props b/eng/Versions.props index b2b2f3521d2b..6d35b8a8e31c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,12 +277,12 @@ - 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 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 + 9.0.0-beta.24575.2 From 6e303354d742e3051a30d6e3e4060edcd1a7ba3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 13:56:35 +0000 Subject: [PATCH 565/702] Update dependencies from https://github.com/dotnet/source-build-externals build 20241125.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24568.2 -> To Version 9.0.0-alpha.1.24575.1 --- 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 fe9374d1ba40..ef87461a95d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - c65b1c1affed1f4847f9c3f81623dfa929d21e1a + ab469606a3e6b026dcac301e2dab96117c94faeb From aeb82a56adb030c4f11e01963b8f2c9343c2eecb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 13:57:27 +0000 Subject: [PATCH 566/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.1 --- NuGet.config | 1 + eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 967259370182..da8ebc6e33c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b13ccc54c830..8a28e3443bb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 - + https://github.com/dotnet/roslyn - f20e4d3e49b4e2d0b615e57c64fac5c356b25079 + b23da0417d19a84b2032f886481ba0bb3c5def38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index adf2ba433cfb..683013b5a9ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 - 4.13.0-3.24575.18 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 + 4.13.0-3.24576.1 From 544778c501f4bd48109b621f867bf896d050bf88 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:57:30 -0500 Subject: [PATCH 567/702] Add command line validation For 'workloadVersionArgument's that aren't really workload version arguments --- .../search/WorkloadSearchVersionsCommandParser.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs index d40d53193457..f3dd59e64bd0 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs @@ -53,6 +53,19 @@ private static CliCommand ConstructCommand() } }); + command.Validators.Add(result => + { + var versionArgument = result.GetValue(WorkloadVersionArgument); + if (versionArgument is not null) + { + var coreComponents = versionArgument.Split(['-', '+'], 2)[0].Split('.'); + if (coreComponents.Length != 3 && coreComponents.Length != 4) + { + result.AddError(string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, versionArgument)); + } + } + }); + command.SetAction(parseResult => new WorkloadSearchVersionsCommand(parseResult).Execute()); return command; From 88e03eeb45f04679dae407cdb4f0bf7a0f9e143c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 14:29:10 +0000 Subject: [PATCH 568/702] Update dependencies from https://github.com/dotnet/test-templates build 20241126.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24575.3 -> To Version 1.1.0-rtm.24576.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 fe9374d1ba40..d70ade45dff9 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 - f0304c844992d470ca7379b7d36e4c1274482d5e + 01712257e7ac9363b002637d399206fd93fc724b - + https://github.com/dotnet/test-templates - f0304c844992d470ca7379b7d36e4c1274482d5e + 01712257e7ac9363b002637d399206fd93fc724b diff --git a/eng/Versions.props b/eng/Versions.props index b2b2f3521d2b..8e71ce36e0f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ - 1.1.0-rtm.24575.3 + 1.1.0-rtm.24576.1 From 78fe0f8ac33677b80d91b42ed96a50b7ec25d2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 14:29:13 +0000 Subject: [PATCH 569/702] Update dependencies from https://github.com/dotnet/test-templates build 20241126.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24575.3 -> To Version 1.1.0-rtm.24576.1 --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 967259370182..da8ebc6e33c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65d9462d6adf..865420f04631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - f0304c844992d470ca7379b7d36e4c1274482d5e + 01712257e7ac9363b002637d399206fd93fc724b - + https://github.com/dotnet/test-templates - f0304c844992d470ca7379b7d36e4c1274482d5e + 01712257e7ac9363b002637d399206fd93fc724b diff --git a/eng/Versions.props b/eng/Versions.props index c997c59d2777..d1c65b0eb2ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24575.3 + 1.1.0-rtm.24576.1 From 28983f4c499d8f98a7544ca96c9ce14004161ca5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 14:55:40 +0000 Subject: [PATCH 570/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241126.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.24575.1 -> To Version 9.0.0-beta.24576.1 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 967259370182..da8ebc6e33c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16aadb349bd8..b73c7deb787b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 diff --git a/eng/Versions.props b/eng/Versions.props index f5af78f8b95d..195061974b38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 + 9.0.0-beta.24576.1 + 9.0.0-beta.24576.1 + 9.0.0-beta.24576.1 + 9.0.0-beta.24576.1 + 9.0.0-beta.24576.1 + 9.0.0-beta.24576.1 From 8e95383cbbbf81a4856407fe22c78edade9f25f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Tue, 26 Nov 2024 16:31:56 +0100 Subject: [PATCH 571/702] Drop test-templates deps and versions --- eng/Version.Details.xml | 30 ------------------- eng/Versions.props | 11 ++----- .../targets/BundledTemplates.targets | 1 - 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65d9462d6adf..2d8662cfc31e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -355,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - f0304c844992d470ca7379b7d36e4c1274482d5e - - - - https://github.com/dotnet/test-templates - f0304c844992d470ca7379b7d36e4c1274482d5e - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms diff --git a/eng/Versions.props b/eng/Versions.props index c997c59d2777..46c1ca41bdbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,11 +98,6 @@ 9.0.0-rtm.24529.1 - - - - 1.1.0-rtm.24575.3 - 9.0.0 @@ -189,15 +184,15 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. - + Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> 17.13.0-preview-24569-04 17.13.0-preview-24569-04 diff --git a/src/Installer/redist-installer/targets/BundledTemplates.targets b/src/Installer/redist-installer/targets/BundledTemplates.targets index f342e20ae07b..54afafb268e1 100644 --- a/src/Installer/redist-installer/targets/BundledTemplates.targets +++ b/src/Installer/redist-installer/targets/BundledTemplates.targets @@ -24,7 +24,6 @@ - From 6ba0aa9a733b2196906bcea0adc59a4d8c576045 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:43:26 -0500 Subject: [PATCH 572/702] Add --include-previews option --- .../search/WorkloadSearchVersionsCommand.cs | 7 ++++++- .../search/WorkloadSearchVersionsCommandParser.cs | 3 +++ .../SdkFeatureBand.cs | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs index d9e3667c963b..64e14d4fc4d1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommand.cs @@ -26,6 +26,7 @@ internal class WorkloadSearchVersionsCommand : WorkloadCommandBase private readonly string _workloadSetOutputFormat; private readonly FileBasedInstaller _installer; private readonly string _workloadVersion; + private readonly bool _includePreviews; public WorkloadSearchVersionsCommand( ParseResult result, @@ -64,6 +65,10 @@ public WorkloadSearchVersionsCommand( ); _workloadVersion = result.GetValue(WorkloadSearchVersionsCommandParser.WorkloadVersionArgument); + + _includePreviews = result.HasOption(WorkloadSearchVersionsCommandParser.IncludePreviewsOption) ? + result.GetValue(WorkloadSearchVersionsCommandParser.IncludePreviewsOption) : + new SdkFeatureBand(_sdkVersion).IsPrerelease; } public override int Execute() @@ -76,7 +81,7 @@ public override int Execute() List versions; try { - versions = PackageDownloader.GetLatestPackageVersions(packageId, _numberOfWorkloadSetsToTake, packageSourceLocation: null, includePreview: !string.IsNullOrWhiteSpace(_sdkVersion.Prerelease)) + versions = PackageDownloader.GetLatestPackageVersions(packageId, _numberOfWorkloadSetsToTake, packageSourceLocation: null, includePreview: _includePreviews) .GetAwaiter().GetResult() .Select(version => WorkloadSetVersion.FromWorkloadSetPackageVersion(featureBand, version.ToString())) .ToList(); diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs index d40d53193457..3b06459ca715 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs @@ -23,6 +23,8 @@ internal static class WorkloadSearchVersionsCommandParser Description = LocalizableStrings.FormatOptionDescription }; + public static readonly CliOption IncludePreviewsOption = new("--include-previews"); + private static readonly CliCommand Command = ConstructCommand(); public static CliCommand GetCommand() @@ -36,6 +38,7 @@ private static CliCommand ConstructCommand() command.Arguments.Add(WorkloadVersionArgument); command.Options.Add(FormatOption); command.Options.Add(TakeOption); + command.Options.Add(IncludePreviewsOption); TakeOption.Validators.Add(optionResult => { diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs index 336f5d0f1a42..eec3e34e68c1 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkFeatureBand.cs @@ -29,6 +29,7 @@ public SdkFeatureBand(ReleaseVersion version) } } + public bool IsPrerelease => !string.IsNullOrEmpty(_featureBand.Prerelease); public int Major => _featureBand.Major; public int Minor => _featureBand.Minor; From ed53f11513bdfba51dd0f53cace6bc4129edaf19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 17:41:07 +0000 Subject: [PATCH 573/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.73 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.71 -> To Version 6.13.0-preview.1.73 --- NuGet.config | 1 + eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 967259370182..da8ebc6e33c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65d9462d6adf..bcc81634c6d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 - + https://github.com/nuget/nuget.client - c0d3837b40a353b5178cd02953db2924aacb8712 + cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index c997c59d2777..c838e29fa14b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,18 +156,18 @@ - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 - 6.13.0-preview.1.71 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 + 6.13.0-preview.1.73 From cf74aa68ebc908dad43a8fcd005bab6bc9a84378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 17:58:04 +0000 Subject: [PATCH 574/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a28e3443bb6..e38e8f3b206e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b - + https://github.com/dotnet/roslyn - b23da0417d19a84b2032f886481ba0bb3c5def38 + e93df3b14ec4271a2153b99feedecb4bd2c48f4b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 683013b5a9ba..41406ba6ea51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 - 4.13.0-3.24576.1 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 + 4.13.0-3.24576.2 From 736aaa4324f85a895672428bb9ec88cc005dec7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 20:07:04 +0000 Subject: [PATCH 575/702] Update dependencies from https://github.com/dotnet/razor build 20241126.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24574.7 -> To Version 9.0.0-preview.24576.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe9374d1ba40..bdf11d2479e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 + b5256abf658352440e61aa1372bbc0798e9ceb7d - + https://github.com/dotnet/razor - 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 + b5256abf658352440e61aa1372bbc0798e9ceb7d - + https://github.com/dotnet/razor - 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 + b5256abf658352440e61aa1372bbc0798e9ceb7d - + https://github.com/dotnet/razor - 88f8675df43ec706bb4089bd5f91d0a5dbbd3f94 + b5256abf658352440e61aa1372bbc0798e9ceb7d diff --git a/eng/Versions.props b/eng/Versions.props index b2b2f3521d2b..9d3df47f6b70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.24574.7 - 9.0.0-preview.24574.7 - 9.0.0-preview.24574.7 + 9.0.0-preview.24576.1 + 9.0.0-preview.24576.1 + 9.0.0-preview.24576.1 From 1a0030028926d639a6a41d6ec04d4b88ed008bac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 21:07:22 +0000 Subject: [PATCH 576/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e38e8f3b206e..475453df6e9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 - + https://github.com/dotnet/roslyn - e93df3b14ec4271a2153b99feedecb4bd2c48f4b + 70a8e6becc26822fcf729c42c01b1adf370ba1a7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 41406ba6ea51..24d54febad2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 - 4.13.0-3.24576.2 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 + 4.13.0-3.24576.4 From ffc11a8b18f851a356f10853bb458a3ff6238c94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 21:08:59 +0000 Subject: [PATCH 577/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.3 --- 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 475453df6e9c..d2853bf5ee5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 - + https://github.com/dotnet/roslyn - 70a8e6becc26822fcf729c42c01b1adf370ba1a7 + f5f8e954a92babfd40bf22cabb326f41af764451 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 24d54febad2f..73aa1e1a2b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 - 4.13.0-3.24576.4 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 + 4.13.0-3.24576.3 From d93940b14cbb1aeff210f80d005fbc291ee1482b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 21:21:35 +0000 Subject: [PATCH 578/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2853bf5ee5c..91b4d320b750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e - + https://github.com/dotnet/roslyn - f5f8e954a92babfd40bf22cabb326f41af764451 + 175121c035a6f057b9388737bb9b8755fb6dba7e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 73aa1e1a2b5d..fc8d270b2839 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 - 4.13.0-3.24576.3 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 + 4.13.0-3.24576.5 From 2e06088c9cfaed0167fa09d6ca8679f18108b58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 26 Nov 2024 13:52:50 -0800 Subject: [PATCH 579/702] Refresh browser for all transitively referencing projects (#45095) --- .../HotReload/CompilationHandler.cs | 2 +- .../HotReload/ScopedCssFileHandler.cs | 62 +++++++---- .../HotReload/StaticFileHandler.cs | 10 +- .../Utilities/ProjectGraphNodeExtensions.cs | 24 ++++ .../RazorApp/Components/App.razor | 29 +++++ .../Components/Layout/MainLayout.razor | 23 ++++ .../Components/Layout/MainLayout.razor.css | 98 ++++++++++++++++ .../RazorApp/Components/Layout/NavMenu.razor | 17 +++ .../Components/Layout/NavMenu.razor.css | 105 ++++++++++++++++++ .../RazorApp/Components/Pages/Home.razor | 8 ++ .../RazorApp/Components/Routes.razor | 6 + .../RazorApp/Components/_Imports.razor | 10 ++ .../WatchRazorWithDeps/RazorApp/Program.cs | 31 ++++++ .../RazorApp/Properties/launchSettings.json | 13 +++ .../RazorApp/RazorApp.csproj | 12 ++ .../RazorApp/wwwroot/app.css | 61 ++++++++++ .../Components/Example.razor | 3 + .../Components/Example.razor.css | 3 + .../RazorClassLibrary.csproj | 13 +++ .../HotReload/ApplyDeltaTests.cs | 46 ++++++++ 20 files changed, 554 insertions(+), 22 deletions(-) create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/App.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor.css create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor.css create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Pages/Home.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Routes.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/_Imports.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Program.cs create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Properties/launchSettings.json create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/wwwroot/app.css create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor.css create mode 100644 test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/RazorClassLibrary.csproj diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index 2d2903f4b665..a80f0982d477 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -365,7 +365,7 @@ private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates update switch (updates.Status) { case ModuleUpdateStatus.None: - _reporter.Output("No hot reload changes to apply."); + _reporter.Output("No C# changes to apply."); break; case ModuleUpdateStatus.Ready: diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs index 7e8a16b0b8fe..d9f241eb0fab 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs @@ -2,7 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.Build.Framework; using Microsoft.Build.Graph; +using Microsoft.TemplateEngine.Utils; namespace Microsoft.DotNet.Watch { @@ -48,41 +50,61 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList files, } } - var logger = reporter.IsVerbose ? new[] { new Build.Logging.ConsoleLogger() } : null; + if (!hasApplicableFiles) + { + return; + } + + var logger = reporter.IsVerbose ? new[] { new Build.Logging.ConsoleLogger(LoggerVerbosity.Minimal) } : null; - var tasks = projectsToRefresh.Select(async projectNode => + var buildTasks = projectsToRefresh.Select(projectNode => Task.Run(() => { - if (!projectNode.ProjectInstance.DeepCopy().Build(BuildTargetName, logger)) + try { - return false; + if (!projectNode.ProjectInstance.DeepCopy().Build(BuildTargetName, logger)) + { + return null; + } } - - if (browserConnector.TryGetRefreshServer(projectNode, out var browserRefreshServer)) + catch (Exception e) { - await HandleBrowserRefresh(browserRefreshServer, projectNode.ProjectInstance.FullPath, cancellationToken); + reporter.Error($"[{projectNode.GetDisplayName()}] Target {BuildTargetName} failed to build: {e}"); + return null; } - return true; - }); + return projectNode; + })); - var results = await Task.WhenAll(tasks).WaitAsync(cancellationToken); + var buildResults = await Task.WhenAll(buildTasks).WaitAsync(cancellationToken); - if (hasApplicableFiles) + var browserRefreshTasks = buildResults.Where(p => p != null)!.GetTransitivelyReferencingProjects().Select(async projectNode => { - var successfulCount = results.Sum(r => r ? 1 : 0); - - if (successfulCount == results.Length) - { - reporter.Output("Hot reload of scoped css succeeded.", emoji: "🔥"); - } - else if (successfulCount > 0) + if (browserConnector.TryGetRefreshServer(projectNode, out var browserRefreshServer)) { - reporter.Output($"Hot reload of scoped css partially succeeded: {successfulCount} project(s) out of {results.Length} were updated.", emoji: "🔥"); + reporter.Verbose($"[{projectNode.GetDisplayName()}] Refreshing browser."); + await HandleBrowserRefresh(browserRefreshServer, projectNode.ProjectInstance.FullPath, cancellationToken); } else { - reporter.Output("Hot reload of scoped css failed.", emoji: "🔥"); + reporter.Verbose($"[{projectNode.GetDisplayName()}] No refresh server."); } + }); + + await Task.WhenAll(browserRefreshTasks).WaitAsync(cancellationToken); + + var successfulCount = buildResults.Sum(r => r != null ? 1 : 0); + + if (successfulCount == buildResults.Length) + { + reporter.Output("Hot reload of scoped css succeeded.", emoji: "🔥"); + } + else if (successfulCount > 0) + { + reporter.Output($"Hot reload of scoped css partially succeeded: {successfulCount} project(s) out of {buildResults.Length} were updated.", emoji: "🔥"); + } + else + { + reporter.Output("Hot reload of scoped css failed.", emoji: "🔥"); } } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs index fd1909dfdbff..05fde9ab4001 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs @@ -4,6 +4,7 @@ using System.Text.Json; using System.Text.Json.Serialization; +using Microsoft.Build.Graph; namespace Microsoft.DotNet.Watch { @@ -18,6 +19,8 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList f { var allFilesHandled = true; var refreshRequests = new Dictionary>(); + var projectsWithoutRefreshServer = new HashSet(); + for (int i = 0; i < files.Count; i++) { var file = files[i].Item; @@ -45,11 +48,16 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList f { if (!refreshRequests.TryGetValue(refreshServer, out var filesPerServer)) { + reporter.Verbose($"[{projectNode.GetDisplayName()}] Refreshing browser."); refreshRequests.Add(refreshServer, filesPerServer = []); } filesPerServer.Add(file.StaticWebAssetPath); } + else if (projectsWithoutRefreshServer.Add(projectNode)) + { + reporter.Verbose($"[{projectNode.GetDisplayName()}] No refresh server."); + } } } } @@ -64,7 +72,7 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList f // Serialize all requests sent to a single server: foreach (var path in request.Value) { - reporter.Verbose($"Sending static file update request for asset '{path}'"); + reporter.Verbose($"Sending static file update request for asset '{path}'."); var message = JsonSerializer.SerializeToUtf8Bytes(new UpdateStaticFileMessage { Path = path }, s_jsonSerializerOptions); await request.Key.SendAsync(message, cancellationToken); } diff --git a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs index dc758ef74305..e694587fe30a 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs @@ -31,4 +31,28 @@ public static bool IsNetCoreApp(this ProjectGraphNode projectNode, Version minVe public static IEnumerable GetCapabilities(this ProjectGraphNode projectNode) => projectNode.ProjectInstance.GetItems("ProjectCapability").Select(item => item.EvaluatedInclude); + + public static IEnumerable GetTransitivelyReferencingProjects(this IEnumerable projects) + { + var visited = new HashSet(); + var queue = new Queue(); + foreach (var project in projects) + { + queue.Enqueue(project); + } + + while (queue.Count > 0) + { + var project = queue.Dequeue(); + if (visited.Add(project)) + { + foreach (var referencingProject in project.ReferencingProjects) + { + queue.Enqueue(referencingProject); + } + } + } + + return visited; + } } diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/App.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/App.razor new file mode 100644 index 000000000000..3dc22458a9fa --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/App.razor @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + @* + + + + *@ + + + + + + + + + + + diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor new file mode 100644 index 000000000000..e3b291825d2a --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor @@ -0,0 +1,23 @@ +@inherits LayoutComponentBase + +
+
+ +
+ +
+
+ About +
+ +
+ @Body +
+
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
\ No newline at end of file diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor.css b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor.css new file mode 100644 index 000000000000..38d1f2598313 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/MainLayout.razor.css @@ -0,0 +1,98 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +main { + flex: 1; +} + +.sidebar { + background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; + height: 3.5rem; + display: flex; + align-items: center; +} + + .top-row ::deep a, .top-row ::deep .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + text-decoration: none; + } + + .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { + text-decoration: underline; + } + + .top-row ::deep a:first-child { + overflow: hidden; + text-overflow: ellipsis; + } + +@media (max-width: 640.98px) { + .top-row { + justify-content: space-between; + } + + .top-row ::deep a, .top-row ::deep .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 250px; + height: 100vh; + position: sticky; + top: 0; + } + + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + + .top-row.auth ::deep a:first-child { + flex: 1; + text-align: right; + width: 0; + } + + .top-row, article { + padding-left: 2rem !important; + padding-right: 1.5rem !important; + } +} + +#blazor-error-ui { + color-scheme: light only; + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + box-sizing: border-box; + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor new file mode 100644 index 000000000000..98879349fb43 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor @@ -0,0 +1,17 @@ +
+
+ RazorApp +
+
+ + + +
+ +
diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor.css b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor.css new file mode 100644 index 000000000000..a2aeace9c38d --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Layout/NavMenu.razor.css @@ -0,0 +1,105 @@ +.navbar-toggler { + appearance: none; + cursor: pointer; + width: 3.5rem; + height: 2.5rem; + color: white; + position: absolute; + top: 0.5rem; + right: 1rem; + border: 1px solid rgba(255, 255, 255, 0.1); + background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); +} + +.navbar-toggler:checked { + background-color: rgba(255, 255, 255, 0.5); +} + +.top-row { + min-height: 3.5rem; + background-color: rgba(0,0,0,0.4); +} + +.navbar-brand { + font-size: 1.1rem; +} + +.bi { + display: inline-block; + position: relative; + width: 1.25rem; + height: 1.25rem; + margin-right: 0.75rem; + top: -1px; + background-size: cover; +} + +.bi-house-door-fill-nav-menu { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); +} + +.bi-plus-square-fill-nav-menu { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); +} + +.bi-list-nested-nav-menu { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.5rem; +} + + .nav-item:first-of-type { + padding-top: 1rem; + } + + .nav-item:last-of-type { + padding-bottom: 1rem; + } + + .nav-item ::deep .nav-link { + color: #d7d7d7; + background: none; + border: none; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; + width: 100%; + } + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.37); + color: white; +} + +.nav-item ::deep .nav-link:hover { + background-color: rgba(255,255,255,0.1); + color: white; +} + +.nav-scrollable { + display: none; +} + +.navbar-toggler:checked ~ .nav-scrollable { + display: block; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .nav-scrollable { + /* Never collapse the sidebar for wide screens */ + display: block; + + /* Allow sidebar to scroll for tall menus */ + height: calc(100vh - 3.5rem); + overflow-y: auto; + } +} diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Pages/Home.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Pages/Home.razor new file mode 100644 index 000000000000..bb44fc2639e7 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Pages/Home.razor @@ -0,0 +1,8 @@ +@page "/" +@using RazorClassLibrary.Components + +Home + + + +Welcome to your new app. \ No newline at end of file diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Routes.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Routes.razor new file mode 100644 index 000000000000..ae94e9e955ef --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/Routes.razor @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/_Imports.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/_Imports.razor new file mode 100644 index 000000000000..4db254546eb0 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Components/_Imports.razor @@ -0,0 +1,10 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using RazorApp +@using RazorApp.Components diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Program.cs b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Program.cs new file mode 100644 index 000000000000..5698a11c7a78 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Program.cs @@ -0,0 +1,31 @@ +using RazorApp.Components; + +var builder = WebApplication.CreateBuilder(args); + +// Add services to the container. +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error", createScopeForErrors: true); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseHttpsRedirection(); + + +app.UseAntiforgery(); + +//app.UseStaticFiles(); +app.MapStaticAssets(); + + +app.MapRazorComponents() + .AddInteractiveServerRenderMode(); + +app.Run(); diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Properties/launchSettings.json b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Properties/launchSettings.json new file mode 100644 index 000000000000..de38c15602c2 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/Properties/launchSettings.json @@ -0,0 +1,13 @@ +{ + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": "true", + "launchBrowser": true, + "applicationUrl": "http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj new file mode 100644 index 000000000000..a669f178a874 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj @@ -0,0 +1,12 @@ + + + + net9.0 + enable + enable + + + + + + diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/wwwroot/app.css b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/wwwroot/app.css new file mode 100644 index 000000000000..da9a577f4ecd --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/wwwroot/app.css @@ -0,0 +1,61 @@ +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + background-color: white; +} + +a, .btn-link { + color: #006bb7; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { + box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; +} + +.content { + padding-top: 1.1rem; +} + +h1:focus { + outline: none; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid #e50000; +} + +.validation-message { + color: #e50000; +} + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } + +.darker-border-checkbox.form-check-input { + border-color: #929292; +} + +.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder { + color: var(--bs-secondary-color); + text-align: end; +} + +.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder { + text-align: start; +} diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor new file mode 100644 index 000000000000..cb6f355d9937 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor @@ -0,0 +1,3 @@ +
+

Hello World

+
\ No newline at end of file diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor.css b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor.css new file mode 100644 index 000000000000..c0c34e31faa5 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/Components/Example.razor.css @@ -0,0 +1,3 @@ +.example { + color: red; +} \ No newline at end of file diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/RazorClassLibrary.csproj b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/RazorClassLibrary.csproj new file mode 100644 index 000000000000..4c50d9d09f14 --- /dev/null +++ b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorClassLibrary/RazorClassLibrary.csproj @@ -0,0 +1,13 @@ + + + $(CurrentTargetFramework) + enable + enable + + + + + + + + diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 275dab47e8f0..17ebffa1105f 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -280,6 +280,52 @@ public async Task BlazorWasm_MSBuildWarning() await App.AssertWaitingForChanges(); } + [Fact] + public async Task Razor_Component_ScopedCssAndStaticAssets() + { + var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps") + .WithSource(); + + var port = TestOptions.GetTestPort(); + App.Start(testAsset, ["--urls", "http://localhost:" + port], relativeProjectDirectory: "RazorApp", testFlags: TestFlags.MockBrowser); + + await App.AssertWaitingForChanges(); + + App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + App.AssertOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}/"); + App.Process.ClearOutput(); + + var scopedCssPath = Path.Combine(testAsset.Path, "RazorClassLibrary", "Components", "Example.razor.css"); + + var newCss = """ + .example { + color: blue; + } + """; + + UpdateSourceFile(scopedCssPath, newCss); + await App.AssertOutputLineStartsWith("dotnet watch 🔥 Hot reload change handled"); + + App.AssertOutputContains($"dotnet watch ⌚ Handling file change event for scoped css file {scopedCssPath}."); + App.AssertOutputContains($"dotnet watch ⌚ [RazorClassLibrary (net9.0)] No refresh server."); + App.AssertOutputContains($"dotnet watch ⌚ [RazorApp (net9.0)] Refreshing browser."); + App.AssertOutputContains($"dotnet watch 🔥 Hot reload of scoped css succeeded."); + App.AssertOutputContains($"dotnet watch ⌚ No C# changes to apply."); + App.Process.ClearOutput(); + + var cssPath = Path.Combine(testAsset.Path, "RazorApp", "wwwroot", "app.css"); + UpdateSourceFile(cssPath, content => content.Replace("background-color: white;", "background-color: red;")); + + await App.AssertOutputLineStartsWith("dotnet watch 🔥 Hot reload change handled"); + + App.AssertOutputContains($"dotnet watch ⌚ Sending static file update request for asset 'app.css'."); + App.AssertOutputContains($"dotnet watch ⌚ [RazorApp (net9.0)] Refreshing browser."); + App.AssertOutputContains($"dotnet watch 🔥 Hot Reload of static files succeeded."); + App.AssertOutputContains($"dotnet watch ⌚ No C# changes to apply."); + App.Process.ClearOutput(); + } + // Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669 [CoreMSBuildOnlyFact] public async Task HandleMissingAssemblyFailure() From 73a825def8caa93c12a43a9db0646e9273670cdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 22:09:34 +0000 Subject: [PATCH 580/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.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.13.0-3.24575.6 -> To Version 4.13.0-3.24576.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 91b4d320b750..d97e36543ca3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 - + https://github.com/dotnet/roslyn - 175121c035a6f057b9388737bb9b8755fb6dba7e + 540bf4c6f8428eef69755045f6255570b8c57de8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fc8d270b2839..6b8ee89cde87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 - 4.13.0-3.24576.5 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 + 4.13.0-3.24576.6 From 0ee7f50eb83131fda8b4048b33c289db0b8ae253 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Fri, 22 Nov 2024 19:28:49 -0800 Subject: [PATCH 581/702] Make sure _GetAppHostCreationConfiguration runs when publishing without build --- .../targets/Microsoft.NET.Sdk.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 6fa4bc2d0782..05731e1b9087 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -791,9 +791,9 @@ Copyright (c) .NET Foundation. All rights reserved. From 250e190583ea8a47cbe58858a054854831f07ece Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Fri, 22 Nov 2024 19:33:30 -0800 Subject: [PATCH 582/702] Add test --- .../GivenThatWeWantToPublishASingleFileApp.cs | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index c4b7f6395581..bcb21aeb7fec 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -551,6 +551,44 @@ public void It_does_not_rewrite_the_single_file_unnecessarily() fileWriteTimeAfterSecondRun.Should().Be(fileWriteTimeAfterFirstRun); } + [RequiresMSBuildVersionFact("16.8.0")] + public void It_uses_appropriate_host_on_selfcontained_publish_with_no_build() + { + var testProject = new TestProject() + { + Name = "SingleFileTest", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier, + IsExe = true, + }; + testProject.AdditionalProperties.Add("SelfContained", "true"); + TestAsset testAsset = _testAssetsManager.CreateTestProject(testProject); + + // Build will create app using apphost + var buildCommand = new BuildCommand(testAsset); + buildCommand + .Execute() + .Should() + .Pass(); + + // Publish without build should create app using singlefilehost + var publishCommand = new PublishCommand(testAsset); + publishCommand + .Execute(PublishSingleFile, "/p:NoBuild=true") + .Should() + .Pass(); + string singleFilePath = Path.Combine( + GetPublishDirectory(publishCommand).FullName, + $"{testProject.Name}{Constants.ExeSuffix}"); + + // Make sure published app runs correctly + var command = new RunExeCommand(Log, singleFilePath); + command.Execute() + .Should() + .Pass() + .And.HaveStdOutContaining("Hello World"); + } + [RequiresMSBuildVersionFact("16.8.0")] public void It_rewrites_the_apphost_for_single_file_publish() { From f23a03f3923ad149468b05c3fb9202114ccffe3f Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:44:49 -0500 Subject: [PATCH 583/702] Feedback --- .../WorkloadSearchVersionsCommandParser.cs | 4 ++-- src/Common/WorkloadSetVersion.cs | 13 ++++++++++++- .../GivenDotnetWorkloadSearch.cs | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs index f3dd59e64bd0..aa85989e35d6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.CommandLine; +using Microsoft.DotNet.Workloads.Workload; using Microsoft.DotNet.Workloads.Workload.Search; using LocalizableStrings = Microsoft.DotNet.Workloads.Workload.Search.LocalizableStrings; @@ -58,8 +59,7 @@ private static CliCommand ConstructCommand() var versionArgument = result.GetValue(WorkloadVersionArgument); if (versionArgument is not null) { - var coreComponents = versionArgument.Split(['-', '+'], 2)[0].Split('.'); - if (coreComponents.Length != 3 && coreComponents.Length != 4) + if (!WorkloadSetVersion.IsWorkloadSetPackageVersion(versionArgument)) { result.AddError(string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, versionArgument)); } diff --git a/src/Common/WorkloadSetVersion.cs b/src/Common/WorkloadSetVersion.cs index 2057b0620af7..b15cfdc0a171 100644 --- a/src/Common/WorkloadSetVersion.cs +++ b/src/Common/WorkloadSetVersion.cs @@ -8,9 +8,20 @@ namespace Microsoft.DotNet.Workloads.Workload { static class WorkloadSetVersion { + public static bool IsWorkloadSetPackageVersion(string workloadSetVersion) + { + + string[] sections = workloadSetVersion.Split(['-', '+'], 2); + string versionCore = sections[0]; + string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; + + string[] coreComponents = versionCore.Split('.'); + return coreComponents.Length >= 3 && coreComponents.Length <= 4; + } + public static string ToWorkloadSetPackageVersion(string workloadSetVersion, out SdkFeatureBand sdkFeatureBand) { - string[] sections = workloadSetVersion.Split(new char[] { '-', '+' }, 2); + string[] sections = workloadSetVersion.Split(['-', '+'], 2); string versionCore = sections[0]; string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; diff --git a/test/dotnet-workload-search.Tests/GivenDotnetWorkloadSearch.cs b/test/dotnet-workload-search.Tests/GivenDotnetWorkloadSearch.cs index 443781d46533..9e614502f0c7 100644 --- a/test/dotnet-workload-search.Tests/GivenDotnetWorkloadSearch.cs +++ b/test/dotnet-workload-search.Tests/GivenDotnetWorkloadSearch.cs @@ -28,6 +28,22 @@ public GivenDotnetWorkloadSearch(ITestOutputHelper log) : base(log) _reporter = new BufferedReporter(); } + [Theory] + [InlineData("--invalidArgument")] + [InlineData("notAVersion")] + [InlineData("1.2")] // too short + [InlineData("1.2.3.4.5")] // too long + [InlineData("1.2-3.4")] // numbers after [-, +] don't count + public void GivenInvalidArgumentToWorkloadSearchVersionItFailsCleanly(string argument) + { + _reporter.Clear(); + var parseResult = Parser.Instance.Parse($"dotnet workload search version {argument}"); + var workloadResolver = new MockWorkloadResolver(Enumerable.Empty()); + var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetPath: null, "9.0.100", workloadResolver); + var command = () => new WorkloadSearchVersionsCommand(parseResult, _reporter, workloadResolverFactory); + command.Should().Throw(); + } + [Fact] public void GivenNoWorkloadsAreInstalledSearchIsEmpty() { From efe80004d4a1f801b1bd99b53e07de5bf823f0d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Nov 2024 23:34:21 +0000 Subject: [PATCH 584/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.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.13.0-3.24575.6 -> To Version 4.13.0-3.24576.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 d97e36543ca3..f2cf9abfbc98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d - + https://github.com/dotnet/roslyn - 540bf4c6f8428eef69755045f6255570b8c57de8 + 4d442bae1b527670b0ec23e5fd616b3f88533c4d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6b8ee89cde87..5a0d50bc0ff6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 - 4.13.0-3.24576.6 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 + 4.13.0-3.24576.7 From 00cb8ce1385d913513e52dc27878c16bc0630659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 26 Nov 2024 16:23:00 -0800 Subject: [PATCH 585/702] Factor Hot Reload agent implementation into a source package (#44899) --- sdk.sln | 17 ++++++++++-- ...osoft.Extensions.DotNetDeltaApplier.csproj | 8 +++--- .../DotNetDeltaApplier/StartupHook.cs | 1 + ...soft.DotNet.HotReload.Agent.Package.csproj | 26 +++++++++++++++++++ .../AgentMessageSeverity.cs | 1 - .../AgentReporter.cs | 2 +- .../HotReloadAgent.cs | 3 ++- .../MetadataUpdateHandlerInvoker.cs | 9 +++++-- ...Microsoft.DotNet.HotReload.Agent.projitems | 14 ++++++++++ .../Microsoft.DotNet.HotReload.Agent.shproj | 13 ++++++++++ .../ResponseLoggingLevel.cs | 2 +- .../UpdateDelta.cs | 1 - src/BuiltInTools/dotnet-watch.slnf | 6 +++-- .../BlazorWebAssemblyDeltaApplier.cs | 1 + .../HotReload/DefaultDeltaApplier.cs | 1 + .../dotnet-watch/HotReload/DeltaApplier.cs | 1 + .../HotReload/NamedPipeContract.cs | 2 ++ .../dotnet-watch/dotnet-watch.csproj | 4 +++ .../HotReloadAgentTest.cs | 1 + ...hatWeWantToControlGeneratedAssemblyInfo.cs | 2 +- .../HotReload/UpdatePayloadTests.cs | 2 ++ 21 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 src/BuiltInTools/HotReloadAgent.Package/Microsoft.DotNet.HotReload.Agent.Package.csproj rename src/BuiltInTools/{dotnet-watch/HotReload => HotReloadAgent}/AgentMessageSeverity.cs (87%) rename src/BuiltInTools/{DotNetDeltaApplier => HotReloadAgent}/AgentReporter.cs (95%) rename src/BuiltInTools/{DotNetDeltaApplier => HotReloadAgent}/HotReloadAgent.cs (99%) rename src/BuiltInTools/{DotNetDeltaApplier => HotReloadAgent}/MetadataUpdateHandlerInvoker.cs (94%) create mode 100644 src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems create mode 100644 src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj rename src/BuiltInTools/{dotnet-watch/HotReload => HotReloadAgent}/ResponseLoggingLevel.cs (85%) rename src/BuiltInTools/{dotnet-watch/HotReload => HotReloadAgent}/UpdateDelta.cs (99%) diff --git a/sdk.sln b/sdk.sln index 8107e6e40cfe..991db9a6ad01 100644 --- a/sdk.sln +++ b/sdk.sln @@ -210,9 +210,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PublishProfiles", "PublishP src\WebSdk\Publish\Targets\PublishProfiles\Default.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\Default.pubxml src\WebSdk\Publish\Targets\PublishProfiles\DefaultMSDeploy.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultMSDeploy.pubxml src\WebSdk\Publish\Targets\PublishProfiles\DefaultMSDeployPackage.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultMSDeployPackage.pubxml - src\WebSdk\Publish\Targets\PublishProfiles\DefaultZipDeploy.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultZipDeploy.pubxml src\WebSdk\Publish\Targets\PublishProfiles\DefaultOneDeploy.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultOneDeploy.pubxml src\WebSdk\Publish\Targets\PublishProfiles\DefaultWebJobOneDeploy.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultWebJobOneDeploy.pubxml + src\WebSdk\Publish\Targets\PublishProfiles\DefaultZipDeploy.pubxml = src\WebSdk\Publish\Targets\PublishProfiles\DefaultZipDeploy.pubxml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PublishTargets", "PublishTargets", "{40E6E4B1-286B-4542-B814-2A3DA29510D1}" @@ -222,8 +222,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PublishTargets", "PublishTa src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.Kudu.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.Kudu.targets src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.MSDeploy.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.MSDeploy.targets src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.MSDeployPackage.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.MSDeployPackage.targets - src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.ZipDeploy.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.ZipDeploy.targets src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.OneDeploy.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.OneDeploy.targets + src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.ZipDeploy.targets = src\WebSdk\Publish\Targets\PublishTargets\Microsoft.NET.Sdk.Publish.ZipDeploy.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TransformTargets", "TransformTargets", "{DFA91CC3-D6E4-45B7-AF6F-4385288886E4}" @@ -512,6 +512,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Sdk.Compilers EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WebTools.AspireService.Tests", "test\Microsoft.WebTools.AspireService.Tests\Microsoft.WebTools.AspireService.Tests.csproj", "{1F0B4B3C-DC88-4740-B04F-1707102E9930}" EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.HotReload.Agent", "src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.shproj", "{418B10BD-CA42-49F3-8F4A-D8CC90C8A17D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.HotReload.Agent.Package", "src\BuiltInTools\HotReloadAgent.Package\Microsoft.DotNet.HotReload.Agent.Package.csproj", "{2FF79F82-60C1-349A-4726-7783D5A6D5DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -974,6 +978,10 @@ Global {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.Build.0 = Release|Any CPU + {2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1153,6 +1161,8 @@ Global {94C8526E-DCC2-442F-9868-3DD0BA2688BE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} {FA579C03-2EB4-4D47-88EE-BFF339E96FAF} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} {1F0B4B3C-DC88-4740-B04F-1707102E9930} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {418B10BD-CA42-49F3-8F4A-D8CC90C8A17D} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} + {2FF79F82-60C1-349A-4726-7783D5A6D5DF} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6} @@ -1160,7 +1170,10 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{2ff79f82-60c1-349a-4726-7783d5a6d5df}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{418b10bd-ca42-49f3-8f4a-d8cc90c8a17d}*SharedItemsImports = 13 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{94c8526e-dcc2-442f-9868-3dd0ba2688be}*SharedItemsImports = 13 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13 diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj index 00265c49cd91..c59a80a6e1c1 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj @@ -1,4 +1,5 @@  + + $(VisualStudioServiceTargetFramework) + false + none + false + enable + preview + + + true + true + Microsoft.DotNet.HotReload.Agent + false + + Package containing sources of Hot Reload agent. + + + $(NoWarn);NU5128 + + + + + + diff --git a/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs b/src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.cs similarity index 87% rename from src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs rename to src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.cs index 88bf9a039fc6..d6c23929b7b4 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/AgentMessageSeverity.cs +++ b/src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.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. -namespace Microsoft.DotNet.Watch; internal enum AgentMessageSeverity : byte { diff --git a/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs b/src/BuiltInTools/HotReloadAgent/AgentReporter.cs similarity index 95% rename from src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs rename to src/BuiltInTools/HotReloadAgent/AgentReporter.cs index 90ae2d674aca..794a23956359 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/AgentReporter.cs +++ b/src/BuiltInTools/HotReloadAgent/AgentReporter.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watch; +namespace Microsoft.DotNet.HotReload; internal sealed class AgentReporter { diff --git a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs b/src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs similarity index 99% rename from src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs rename to src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs index eab6448749f5..5350c0ae2d8d 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs +++ b/src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs @@ -4,8 +4,9 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.Reflection; +using Microsoft.DotNet.Watch; -namespace Microsoft.DotNet.Watch; +namespace Microsoft.DotNet.HotReload; #if NET [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")] diff --git a/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs b/src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs similarity index 94% rename from src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs rename to src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs index 9e5a5669ea3a..3c3583949130 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/MetadataUpdateHandlerInvoker.cs +++ b/src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs @@ -1,13 +1,18 @@ // 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.CodeAnalysis; using System.Reflection; -namespace Microsoft.DotNet.Watch; +namespace Microsoft.DotNet.HotReload; /// /// Finds and invokes metadata update handlers. /// +#if NET +[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")] +[UnconditionalSuppressMessage("Trimming", "IL2070", Justification = "Hot reload is only expected to work when trimming is disabled.")] +#endif internal sealed class MetadataUpdateHandlerInvoker(AgentReporter reporter) { internal sealed class RegisteredActions(IReadOnlyList> clearCache, IReadOnlyList> updateApplication) @@ -163,7 +168,7 @@ internal RegisteredActions GetMetadataUpdateHandlerActions(IEnumerable han MethodInfo? GetUpdateMethod(Type handlerType, string name) { - if (handlerType.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, binder: null, new[] { typeof(Type[]) }, modifiers: null) is MethodInfo updateMethod && + if (handlerType.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, binder: null, [typeof(Type[])], modifiers: null) is MethodInfo updateMethod && updateMethod.ReturnType == typeof(void)) { return updateMethod; diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems new file mode 100644 index 000000000000..c28d7de9cdf7 --- /dev/null +++ b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 418B10BD-CA42-49F3-8F4A-D8CC90C8A17D + + + Microsoft.DotNet.HotReload + + + + + \ No newline at end of file diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj new file mode 100644 index 000000000000..8bec0ced75ec --- /dev/null +++ b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj @@ -0,0 +1,13 @@ + + + + {418B10BD-CA42-49F3-8F4A-D8CC90C8A17D} + 14.0 + + + + + + + + \ No newline at end of file diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs b/src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs similarity index 85% rename from src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs rename to src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs index b6ec99381d8d..b081d74326f1 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ResponseLoggingLevel.cs +++ b/src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.DotNet.Watch; +namespace Microsoft.DotNet.HotReload; internal enum ResponseLoggingLevel : byte { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs b/src/BuiltInTools/HotReloadAgent/UpdateDelta.cs similarity index 99% rename from src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs rename to src/BuiltInTools/HotReloadAgent/UpdateDelta.cs index 412ce62fc1b7..f5bba35278ac 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/UpdateDelta.cs +++ b/src/BuiltInTools/HotReloadAgent/UpdateDelta.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. namespace Microsoft.DotNet.Watch; - internal readonly struct UpdateDelta(Guid moduleId, byte[] metadataDelta, byte[] ilDelta, byte[] pdbDelta, int[] updatedTypes) { public Guid ModuleId { get; } = moduleId; diff --git a/src/BuiltInTools/dotnet-watch.slnf b/src/BuiltInTools/dotnet-watch.slnf index 5baaf69115c2..e18611cb6620 100644 --- a/src/BuiltInTools/dotnet-watch.slnf +++ b/src/BuiltInTools/dotnet-watch.slnf @@ -7,12 +7,14 @@ "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", "src\\BuiltInTools\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", + "src\\BuiltInTools\\HotReloadAgent.Package\\Microsoft.DotNet.HotReload.Agent.Package.csproj", + "src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.shproj", "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", "test\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj", "test\\Microsoft.Extensions.DotNetDeltaApplier.Tests\\Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj", "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", - "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj", - "test\\Microsoft.WebTools.AspireService.Tests\\Microsoft.WebTools.AspireService.Tests.csproj" + "test\\Microsoft.WebTools.AspireService.Tests\\Microsoft.WebTools.AspireService.Tests.csproj", + "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj" ] } } \ No newline at end of file diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs index 701e9edb8254..33ebd17f8a44 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.DotNet.HotReload; namespace Microsoft.DotNet.Watch { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs index 2ccd307bd6e1..2fade347530f 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DefaultDeltaApplier.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO.Pipes; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.DotNet.HotReload; namespace Microsoft.DotNet.Watch { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs index bac753649d02..897dc710d841 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/DeltaApplier.cs @@ -4,6 +4,7 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.DotNet.HotReload; namespace Microsoft.DotNet.Watch { diff --git a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs index 0cb55835a07a..d241241cc7de 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/NamedPipeContract.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.HotReload; + namespace Microsoft.DotNet.Watch { internal readonly struct UpdatePayload(IReadOnlyList deltas, ResponseLoggingLevel responseLoggingLevel) diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 2fb01d75ea7c..ee602dbfc053 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -38,6 +38,10 @@ + + + + diff --git a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs index e398a63b5985..3c0673244bed 100644 --- a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs +++ b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadAgentTest.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Reflection; +using Microsoft.DotNet.HotReload; using Moq; namespace Microsoft.DotNet.Watch.UnitTests diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index 98ebc8121ae7..d20fb4f271d2 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -810,7 +810,7 @@ public void It_does_not_write_to_undefined_assembly_metadata_attribute(string ta } } - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45148")] [InlineData("netcoreapp3.1", ".NET Core 3.1")] [InlineData("netcoreapp2.1", ".NET Core 2.1")] [InlineData("netstandard2.1", ".NET Standard 2.1")] diff --git a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs index 75780eb586e6..78c5fc317867 100644 --- a/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs +++ b/test/dotnet-watch.Tests/HotReload/UpdatePayloadTests.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.HotReload; + namespace Microsoft.DotNet.Watch.UnitTests { public class UpdatePayloadTests From 2dd1ca054eab8d0a63707c130fce97f213ccdc9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 00:49:32 +0000 Subject: [PATCH 586/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.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.13.0-3.24575.6 -> To Version 4.13.0-3.24576.8 --- 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 f2cf9abfbc98..d5dfa1101fb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 - + https://github.com/dotnet/roslyn - 4d442bae1b527670b0ec23e5fd616b3f88533c4d + ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5a0d50bc0ff6..799c336384d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 - 4.13.0-3.24576.7 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 + 4.13.0-3.24576.8 From 3032e6fb5e8a59b672adf4b55cf14c8fac6d2451 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 01:08:21 +0000 Subject: [PATCH 587/702] Update dependencies from https://github.com/dotnet/razor build 20241126.2 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24575.4 -> To Version 9.0.0-preview.24576.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02d0cc6e050c..fb87b07438b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 37874809ac59eae0b942f23fbb636bd8dff023a5 + 39b22b62f882d716cba4d777180d4d01dde1726b - + https://github.com/dotnet/razor - 37874809ac59eae0b942f23fbb636bd8dff023a5 + 39b22b62f882d716cba4d777180d4d01dde1726b - + https://github.com/dotnet/razor - 37874809ac59eae0b942f23fbb636bd8dff023a5 + 39b22b62f882d716cba4d777180d4d01dde1726b - + https://github.com/dotnet/razor - 37874809ac59eae0b942f23fbb636bd8dff023a5 + 39b22b62f882d716cba4d777180d4d01dde1726b diff --git a/eng/Versions.props b/eng/Versions.props index a6963937dddd..7468807f6f8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24575.4 - 9.0.0-preview.24575.4 - 9.0.0-preview.24575.4 + 9.0.0-preview.24576.2 + 9.0.0-preview.24576.2 + 9.0.0-preview.24576.2 From f1cdc95a47ab3ef4286b254f6ef9f83b49937c6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 01:13:41 +0000 Subject: [PATCH 588/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.9 --- 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 d5dfa1101fb1..6c18866d7e25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d - + https://github.com/dotnet/roslyn - ad5ea4e33458f52d71e544aa6718dd7a1d3682d2 + 769593d814278be1697534898e7d1de0cc18ce0d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 799c336384d5..03e9b604ad03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 - 4.13.0-3.24576.8 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 + 4.13.0-3.24576.9 From 70664ee52e087e08e1f5beba6c46e2f943a442b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 01:26:44 +0000 Subject: [PATCH 589/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241126.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.24576.1 -> To Version 9.0.0-beta.24576.2 --- 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 ab63ca5c1da0..5be2f72048ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink 891854929f588c720666cb9fd0a23f498f76f7d3 diff --git a/eng/Versions.props b/eng/Versions.props index 99878094b8e4..24080532a4eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24576.1 - 9.0.0-beta.24576.1 - 9.0.0-beta.24576.1 - 9.0.0-beta.24576.1 - 9.0.0-beta.24576.1 - 9.0.0-beta.24576.1 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 From a6519305b3b6112f006b2f3ec0e53fac9078d84b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 02:18:14 +0000 Subject: [PATCH 590/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.10 --- 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 6c18866d7e25..177bc0addf33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 - + https://github.com/dotnet/roslyn - 769593d814278be1697534898e7d1de0cc18ce0d + a64a505d8fffb963d1fdea856e08f3cc40d25722 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 03e9b604ad03..2cbd316f0194 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 - 4.13.0-3.24576.9 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 + 4.13.0-3.24576.10 From c27173f13c816d040d2b9663f4a2f3c4e9662765 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 05:25:50 +0000 Subject: [PATCH 591/702] Update dependencies from https://github.com/dotnet/roslyn build 20241126.11 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24576.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 177bc0addf33..01ce38f6cea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 - + https://github.com/dotnet/roslyn - a64a505d8fffb963d1fdea856e08f3cc40d25722 + 6f2ed01d1af9429d874aca1eea60d3212167bc40 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2cbd316f0194..d393372eaec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 - 4.13.0-3.24576.10 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 + 4.13.0-3.24576.11 From d6c0d188cc34d8c134f29fcb84f789bea223e788 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 05:29:00 +0000 Subject: [PATCH 592/702] Update dependencies from https://github.com/dotnet/razor build 20241126.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24575.4 -> To Version 9.0.0-preview.24576.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb87b07438b6..d6a0254fb2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 39b22b62f882d716cba4d777180d4d01dde1726b + 6db4477bba491530b660bea8c98bc6709c6446f7 - + https://github.com/dotnet/razor - 39b22b62f882d716cba4d777180d4d01dde1726b + 6db4477bba491530b660bea8c98bc6709c6446f7 - + https://github.com/dotnet/razor - 39b22b62f882d716cba4d777180d4d01dde1726b + 6db4477bba491530b660bea8c98bc6709c6446f7 - + https://github.com/dotnet/razor - 39b22b62f882d716cba4d777180d4d01dde1726b + 6db4477bba491530b660bea8c98bc6709c6446f7 diff --git a/eng/Versions.props b/eng/Versions.props index 7468807f6f8d..a6fbbb403f8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24576.2 - 9.0.0-preview.24576.2 - 9.0.0-preview.24576.2 + 9.0.0-preview.24576.4 + 9.0.0-preview.24576.4 + 9.0.0-preview.24576.4 From 9150eca6f85c3d5c1136cb7b9c885df843ecca6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 06:59:28 +0000 Subject: [PATCH 593/702] Update dependencies from https://github.com/dotnet/templating build 20241126.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.102-servicing.24575.3 -> To Version 9.0.102-servicing.24576.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 498fba71527c..17dfa00ae3d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c272b53c2cb8..d23b822f57a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,16 +3,16 @@ https://github.com/dotnet/templating - 3b27191a9169f1c5cd881850754d526e394d504e + b1003b44bf4f77613101b9d31a55bb307515bb6d - + https://github.com/dotnet/templating - 3b27191a9169f1c5cd881850754d526e394d504e + b1003b44bf4f77613101b9d31a55bb307515bb6d - + https://github.com/dotnet/templating - 3b27191a9169f1c5cd881850754d526e394d504e + b1003b44bf4f77613101b9d31a55bb307515bb6d diff --git a/eng/Versions.props b/eng/Versions.props index 179234e30a16..6695745ca3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.102-servicing.24575.3 + 9.0.102-servicing.24576.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4985ef2058c47d6b8f2fcc2f598e18d2e52108ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 10:09:16 +0000 Subject: [PATCH 594/702] Update dependencies from https://github.com/dotnet/razor build 20241127.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24576.4 -> To Version 9.0.0-preview.24577.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2ba8b383c8f..877fba8a5c34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 6db4477bba491530b660bea8c98bc6709c6446f7 + 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 - + https://github.com/dotnet/razor - 6db4477bba491530b660bea8c98bc6709c6446f7 + 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 - + https://github.com/dotnet/razor - 6db4477bba491530b660bea8c98bc6709c6446f7 + 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 - + https://github.com/dotnet/razor - 6db4477bba491530b660bea8c98bc6709c6446f7 + 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 diff --git a/eng/Versions.props b/eng/Versions.props index 555142b53856..08daeb46ac8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24576.4 - 9.0.0-preview.24576.4 - 9.0.0-preview.24576.4 + 9.0.0-preview.24577.1 + 9.0.0-preview.24577.1 + 9.0.0-preview.24577.1 From 1af22ec531b7440c209f8d1789040bb6d16939c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 10:13:10 +0000 Subject: [PATCH 595/702] Update dependencies from https://github.com/dotnet/test-templates build 20241127.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24576.1 -> To Version 1.1.0-rtm.24577.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 c272b53c2cb8..663adf43a2cc 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 - 01712257e7ac9363b002637d399206fd93fc724b + 8595a6057f7044358c9c64caa441816196169c2b - + https://github.com/dotnet/test-templates - 01712257e7ac9363b002637d399206fd93fc724b + 8595a6057f7044358c9c64caa441816196169c2b diff --git a/eng/Versions.props b/eng/Versions.props index 179234e30a16..2d17230e665f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ - 1.1.0-rtm.24576.1 + 1.1.0-rtm.24577.1 From 4b54db7dbfcb361da36dae309f2e7e3f3dc9d8dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 10:13:17 +0000 Subject: [PATCH 596/702] Update dependencies from https://github.com/dotnet/test-templates build 20241127.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24576.1 -> To Version 1.1.0-rtm.24577.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 f2ba8b383c8f..c360711a5c18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 01712257e7ac9363b002637d399206fd93fc724b + 8595a6057f7044358c9c64caa441816196169c2b - + https://github.com/dotnet/test-templates - 01712257e7ac9363b002637d399206fd93fc724b + 8595a6057f7044358c9c64caa441816196169c2b diff --git a/eng/Versions.props b/eng/Versions.props index 555142b53856..a08dec14dfe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24576.1 + 1.1.0-rtm.24577.1 From 06d97748b724b25fe7664642280f601c6379d200 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 11:37:58 +0000 Subject: [PATCH 597/702] Update dependencies from https://github.com/dotnet/roslyn build 20241127.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24577.1 --- 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 f2ba8b383c8f..8640bf43fb88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c - + https://github.com/dotnet/roslyn - 6f2ed01d1af9429d874aca1eea60d3212167bc40 + fbb120c5f6c6d7b77791e2204f683c3da1858a6c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 555142b53856..23ecba6b072e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 - 4.13.0-3.24576.11 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 + 4.13.0-3.24577.1 From 78bc3afa194bfc26d22b0ea8157ab87f1c260f0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 12:28:56 +0000 Subject: [PATCH 598/702] Update dependencies from https://github.com/dotnet/roslyn build 20241127.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24577.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8640bf43fb88..e87e9adb45e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 - + https://github.com/dotnet/roslyn - fbb120c5f6c6d7b77791e2204f683c3da1858a6c + 47c27db4a5317be97ce36fe6be69bcdcd15efb36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 23ecba6b072e..c5c89cddd635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 - 4.13.0-3.24577.1 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 + 4.13.0-3.24577.2 From 6f2583a3364330636c53f7f1834bc233d11e3939 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 13:54:26 +0000 Subject: [PATCH 599/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241126.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.24575.2 -> To Version 9.0.0-beta.24576.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 c272b53c2cb8..8d4719df0b4d 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 - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 - + https://github.com/dotnet/sourcelink - cb197e7177e288db2eba6357982f9e7c397951bb + 891854929f588c720666cb9fd0a23f498f76f7d3 diff --git a/eng/Versions.props b/eng/Versions.props index 179234e30a16..d42c091e203b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,12 +277,12 @@ - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 - 9.0.0-beta.24575.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 + 9.0.0-beta.24576.2 From 658566bcb6c7f2d87365233f841a10804b799a34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 15:03:11 +0000 Subject: [PATCH 600/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241127.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.24576.2 -> To Version 9.0.0-beta.24577.1 --- 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 f2ba8b383c8f..c5f2abec2c0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c diff --git a/eng/Versions.props b/eng/Versions.props index 555142b53856..f266ab5c35d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 + 9.0.0-beta.24577.1 + 9.0.0-beta.24577.1 + 9.0.0-beta.24577.1 + 9.0.0-beta.24577.1 + 9.0.0-beta.24577.1 + 9.0.0-beta.24577.1 From e54dcee9f79e46c6b7e36269271a08d038c21e35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 17:17:40 +0000 Subject: [PATCH 601/702] Update dependencies from https://github.com/dotnet/test-templates build 20241127.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24576.1 -> To Version 1.1.0-rtm.24577.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 663adf43a2cc..6f4d1f574f13 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 - 8595a6057f7044358c9c64caa441816196169c2b + 341640ead6075a76b79e84f26d6668b91ca75593 - + https://github.com/dotnet/test-templates - 8595a6057f7044358c9c64caa441816196169c2b + 341640ead6075a76b79e84f26d6668b91ca75593 diff --git a/eng/Versions.props b/eng/Versions.props index 2d17230e665f..fb58dd8ebb38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ - 1.1.0-rtm.24577.1 + 1.1.0-rtm.24577.2 From c53b64128988fbae34537fcded57ee364d1385e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2024 17:17:48 +0000 Subject: [PATCH 602/702] Update dependencies from https://github.com/dotnet/test-templates build 20241127.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24576.1 -> To Version 1.1.0-rtm.24577.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 c360711a5c18..a6769ea98880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 8595a6057f7044358c9c64caa441816196169c2b + 341640ead6075a76b79e84f26d6668b91ca75593 - + https://github.com/dotnet/test-templates - 8595a6057f7044358c9c64caa441816196169c2b + 341640ead6075a76b79e84f26d6668b91ca75593 diff --git a/eng/Versions.props b/eng/Versions.props index a08dec14dfe3..56835faf5bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24577.1 + 1.1.0-rtm.24577.2 From 18bb77155d4515bea9142f27594c01abf4e065fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:53:43 -0800 Subject: [PATCH 603/702] [release/9.0.1xx] [Blazor] Fix hot reload for components with collocated JS files (#45120) Co-authored-by: Mackinnon Buck --- ....NET.Sdk.StaticWebAssets.JSModules.targets | 12 ++++++--- .../ScopedCssIntegrationTests.cs | 25 ++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets index 99a291988b32..c785a7055c80 100644 --- a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets @@ -36,10 +36,14 @@ Copyright (c) .NET Foundation. All rights reserved. $(ResolveCoreStaticWebAssetsDependsOn); - ResolveJSModuleStaticWebAssets; ResolveJsInitializerModuleStaticWebAssets; + + $(ResolveCoreStaticWebAssetsDependsOn); + ResolveJSModuleStaticWebAssets; + + @@ -229,7 +233,7 @@ Copyright (c) .NET Foundation. All rights reserved. > - + - + - + - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 - + https://github.com/dotnet/roslyn - 47c27db4a5317be97ce36fe6be69bcdcd15efb36 + 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c5c89cddd635..8957dc0802e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 - 4.13.0-3.24577.2 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 + 4.13.0-3.24577.4 From e771d2902e4035390e8276e20d0fb3be2660bfdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 00:02:33 +0000 Subject: [PATCH 605/702] Update dependencies from https://github.com/dotnet/razor build 20241127.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24576.4 -> To Version 9.0.0-preview.24577.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877fba8a5c34..607c29c14f09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 + e4d1b9e72afaea34cf4d644bb3e8a16e1910260f - + https://github.com/dotnet/razor - 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 + e4d1b9e72afaea34cf4d644bb3e8a16e1910260f - + https://github.com/dotnet/razor - 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 + e4d1b9e72afaea34cf4d644bb3e8a16e1910260f - + https://github.com/dotnet/razor - 22063f297dfd4bc8d4d4536cea1b3e9c93192a26 + e4d1b9e72afaea34cf4d644bb3e8a16e1910260f diff --git a/eng/Versions.props b/eng/Versions.props index 08daeb46ac8f..e7983f4b542a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24577.1 - 9.0.0-preview.24577.1 - 9.0.0-preview.24577.1 + 9.0.0-preview.24577.4 + 9.0.0-preview.24577.4 + 9.0.0-preview.24577.4 From 9ed8543cabc92fc91fcc15713e099602ad5c18e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 00:58:55 +0000 Subject: [PATCH 606/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241127.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.24576.2 -> To Version 9.0.0-beta.24577.2 --- 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 c5f2abec2c0a..fcc1989b264d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink 928f459936292b3128b949957c7b46ae5ed59e4c diff --git a/eng/Versions.props b/eng/Versions.props index f266ab5c35d7..7957f1e9c354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24577.1 - 9.0.0-beta.24577.1 - 9.0.0-beta.24577.1 - 9.0.0-beta.24577.1 - 9.0.0-beta.24577.1 - 9.0.0-beta.24577.1 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 From 810ea3ecd1ba39e4205a1ee42ddf3d14e43c93c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 04:48:47 +0000 Subject: [PATCH 607/702] Update dependencies from https://github.com/dotnet/razor build 20241127.5 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.24576.4 -> To Version 9.0.0-preview.24577.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 607c29c14f09..a843a5579bf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - e4d1b9e72afaea34cf4d644bb3e8a16e1910260f + 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 - + https://github.com/dotnet/razor - e4d1b9e72afaea34cf4d644bb3e8a16e1910260f + 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 - + https://github.com/dotnet/razor - e4d1b9e72afaea34cf4d644bb3e8a16e1910260f + 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 - + https://github.com/dotnet/razor - e4d1b9e72afaea34cf4d644bb3e8a16e1910260f + 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 diff --git a/eng/Versions.props b/eng/Versions.props index e7983f4b542a..cb4a69b510de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24577.4 - 9.0.0-preview.24577.4 - 9.0.0-preview.24577.4 + 9.0.0-preview.24577.5 + 9.0.0-preview.24577.5 + 9.0.0-preview.24577.5 From 24dfbc571c861888b45d1855f8ee69f24f76dc17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 07:32:39 +0000 Subject: [PATCH 608/702] Update dependencies from https://github.com/dotnet/roslyn build 20241127.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.13.0-3.24576.11 -> To Version 4.13.0-3.24577.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 722f9fb1fde0..613539b6c8b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 - + https://github.com/dotnet/roslyn - 6cc106c0eaa9b0ae070dba3138a23aeab9b50c13 + 522fd8703dfa950fad33ee8b59bc351b47e93ea2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8957dc0802e0..7dbb36828a7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 - 4.13.0-3.24577.4 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 + 4.13.0-3.24577.6 From 8176e520397e307090efe089dbd640d1cac1ed03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 11:55:37 +0000 Subject: [PATCH 609/702] Update dependencies from https://github.com/dotnet/roslyn build 20241128.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24578.1 --- 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 613539b6c8b6..d6f04b9a775b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 - + https://github.com/dotnet/roslyn - 522fd8703dfa950fad33ee8b59bc351b47e93ea2 + 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7dbb36828a7d..1d203bcfbea6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 - 4.13.0-3.24577.6 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 + 4.13.0-3.24578.1 From 5b7efdf122eb8e28a88c224553ff7f157ed53222 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 12:43:35 +0000 Subject: [PATCH 610/702] Update dependencies from https://github.com/dotnet/roslyn build 20241128.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24578.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6f04b9a775b..5b8589390e9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 - + https://github.com/dotnet/roslyn - 07e7e2c13c9e0a72384c8d61eb0b7fa39b0457b5 + 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1d203bcfbea6..cfb8090b0726 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 - 4.13.0-3.24578.1 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 + 4.13.0-3.24578.2 From 2790903eff472412c5e9ec37876dd1e194706e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 13:45:01 +0000 Subject: [PATCH 611/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241127.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.24576.2 -> To Version 9.0.0-beta.24577.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 3b3512529ef9..b7bedc61d8b5 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 - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c - + https://github.com/dotnet/sourcelink - 891854929f588c720666cb9fd0a23f498f76f7d3 + 928f459936292b3128b949957c7b46ae5ed59e4c diff --git a/eng/Versions.props b/eng/Versions.props index b73905c5643f..e33117937a1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -277,12 +277,12 @@ - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 - 9.0.0-beta.24576.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 + 9.0.0-beta.24577.2 From aea4f6375c4dd6d951f2c294dc83ff63270d4b14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 14:39:44 +0000 Subject: [PATCH 612/702] Update dependencies from https://github.com/dotnet/test-templates build 20241128.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24577.2 -> To Version 1.1.0-rtm.24578.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 3b3512529ef9..61326bb81a0b 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 - 341640ead6075a76b79e84f26d6668b91ca75593 + cad654d589408f439a9b8c4ae9e09290a4e757c7 - + https://github.com/dotnet/test-templates - 341640ead6075a76b79e84f26d6668b91ca75593 + cad654d589408f439a9b8c4ae9e09290a4e757c7 diff --git a/eng/Versions.props b/eng/Versions.props index b73905c5643f..afaab70b93d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ - 1.1.0-rtm.24577.2 + 1.1.0-rtm.24578.1 From 83df3344021cc9448026c66ffe27935ddfc18fec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 14:39:53 +0000 Subject: [PATCH 613/702] Update dependencies from https://github.com/dotnet/test-templates build 20241128.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24577.2 -> To Version 1.1.0-rtm.24578.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 55ca785274fb..1a4727886331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 341640ead6075a76b79e84f26d6668b91ca75593 + cad654d589408f439a9b8c4ae9e09290a4e757c7 - + https://github.com/dotnet/test-templates - 341640ead6075a76b79e84f26d6668b91ca75593 + cad654d589408f439a9b8c4ae9e09290a4e757c7 diff --git a/eng/Versions.props b/eng/Versions.props index f1bff4a97b4c..b1940bbe141e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24577.2 + 1.1.0-rtm.24578.1 From 1c8147bbcb65aa6c4e14e486f98a16073544a18d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 15:22:32 +0000 Subject: [PATCH 614/702] Update dependencies from https://github.com/dotnet/fsharp build 20241128.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.200-beta.24561.2 -> To Version 9.0.200-beta.24578.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 55ca785274fb..b32aa6389862 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 8f6b8ad0ace90c777c66711c907227fcfb6f2efe - + https://github.com/dotnet/fsharp - e9dab83bc86ec414b7288d3f8be48a2b14eabb5d + 3dc980eeb06dd912f1e6fe5d06a23a67a4b659e7 - + https://github.com/dotnet/fsharp - e9dab83bc86ec414b7288d3f8be48a2b14eabb5d + 3dc980eeb06dd912f1e6fe5d06a23a67a4b659e7 diff --git a/eng/Versions.props b/eng/Versions.props index f1bff4a97b4c..d509c73af34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ - 13.9.200-beta.24561.2 + 13.9.200-beta.24578.1 From 73a93adcc1e45b3ce60760264927404541fc7eaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2024 20:40:46 +0000 Subject: [PATCH 615/702] Update dependencies from https://github.com/dotnet/roslyn build 20241128.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24578.3 --- 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 5b8589390e9c..30debfe27957 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 - + https://github.com/dotnet/roslyn - 364c1cb183e6ab6a2abb81917ebbe27d00d1dcc1 + 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index cfb8090b0726..078062778f0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 - 4.13.0-3.24578.2 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 + 4.13.0-3.24578.3 From 4b15856324c622b181b188434662941937d04398 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Fri, 29 Nov 2024 00:42:12 -0800 Subject: [PATCH 616/702] 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 From 2867726fa5c8e6c435a86e57e18554bcd6f9dc4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Nov 2024 13:59:37 +0000 Subject: [PATCH 617/702] Update dependencies from https://github.com/dotnet/roslyn build 20241129.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24579.1 --- 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 30debfe27957..35e82e81c4ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 - + https://github.com/dotnet/roslyn - 2e3de1e36cf54c9fe2e835b6608c09b2d5600356 + f6143467d00e1d85d0a2ad2d339c97db1e834d52 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 078062778f0a..69ae51f100c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 - 4.13.0-3.24578.3 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 + 4.13.0-3.24579.1 From 6aa11471de25eea7a3ee7e1f8ad6f415020fe8c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Nov 2024 12:15:56 +0000 Subject: [PATCH 618/702] Update dependencies from https://github.com/dotnet/roslyn build 20241130.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24580.1 --- 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 35e82e81c4ea..3501d876b442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 - + https://github.com/dotnet/roslyn - f6143467d00e1d85d0a2ad2d339c97db1e834d52 + f9f45b924dba2574f6dfd987d11ea7724f24fbd0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 69ae51f100c5..5544145d5787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 - 4.13.0-3.24579.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 + 4.13.0-3.24580.1 From 26f132c984f605b64e07e282c15b691f29c48903 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Nov 2024 19:57:34 +0000 Subject: [PATCH 619/702] Update dependencies from https://github.com/dotnet/roslyn build 20241130.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24580.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3501d876b442..877522c38cfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 - + https://github.com/dotnet/roslyn - f9f45b924dba2574f6dfd987d11ea7724f24fbd0 + 5213c18c0d2d74b688b745a96f7e76e67cb961a0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5544145d5787..ea31b5f7c59b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 - 4.13.0-3.24580.1 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 + 4.13.0-3.24580.2 From dd5ab130bf775acb7800e092a39cae1a6c14f304 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 1 Dec 2024 20:36:06 +0000 Subject: [PATCH 620/702] Update dependencies from https://github.com/dotnet/roslyn build 20241201.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24601.1 --- 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 877522c38cfb..d3c01e634fc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde - + https://github.com/dotnet/roslyn - 5213c18c0d2d74b688b745a96f7e76e67cb961a0 + 6a86f1df4de1d5f4e870d49b1a916709ef738dde https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ea31b5f7c59b..ead3e6b19826 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 - 4.13.0-3.24580.2 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 + 4.13.0-3.24601.1 From b04bd17b356c9e6aee2845987561cccb923e7ebb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 1 Dec 2024 23:20:20 +0000 Subject: [PATCH 621/702] Update dependencies from https://github.com/dotnet/razor build 20241201.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24577.5 -> To Version 9.0.0-preview.24601.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d16f0664a51..529fd5d5e93a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 + db3fecf853512dbb9440a8abd75ed8b266ee075a - + https://github.com/dotnet/razor - 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 + db3fecf853512dbb9440a8abd75ed8b266ee075a - + https://github.com/dotnet/razor - 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 + db3fecf853512dbb9440a8abd75ed8b266ee075a - + https://github.com/dotnet/razor - 5f32f2648d0b10317487b25a9dcd17ea1b45dc13 + db3fecf853512dbb9440a8abd75ed8b266ee075a diff --git a/eng/Versions.props b/eng/Versions.props index 29f4fce8f9e5..719b12a9ac26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -250,9 +250,9 @@ - 9.0.0-preview.24577.5 - 9.0.0-preview.24577.5 - 9.0.0-preview.24577.5 + 9.0.0-preview.24601.1 + 9.0.0-preview.24601.1 + 9.0.0-preview.24601.1 From 372c9f0618287e7062860f054dd5fe758e2e56b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 08:22:01 +0000 Subject: [PATCH 622/702] Update dependencies from https://github.com/dotnet/roslyn build 20241201.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24601.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3c01e634fc3..3836a8003908 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 - + https://github.com/dotnet/roslyn - 6a86f1df4de1d5f4e870d49b1a916709ef738dde + 7937c02f5411a34e17e4d090d69a291bd25ac510 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ead3e6b19826..0011b255ac78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 - 4.13.0-3.24601.1 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 + 4.13.0-3.24601.2 From 7b747a809b091d9fbeb623bbfdfc6bdff13ba827 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 10:10:06 +0000 Subject: [PATCH 623/702] Update dependencies from https://github.com/dotnet/test-templates build 20241202.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24578.1 -> To Version 1.1.0-rtm.24602.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 d0bc066e9892..dcfa97708e83 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 - cad654d589408f439a9b8c4ae9e09290a4e757c7 + 7744cf50ba66bd64c44c6c7d7dc22000ae526618 - + https://github.com/dotnet/test-templates - cad654d589408f439a9b8c4ae9e09290a4e757c7 + 7744cf50ba66bd64c44c6c7d7dc22000ae526618 diff --git a/eng/Versions.props b/eng/Versions.props index abc30bef089c..e35c02e3c544 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ - 1.1.0-rtm.24578.1 + 1.1.0-rtm.24602.1 From 041ca4c87bfc984990d664f287c38c5d19b936c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 10:10:13 +0000 Subject: [PATCH 624/702] Update dependencies from https://github.com/dotnet/test-templates build 20241202.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24578.1 -> To Version 1.1.0-rtm.24602.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 529fd5d5e93a..a270a8f6ef23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - cad654d589408f439a9b8c4ae9e09290a4e757c7 + 7744cf50ba66bd64c44c6c7d7dc22000ae526618 - + https://github.com/dotnet/test-templates - cad654d589408f439a9b8c4ae9e09290a4e757c7 + 7744cf50ba66bd64c44c6c7d7dc22000ae526618 diff --git a/eng/Versions.props b/eng/Versions.props index 719b12a9ac26..f7cc840c1320 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,7 +101,7 @@ - 1.1.0-rtm.24578.1 + 1.1.0-rtm.24602.1 From d5769900224c9a2e5e43b3c83f1b4eee23bed6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 14:43:34 +0000 Subject: [PATCH 625/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241202.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.24577.2 -> To Version 9.0.0-beta.24602.1 --- 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 529fd5d5e93a..02e9bb79bb1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink - 928f459936292b3128b949957c7b46ae5ed59e4c + bf9eea4cf019e8f86e7fae35380533eae25f487e diff --git a/eng/Versions.props b/eng/Versions.props index 719b12a9ac26..0078cb6a2e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24577.2 - 9.0.0-beta.24577.2 - 9.0.0-beta.24577.2 - 9.0.0-beta.24577.2 - 9.0.0-beta.24577.2 - 9.0.0-beta.24577.2 + 9.0.0-beta.24602.1 + 9.0.0-beta.24602.1 + 9.0.0-beta.24602.1 + 9.0.0-beta.24602.1 + 9.0.0-beta.24602.1 + 9.0.0-beta.24602.1 From 126df5a0a9a45a82a435eb1492b10ed9d754c9b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 18:04:30 +0000 Subject: [PATCH 626/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.1 --- 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 3836a8003908..c04fdd56b6e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 - + https://github.com/dotnet/roslyn - 7937c02f5411a34e17e4d090d69a291bd25ac510 + 2de6a28b9c7266709813df85e35d2cbc1770f9c0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0011b255ac78..b7e98db8af28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 - 4.13.0-3.24601.2 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 + 4.13.0-3.24602.1 From e66b5fdaaff54334115653896c3be47e6c583176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 18:27:55 +0000 Subject: [PATCH 627/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c04fdd56b6e4..5a1d29284e30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 - + https://github.com/dotnet/roslyn - 2de6a28b9c7266709813df85e35d2cbc1770f9c0 + eb9e33eef0e6e366de7ae6c89b0334d88984bb52 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b7e98db8af28..e1fac8c1e15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 - 4.13.0-3.24602.1 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 + 4.13.0-3.24602.2 From 848af757f6c074d267b7e0f8574d9e34363fc0f0 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 2 Dec 2024 19:06:16 +0000 Subject: [PATCH 628/702] Add prebuilt exclusions --- eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 3d0527bc5ad8..b729cc725f8c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -45,6 +45,11 @@ + + + + + From 30c936d389e8a12cd81c29bdeff863e5e29eb434 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 19:54:05 +0000 Subject: [PATCH 629/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.3 --- 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 5a1d29284e30..be5db2c7f8e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 - + https://github.com/dotnet/roslyn - eb9e33eef0e6e366de7ae6c89b0334d88984bb52 + dd4ff9c3824f7faee882872a778a38eec1d24ed7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e1fac8c1e15e..e3b500cb486f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 - 4.13.0-3.24602.2 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 + 4.13.0-3.24602.3 From c3a07354aa7303f5eaff3a17d9d29cb18fd6dbe5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 20:41:35 +0000 Subject: [PATCH 630/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be5db2c7f8e1..94239d24c5d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc - + https://github.com/dotnet/roslyn - dd4ff9c3824f7faee882872a778a38eec1d24ed7 + 31ac7e26e96422d3337d2d1039be9583249df8cc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e3b500cb486f..ceee5671d9c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 - 4.13.0-3.24602.3 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 + 4.13.0-3.24602.4 From 041e5e4f8a818e0181e4f7ffc3075e1d9eb8297a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 21:12:43 +0000 Subject: [PATCH 631/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94239d24c5d3..5860747af4e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 - + https://github.com/dotnet/roslyn - 31ac7e26e96422d3337d2d1039be9583249df8cc + b1d67343194541819fb3010c2b9b1f2327c53ee0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ceee5671d9c1..03ecfcb1246d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 - 4.13.0-3.24602.4 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 + 4.13.0-3.24602.5 From b5757e54cf96b93ba8e13840d1deffbc03fdaaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Mon, 2 Dec 2024 13:30:12 -0800 Subject: [PATCH 632/702] Use WebAssemblyHotReloadCapabilities project property (#45055) --- .../BlazorWebAssemblyDeltaApplier.cs | 132 ++++-------------- .../BlazorWebAssemblyHostedDeltaApplier.cs | 5 +- .../HotReload/CompilationHandler.cs | 9 +- .../Utilities/ProjectGraphNodeExtensions.cs | 4 + .../HotReload/ApplyDeltaTests.cs | 29 +++- 5 files changed, 68 insertions(+), 111 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs index 33ebd17f8a44..ef22b5f8ffc5 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyDeltaApplier.cs @@ -3,19 +3,27 @@ using System.Buffers; using System.Collections.Immutable; +using Microsoft.Build.Graph; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; using Microsoft.DotNet.HotReload; namespace Microsoft.DotNet.Watch { - internal sealed class BlazorWebAssemblyDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, Version? targetFrameworkVersion) : SingleProcessDeltaApplier(reporter) + internal sealed class BlazorWebAssemblyDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, ProjectGraphNode project) : SingleProcessDeltaApplier(reporter) { - private const string DefaultCapabilities60 = "Baseline"; - private const string DefaultCapabilities70 = "Baseline AddMethodToExistingType AddStaticFieldToExistingType NewTypeDefinition ChangeCustomAttributes"; - private const string DefaultCapabilities80 = "Baseline AddMethodToExistingType AddStaticFieldToExistingType NewTypeDefinition ChangeCustomAttributes AddInstanceFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod UpdateParameters GenericAddFieldToExistingType"; + private static readonly ImmutableArray s_defaultCapabilities60 = + ["Baseline"]; + + private static readonly ImmutableArray s_defaultCapabilities70 = + ["Baseline", "AddMethodToExistingType", "AddStaticFieldToExistingType", "NewTypeDefinition", "ChangeCustomAttributes"]; + + private static readonly ImmutableArray s_defaultCapabilities80 = + ["Baseline", "AddMethodToExistingType", "AddStaticFieldToExistingType", "NewTypeDefinition", "ChangeCustomAttributes", + "AddInstanceFieldToExistingType", "GenericAddMethodToExistingType", "GenericUpdateMethod", "UpdateParameters", "GenericAddFieldToExistingType"]; + + private static readonly ImmutableArray s_defaultCapabilities90 = + s_defaultCapabilities80; - private ImmutableArray _cachedCapabilities; - private readonly SemaphoreSlim _capabilityRetrievalSemaphore = new(initialCount: 1); private int _updateId; public override void Dispose() @@ -32,109 +40,31 @@ public override async Task WaitForProcessRunningAsync(CancellationToken cancella // Alternatively, we could inject agent into blazor-devserver.dll and establish a connection on the named pipe. => await browserRefreshServer.WaitForClientConnectionAsync(cancellationToken); - public override async Task> GetApplyUpdateCapabilitiesAsync(CancellationToken cancellationToken) + public override Task> GetApplyUpdateCapabilitiesAsync(CancellationToken cancellationToken) { - var cachedCapabilities = _cachedCapabilities; - if (!cachedCapabilities.IsDefault) - { - return cachedCapabilities; - } + var capabilities = project.GetWebAssemblyCapabilities(); - await _capabilityRetrievalSemaphore.WaitAsync(cancellationToken); - try - { - if (_cachedCapabilities.IsDefault) - { - _cachedCapabilities = await RetrieveAsync(cancellationToken); - } - } - finally + if (capabilities.IsEmpty) { - _capabilityRetrievalSemaphore.Release(); - } + var targetFramework = project.GetTargetFrameworkVersion(); - return _cachedCapabilities; - - async Task> RetrieveAsync(CancellationToken cancellationToken) - { - var buffer = ArrayPool.Shared.Rent(32 * 1024); + Reporter.Verbose($"Using capabilities based on target framework: '{targetFramework}'."); - try + capabilities = targetFramework?.Major switch { - Reporter.Verbose("Connecting to the browser."); - - await browserRefreshServer.WaitForClientConnectionAsync(cancellationToken); - - string capabilities; - if (browserRefreshServer.Options.TestFlags.HasFlag(TestFlags.MockBrowser)) - { - // When testing return default capabilities without connecting to an actual browser. - capabilities = GetDefaultCapabilities(targetFrameworkVersion); - } - else - { - string? capabilityString = null; - - await browserRefreshServer.SendAndReceiveAsync( - request: _ => default(JsonGetApplyUpdateCapabilitiesRequest), - response: (value, reporter) => - { - var str = Encoding.UTF8.GetString(value); - if (str.StartsWith('!')) - { - reporter.Verbose($"Exception while reading WASM runtime capabilities: {str[1..]}"); - } - else if (str.Length == 0) - { - reporter.Verbose($"Unable to read WASM runtime capabilities"); - } - else if (capabilityString == null) - { - capabilityString = str; - } - else if (capabilityString != str) - { - reporter.Verbose($"Received different capabilities from different browsers:{Environment.NewLine}'{str}'{Environment.NewLine}'{capabilityString}'"); - } - }, - cancellationToken); - - if (capabilityString != null) - { - capabilities = capabilityString; - } - else - { - capabilities = GetDefaultCapabilities(targetFrameworkVersion); - Reporter.Verbose($"Falling back to default WASM capabilities: '{capabilities}'"); - } - } - - // Capabilities are expressed a space-separated string. - // e.g. https://github.com/dotnet/runtime/blob/14343bdc281102bf6fffa1ecdd920221d46761bc/src/coreclr/System.Private.CoreLib/src/System/Reflection/Metadata/AssemblyExtensions.cs#L87 - return capabilities.Split(' ').ToImmutableArray(); - } - catch (Exception e) when (!cancellationToken.IsCancellationRequested) - { - Reporter.Error($"Failed to read capabilities: {e.Message}"); - - // Do not attempt to retrieve capabilities again if it fails once, unless the operation is canceled. - return []; - } - finally - { - ArrayPool.Shared.Return(buffer); - } + 9 => s_defaultCapabilities90, + 8 => s_defaultCapabilities80, + 7 => s_defaultCapabilities70, + 6 => s_defaultCapabilities60, + _ => [], + }; + } + else + { + Reporter.Verbose($"Project specifies capabilities."); } - static string GetDefaultCapabilities(Version? targetFrameworkVersion) - => targetFrameworkVersion?.Major switch - { - >= 8 => DefaultCapabilities80, - >= 7 => DefaultCapabilities70, - >= 6 => DefaultCapabilities60, - _ => string.Empty, - }; + return Task.FromResult(capabilities); } public override async Task Apply(ImmutableArray updates, CancellationToken cancellationToken) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs index 1eda8a6f7986..f2eb00de24bc 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/BlazorWebAssemblyHostedDeltaApplier.cs @@ -3,13 +3,14 @@ using System.Collections.Immutable; +using Microsoft.Build.Graph; using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; namespace Microsoft.DotNet.Watch { - internal sealed class BlazorWebAssemblyHostedDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, Version? targetFrameworkVersion) : DeltaApplier(reporter) + internal sealed class BlazorWebAssemblyHostedDeltaApplier(IReporter reporter, BrowserRefreshServer browserRefreshServer, ProjectGraphNode project) : DeltaApplier(reporter) { - private readonly BlazorWebAssemblyDeltaApplier _wasmApplier = new(reporter, browserRefreshServer, targetFrameworkVersion); + private readonly BlazorWebAssemblyDeltaApplier _wasmApplier = new(reporter, browserRefreshServer, project); private readonly DefaultDeltaApplier _hostApplier = new(reporter); public override void Dispose() diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index a80f0982d477..a2c8b0a906ff 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -103,11 +103,11 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken) _reporter.Report(MessageDescriptor.HotReloadSessionStarted); } - private static DeltaApplier CreateDeltaApplier(HotReloadProfile profile, Version? targetFramework, BrowserRefreshServer? browserRefreshServer, IReporter processReporter) + private static DeltaApplier CreateDeltaApplier(HotReloadProfile profile, ProjectGraphNode project, BrowserRefreshServer? browserRefreshServer, IReporter processReporter) => profile switch { - HotReloadProfile.BlazorWebAssembly => new BlazorWebAssemblyDeltaApplier(processReporter, browserRefreshServer!, targetFramework), - HotReloadProfile.BlazorHosted => new BlazorWebAssemblyHostedDeltaApplier(processReporter, browserRefreshServer!, targetFramework), + HotReloadProfile.BlazorWebAssembly => new BlazorWebAssemblyDeltaApplier(processReporter, browserRefreshServer!, project), + HotReloadProfile.BlazorHosted => new BlazorWebAssemblyHostedDeltaApplier(processReporter, browserRefreshServer!, project), _ => new DefaultDeltaApplier(processReporter), }; @@ -125,8 +125,7 @@ private static DeltaApplier CreateDeltaApplier(HotReloadProfile profile, Version { var projectPath = projectNode.ProjectInstance.FullPath; - var targetFramework = projectNode.GetTargetFrameworkVersion(); - var deltaApplier = CreateDeltaApplier(profile, targetFramework, browserRefreshServer, processReporter); + var deltaApplier = CreateDeltaApplier(profile, projectNode, browserRefreshServer, processReporter); var processExitedSource = new CancellationTokenSource(); var processCommunicationCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(processExitedSource.Token, cancellationToken); diff --git a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs index e694587fe30a..9df4691e434c 100644 --- a/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs +++ b/src/BuiltInTools/dotnet-watch/Utilities/ProjectGraphNodeExtensions.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections.Immutable; using Microsoft.Build.Graph; using Microsoft.DotNet.Cli; @@ -17,6 +18,9 @@ public static string GetTargetFramework(this ProjectGraphNode projectNode) public static Version? GetTargetFrameworkVersion(this ProjectGraphNode projectNode) => EnvironmentVariableNames.TryParseTargetFrameworkVersion(projectNode.ProjectInstance.GetPropertyValue("TargetFrameworkVersion")); + public static ImmutableArray GetWebAssemblyCapabilities(this ProjectGraphNode projectNode) + => [.. projectNode.ProjectInstance.GetPropertyValue("WebAssemblyHotReloadCapabilities").Split(';').Select(static c => c.Trim()).Where(static c => c != "")]; + public static bool IsTargetFrameworkVersionOrNewer(this ProjectGraphNode projectNode, Version minVersion) => GetTargetFrameworkVersion(projectNode) is { } version && version >= minVersion; diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 17ebffa1105f..726f2426e376 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -231,12 +231,25 @@ class AppUpdateHandler } } - [Fact] - public async Task BlazorWasm() + [Theory] + [CombinatorialData] + public async Task BlazorWasm(bool projectSpecifiesCapabilities) { - var testAsset = TestAssets.CopyTestAsset("WatchBlazorWasm") + var testAsset = TestAssets.CopyTestAsset("WatchBlazorWasm", identifier: projectSpecifiesCapabilities.ToString()) .WithSource(); + if (projectSpecifiesCapabilities) + { + testAsset = testAsset.WithProjectChanges(proj => + { + proj.Root.Descendants() + .First(e => e.Name.LocalName == "PropertyGroup") + .Add(XElement.Parse(""" + Baseline;AddMethodToExistingType + """)); + }); + } + var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser); @@ -256,6 +269,16 @@ public async Task BlazorWasm() UpdateSourceFile(Path.Combine(testAsset.Path, "Pages", "Index.razor"), newSource); await App.AssertOutputLineStartsWith(MessageDescriptor.HotReloadSucceeded, "blazorwasm (net9.0)"); + + // check project specified capapabilities: + if (projectSpecifiesCapabilities) + { + App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: Baseline AddMethodToExistingType."); + } + else + { + App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType NewTypeDefinition ChangeCustomAttributes AddInstanceFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod UpdateParameters GenericAddFieldToExistingType."); + } } [Fact] From 9eb9af4527eda2978fb07f8309514424c7eb07f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Mon, 2 Dec 2024 14:24:16 -0800 Subject: [PATCH 633/702] Enable debug logging from middleware in --verbose mode (#45254) --- .../BlazorWasmHotReloadMiddleware.cs | 4 +- .../BrowserRefreshMiddleware.cs | 34 ++++++++----- .../BrowserRefresh/BrowserScriptMiddleware.cs | 21 +++++--- .../BrowserRefresh/HostingStartup.cs | 4 +- .../Browser/BrowserRefreshServer.cs | 6 +++ .../dotnet-watch/HotReload/ProjectLauncher.cs | 8 ++- .../BlazorWasmHotReloadMiddlewareTest.cs | 50 +++++++++---------- .../BrowserScriptMiddlewareTest.cs | 26 +++++++--- .../HotReload/ApplyDeltaTests.cs | 12 ++++- 9 files changed, 107 insertions(+), 58 deletions(-) diff --git a/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs index aa58d083c712..6ccdd09f6bc3 100644 --- a/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BlazorWasmHotReloadMiddleware.cs @@ -3,6 +3,7 @@ using System.Text.Json; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { @@ -35,8 +36,9 @@ internal sealed class Delta PropertyNamingPolicy = JsonNamingPolicy.CamelCase, }; - public BlazorWasmHotReloadMiddleware(RequestDelegate next) + public BlazorWasmHotReloadMiddleware(RequestDelegate next, ILogger logger) { + logger.LogDebug("Middleware loaded"); } internal List Updates { get; } = []; diff --git a/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs index 07a687d7e315..8def7c99c239 100644 --- a/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs @@ -9,13 +9,23 @@ namespace Microsoft.AspNetCore.Watch.BrowserRefresh { - public sealed class BrowserRefreshMiddleware(RequestDelegate next, ILogger logger) + public sealed class BrowserRefreshMiddleware { private static readonly MediaTypeHeaderValue s_textHtmlMediaType = new("text/html"); private static readonly MediaTypeHeaderValue s_applicationJsonMediaType = new("application/json"); + private readonly RequestDelegate _next; + private readonly ILogger _logger; private string? _dotnetModifiableAssemblies = GetNonEmptyEnvironmentVariableValue("DOTNET_MODIFIABLE_ASSEMBLIES"); private string? _aspnetcoreBrowserTools = GetNonEmptyEnvironmentVariableValue("__ASPNETCORE_BROWSER_TOOLS"); + public BrowserRefreshMiddleware(RequestDelegate next, ILogger logger) + { + _next = next; + _logger = logger; + + logger.LogDebug("Middleware loaded: DOTNET_MODIFIABLE_ASSEMBLIES={ModifiableAssemblies}, __ASPNETCORE_BROWSER_TOOLS={BrowserTools}", _dotnetModifiableAssemblies, _aspnetcoreBrowserTools); + } + private static string? GetNonEmptyEnvironmentVariableValue(string name) => Environment.GetEnvironmentVariable(name) is { Length: > 0 } value ? value : null; @@ -24,18 +34,18 @@ public async Task InvokeAsync(HttpContext context) if (IsWebAssemblyBootRequest(context)) { AttachWebAssemblyHeaders(context); - await next(context); + await _next(context); } else if (IsBrowserDocumentRequest(context)) { // Use a custom StreamWrapper to rewrite output on Write/WriteAsync - using var responseStreamWrapper = new ResponseStreamWrapper(context, logger); + using var responseStreamWrapper = new ResponseStreamWrapper(context, _logger); var originalBodyFeature = context.Features.Get(); context.Features.Set(new StreamResponseBodyFeature(responseStreamWrapper)); try { - await next(context); + await _next(context); } finally { @@ -46,21 +56,21 @@ public async Task InvokeAsync(HttpContext context) { if (responseStreamWrapper.ScriptInjectionPerformed) { - Log.BrowserConfiguredForRefreshes(logger); + Log.BrowserConfiguredForRefreshes(_logger); } else if (context.Response.Headers.TryGetValue(HeaderNames.ContentEncoding, out var contentEncodings)) { - Log.ResponseCompressionDetected(logger, contentEncodings); + Log.ResponseCompressionDetected(_logger, contentEncodings); } else { - Log.FailedToConfiguredForRefreshes(logger); + Log.FailedToConfiguredForRefreshes(_logger); } } } else { - await next(context); + await _next(context); } } @@ -76,12 +86,12 @@ private void AttachWebAssemblyHeaders(HttpContext context) } else { - logger.LogDebug("DOTNET_MODIFIABLE_ASSEMBLIES environment variable is not set, likely because hot reload is not enabled. The browser refresh feature may not work as expected."); + _logger.LogDebug("DOTNET_MODIFIABLE_ASSEMBLIES environment variable is not set, likely because hot reload is not enabled. The browser refresh feature may not work as expected."); } } else { - logger.LogDebug("DOTNET-MODIFIABLE-ASSEMBLIES header is already set."); + _logger.LogDebug("DOTNET-MODIFIABLE-ASSEMBLIES header is already set."); } if (!context.Response.Headers.ContainsKey("ASPNETCORE-BROWSER-TOOLS")) @@ -92,12 +102,12 @@ private void AttachWebAssemblyHeaders(HttpContext context) } else { - logger.LogDebug("__ASPNETCORE_BROWSER_TOOLS environment variable is not set. The browser refresh feature may not work as expected."); + _logger.LogDebug("__ASPNETCORE_BROWSER_TOOLS environment variable is not set. The browser refresh feature may not work as expected."); } } else { - logger.LogDebug("ASPNETCORE-BROWSER-TOOLS header is already set."); + _logger.LogDebug("ASPNETCORE-BROWSER-TOOLS header is already set."); } return Task.CompletedTask; diff --git a/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs b/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs index 9c5111df61d7..167be5d4aec6 100644 --- a/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs +++ b/src/BuiltInTools/BrowserRefresh/BrowserScriptMiddleware.cs @@ -3,6 +3,7 @@ using System.Globalization; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { @@ -12,13 +13,19 @@ namespace Microsoft.AspNetCore.Watch.BrowserRefresh /// public sealed class BrowserScriptMiddleware { - private readonly byte[] _scriptBytes; + private readonly PathString _scriptPath; + private readonly ReadOnlyMemory _scriptBytes; + private readonly ILogger _logger; private readonly string _contentLength; - public BrowserScriptMiddleware(RequestDelegate next, byte[] scriptBytes) + public BrowserScriptMiddleware(RequestDelegate next, PathString scriptPath, ReadOnlyMemory scriptBytes, ILogger logger) { + _scriptPath = scriptPath; _scriptBytes = scriptBytes; + _logger = logger; _contentLength = _scriptBytes.Length.ToString(CultureInfo.InvariantCulture); + + logger.LogDebug("Middleware loaded. Script {scriptPath} ({size} B).", scriptPath, _contentLength); } public async Task InvokeAsync(HttpContext context) @@ -27,11 +34,13 @@ public async Task InvokeAsync(HttpContext context) context.Response.Headers["Content-Length"] = _contentLength; context.Response.Headers["Content-Type"] = "application/javascript; charset=utf-8"; - await context.Response.Body.WriteAsync(_scriptBytes.AsMemory(), context.RequestAborted); + await context.Response.Body.WriteAsync(_scriptBytes, context.RequestAborted); + + _logger.LogDebug("Script injected: {scriptPath}", _scriptPath); } // for backwards compat only - internal static byte[] GetBlazorHotReloadJS() + internal static ReadOnlyMemory GetBlazorHotReloadJS() { var jsFileName = "Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorHotReload.js"; using var stream = new MemoryStream(); @@ -41,7 +50,7 @@ internal static byte[] GetBlazorHotReloadJS() return stream.ToArray(); } - internal static byte[] GetBrowserRefreshJS() + internal static ReadOnlyMemory GetBrowserRefreshJS() { var endpoint = Environment.GetEnvironmentVariable("ASPNETCORE_AUTO_RELOAD_WS_ENDPOINT")!; var serverKey = Environment.GetEnvironmentVariable("ASPNETCORE_AUTO_RELOAD_WS_KEY") ?? string.Empty; @@ -49,7 +58,7 @@ internal static byte[] GetBrowserRefreshJS() return GetWebSocketClientJavaScript(endpoint, serverKey); } - internal static byte[] GetWebSocketClientJavaScript(string hostString, string serverKey) + internal static ReadOnlyMemory GetWebSocketClientJavaScript(string hostString, string serverKey) { var jsFileName = "Microsoft.AspNetCore.Watch.BrowserRefresh.WebSocketScriptInjection.js"; using var reader = new StreamReader(typeof(WebSocketScriptInjection).Assembly.GetManifestResourceStream(jsFileName)!); diff --git a/src/BuiltInTools/BrowserRefresh/HostingStartup.cs b/src/BuiltInTools/BrowserRefresh/HostingStartup.cs index d68a6e2e4b92..369133ccbec3 100644 --- a/src/BuiltInTools/BrowserRefresh/HostingStartup.cs +++ b/src/BuiltInTools/BrowserRefresh/HostingStartup.cs @@ -44,11 +44,11 @@ public Action Configure(Action next) app.Map(ApplicationPaths.BlazorHotReloadMiddleware, static app => app.UseMiddleware()); app.Map(ApplicationPaths.BrowserRefreshJS, - static app => app.UseMiddleware(BrowserScriptMiddleware.GetBrowserRefreshJS())); + static app => app.UseMiddleware(ApplicationPaths.BrowserRefreshJS, BrowserScriptMiddleware.GetBrowserRefreshJS())); // backwards compat only: app.Map(ApplicationPaths.BlazorHotReloadJS, - static app => app.UseMiddleware(BrowserScriptMiddleware.GetBlazorHotReloadJS())); + static app => app.UseMiddleware(ApplicationPaths.BlazorHotReloadJS, BrowserScriptMiddleware.GetBlazorHotReloadJS())); }); app.UseMiddleware(); diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs index 274a9c7dfcdf..0f7c737e5687 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs @@ -83,6 +83,12 @@ public void SetEnvironmentVariables(EnvironmentVariablesBuilder environmentBuild environmentBuilder.DotNetStartupHookDirective.Add(Path.Combine(AppContext.BaseDirectory, "middleware", "Microsoft.AspNetCore.Watch.BrowserRefresh.dll")); environmentBuilder.AspNetCoreHostingStartupAssembliesVariable.Add("Microsoft.AspNetCore.Watch.BrowserRefresh"); + + if (_reporter.IsVerbose) + { + // enable debug logging from middleware: + environmentBuilder.SetVariable("Logging__LogLevel__Microsoft.AspNetCore.Watch", "Debug"); + } } public string GetServerKey() diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs index 91d461a59a50..46a33b2b301d 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs @@ -80,10 +80,16 @@ public EnvironmentOptions EnvironmentOptions environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatch, "1"); environmentBuilder.SetVariable(EnvironmentVariables.Names.DotnetWatchIteration, (Iteration + 1).ToString(CultureInfo.InvariantCulture)); + // Note: + // Microsoft.AspNetCore.Components.WebAssembly.Server.ComponentWebAssemblyConventions and Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserRefreshMiddleware + // expect DOTNET_MODIFIABLE_ASSEMBLIES to be set in the blazor-devserver process, even though we are not performing Hot Reload in this process. + // The value is converted to DOTNET-MODIFIABLE-ASSEMBLIES header, which is in turn converted back to environment variable in Mono browser runtime loader: + // https://github.com/dotnet/runtime/blob/342936c5a88653f0f622e9d6cb727a0e59279b31/src/mono/browser/runtime/loader/config.ts#L330 + environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetModifiableAssemblies, "debug"); + if (injectDeltaApplier) { environmentBuilder.DotNetStartupHookDirective.Add(DeltaApplier.StartupHookPath); - environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetModifiableAssemblies, "debug"); environmentBuilder.SetDirective(EnvironmentVariables.Names.DotnetWatchHotReloadNamedPipeName, namedPipeName); // Do not ask agent to log to stdout until https://github.com/dotnet/sdk/issues/40484 is fixed. diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs index 59d3f6dcb488..efdcf548c524 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BlazorWasmHotReloadMiddlewareTest.cs @@ -3,16 +3,25 @@ using System.Text.Json; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { public class BlazorWasmHotReloadMiddlewareTest { + private readonly ILogger _logger; + private BlazorWasmHotReloadMiddleware _middleware; + + public BlazorWasmHotReloadMiddlewareTest() + { + var loggerFactory = LoggerFactory.Create(_ => { }); + _logger = loggerFactory.CreateLogger(); + _middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException(), _logger); + } + [Fact] public async Task DeltasAreSavedOnPost() { - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var context = new DefaultHttpContext(); context.Request.Method = "post"; var update = new BlazorWasmHotReloadMiddleware.Update @@ -41,16 +50,14 @@ public async Task DeltasAreSavedOnPost() context.Request.Body = GetJson(update); - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); - AssertUpdates([update], middleware.Updates); + AssertUpdates([update], _middleware.Updates); } [Fact] public async Task DuplicateDeltasOnPostAreIgnored() { - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var updates = new BlazorWasmHotReloadMiddleware.Update[] { new() @@ -89,22 +96,19 @@ public async Task DuplicateDeltasOnPostAreIgnored() context.Request.Method = "post"; context.Request.Body = GetJson(updates[0]); - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); context = new DefaultHttpContext(); context.Request.Method = "post"; context.Request.Body = GetJson(updates[1]); - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); - // Assert - AssertUpdates(updates, middleware.Updates); + AssertUpdates(updates, _middleware.Updates); } [Fact] public async Task MultipleDeltaPayloadsCanBeAccepted() { - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - var update = new BlazorWasmHotReloadMiddleware.Update() { Id = 0, @@ -132,7 +136,7 @@ public async Task MultipleDeltaPayloadsCanBeAccepted() var context = new DefaultHttpContext(); context.Request.Method = "post"; context.Request.Body = GetJson(update); - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); var newUpdate = new BlazorWasmHotReloadMiddleware.Update() { @@ -169,35 +173,29 @@ public async Task MultipleDeltaPayloadsCanBeAccepted() context = new DefaultHttpContext(); context.Request.Method = "post"; context.Request.Body = GetJson(newUpdate); - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); - AssertUpdates([update, newUpdate], middleware.Updates); + AssertUpdates([update, newUpdate], _middleware.Updates); } [Fact] public async Task Get_Returns204_IfNoDeltasPresent() { - // Arrange var context = new DefaultHttpContext(); context.Request.Method = "get"; - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); - - // Act - await middleware.InvokeAsync(context); + + await _middleware.InvokeAsync(context); - // Assert Assert.Equal(204, context.Response.StatusCode); } [Fact] public async Task GetReturnsDeltas() { - // Arrange var context = new DefaultHttpContext(); context.Request.Method = "get"; var stream = new MemoryStream(); context.Response.Body = stream; - var middleware = new BlazorWasmHotReloadMiddleware(context => throw new TimeZoneNotFoundException()); var updates = new List { new() @@ -224,12 +222,10 @@ public async Task GetReturnsDeltas() ] } }; - middleware.Updates.AddRange(updates); + _middleware.Updates.AddRange(updates); - // Act - await middleware.InvokeAsync(context); + await _middleware.InvokeAsync(context); - // Assert Assert.Equal(200, context.Response.StatusCode); Assert.Equal( JsonSerializer.SerializeToUtf8Bytes(updates, new JsonSerializerOptions(JsonSerializerDefaults.Web)), diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserScriptMiddlewareTest.cs b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserScriptMiddlewareTest.cs index ee20f24e0fa0..19621f84cc92 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserScriptMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserScriptMiddlewareTest.cs @@ -2,26 +2,35 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Watch.BrowserRefresh { public class BrowserScriptMiddlewareTest { private readonly RequestDelegate _next = (context) => Task.CompletedTask; + private readonly ILogger _logger; + + public BrowserScriptMiddlewareTest() + { + var loggerFactory = LoggerFactory.Create(_ => { }); + _logger = loggerFactory.CreateLogger(); + } [Fact] public async Task InvokeAsync_ReturnsScript() { - // Arrange var context = new DefaultHttpContext(); var stream = new MemoryStream(); context.Response.Body = stream; - var middleware = new BrowserScriptMiddleware(_next, BrowserScriptMiddleware.GetWebSocketClientJavaScript("some-host", "test-key")); + var middleware = new BrowserScriptMiddleware( + _next, + new PathString("/script.js"), + BrowserScriptMiddleware.GetWebSocketClientJavaScript("some-host", "test-key"), + _logger); - // Act await middleware.InvokeAsync(context); - // Assert stream.Position = 0; var script = Encoding.UTF8.GetString(stream.ToArray()); Assert.Contains("// dotnet-watch browser reload script", script); @@ -32,15 +41,16 @@ public async Task InvokeAsync_ReturnsScript() [Fact] public async Task InvokeAsync_ConfiguresHeaders() { - // Arrange var context = new DefaultHttpContext(); context.Response.Body = new MemoryStream(); - var middleware = new BrowserScriptMiddleware(_next, BrowserScriptMiddleware.GetWebSocketClientJavaScript("some-host", "test-key")); + var middleware = new BrowserScriptMiddleware( + _next, + new PathString("/script.js"), + BrowserScriptMiddleware.GetWebSocketClientJavaScript("some-host", "test-key"), + _logger); - // Act await middleware.InvokeAsync(context); - // Assert var response = context.Response; Assert.Collection( response.Headers.OrderBy(h => h.Key), diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 726f2426e376..02ab38a3f907 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -257,7 +257,17 @@ public async Task BlazorWasm(bool projectSpecifiesCapabilities) App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); - App.AssertOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}/"); + + // Browser is launched based on blazor-devserver output "Now listening on: ...". + await App.WaitUntilOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}/"); + + // Middleware should have been loaded to blazor-devserver before the browser is launched: + App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorWasmHotReloadMiddleware[0]"); + App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserScriptMiddleware[0]"); + App.AssertOutputContains("Middleware loaded. Script /_framework/aspnetcore-browser-refresh.js"); + App.AssertOutputContains("Middleware loaded. Script /_framework/blazor-hotreload.js"); + App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserRefreshMiddleware"); + App.AssertOutputContains("Middleware loaded: DOTNET_MODIFIABLE_ASSEMBLIES=debug, __ASPNETCORE_BROWSER_TOOLS=true"); // shouldn't see any agent messages (agent is not loaded into blazor-devserver): AssertEx.DoesNotContain("🕵️", App.Process.Output); From 7a9b6d2b2a4bd54f5e9f596fd427ef4cd17aecec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 23:14:35 +0000 Subject: [PATCH 634/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.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.13.0-3.24576.11 -> To Version 4.13.0-3.24602.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 5860747af4e4..29e2f48164d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 - + https://github.com/dotnet/roslyn - b1d67343194541819fb3010c2b9b1f2327c53ee0 + 909844b4cbee001206dd0d43066f0164f9e4c835 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 03ecfcb1246d..d7713f678d1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 - 4.13.0-3.24602.5 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 + 4.13.0-3.24602.6 From 5cc7d7dcdc7cc41e9b78fe68014366593ee148a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 23:26:15 +0000 Subject: [PATCH 635/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.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.13.0-3.24576.11 -> To Version 4.13.0-3.24602.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 29e2f48164d3..a6787c1bc416 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 - + https://github.com/dotnet/roslyn - 909844b4cbee001206dd0d43066f0164f9e4c835 + 6afcc0a43ee48330acd6e7c1ab979adb1a319740 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d7713f678d1b..5d2b0b51a535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 - 4.13.0-3.24602.6 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 + 4.13.0-3.24602.7 From 80df8324d25c7da2c5c8d777beb76b150919a235 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Dec 2024 23:56:52 +0000 Subject: [PATCH 636/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.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.13.0-3.24576.11 -> To Version 4.13.0-3.24602.8 --- 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 a6787c1bc416..d93f767acd5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 - + https://github.com/dotnet/roslyn - 6afcc0a43ee48330acd6e7c1ab979adb1a319740 + bb6bafa869aff333415038754377c4810af7d569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5d2b0b51a535..fcfc5877cb66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 - 4.13.0-3.24602.7 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 + 4.13.0-3.24602.8 From fc73bcd1ab83f8f5fd409fae82ceb3ce8ba6d4cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 00:02:23 +0000 Subject: [PATCH 637/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.9 --- 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 d93f767acd5a..1e6be4e8a7e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 - + https://github.com/dotnet/roslyn - bb6bafa869aff333415038754377c4810af7d569 + 38b8e68061eeb91fe1c23ee899f12811583d2352 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fcfc5877cb66..9543841e4102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 - 4.13.0-3.24602.8 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 + 4.13.0-3.24602.9 From a66e4bfd3c0afefb4ddcdb0499d618ee75f4235f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 00:18:37 +0000 Subject: [PATCH 638/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.10 --- 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 1e6be4e8a7e3..21f2bf3b9de3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b - + https://github.com/dotnet/roslyn - 38b8e68061eeb91fe1c23ee899f12811583d2352 + 6b87d0eacdd64a2021421ede2aead7404925d64b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9543841e4102..463c2d83b924 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 - 4.13.0-3.24602.9 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 + 4.13.0-3.24602.10 From b80d497d0e7c672b3df70cbbac5bc147e1c43be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 00:36:21 +0000 Subject: [PATCH 639/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.12 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.12 --- 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 21f2bf3b9de3..5d5f60af92c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 - + https://github.com/dotnet/roslyn - 6b87d0eacdd64a2021421ede2aead7404925d64b + 731089c665fe7a2419094b42a20b599dd74c95b3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 463c2d83b924..8ab64c37480d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 - 4.13.0-3.24602.10 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 + 4.13.0-3.24602.12 From 46feb17d4349b87f6513bac2e8d09931a5ac881a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 00:38:53 +0000 Subject: [PATCH 640/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.11 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d5f60af92c7..7ae75153e54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e - + https://github.com/dotnet/roslyn - 731089c665fe7a2419094b42a20b599dd74c95b3 + 8639171d3f759611ca0d82e0c842bffee41f727e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8ab64c37480d..bffcb438f2c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 - 4.13.0-3.24602.12 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 + 4.13.0-3.24602.11 From 2c86f58b098147e268e4a19ce52294128f0b4b2a Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 2 Dec 2024 19:39:54 -0500 Subject: [PATCH 641/702] Exclude private assets --- .../DependencyContextBuilder.cs | 39 +++++++++++++++++++ .../GenerateDepsFile.cs | 3 ++ .../targets/Microsoft.NET.Publish.targets | 1 + .../targets/Microsoft.NET.Sdk.targets | 1 + 4 files changed, 44 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs index 463270e87c14..f358a6d65ba8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs @@ -22,6 +22,7 @@ internal class DependencyContextBuilder private Dictionary> _compileReferences; private Dictionary> _resolvedNuGetFiles; private Dictionary _referenceProjectInfos; + private IEnumerable _excludeFromPublishPackageIds; private Dictionary> _runtimePackAssets; private CompilationOptions _compilationOptions; private string _referenceAssembliesPath; @@ -204,6 +205,12 @@ public DependencyContextBuilder WithReferenceProjectInfos(Dictionary excludeFromPublishPackageIds) + { + _excludeFromPublishPackageIds = excludeFromPublishPackageIds; + return this; + } + public DependencyContextBuilder WithMainProjectInDepsFile(bool includeMainProjectInDepsFile) { _includeMainProjectInDepsFile = includeMainProjectInDepsFile; @@ -814,6 +821,38 @@ private void CalculateExcludedLibraries() { _dependencyLibraries[packageToExcludeFromRuntime].ExcludeFromRuntime = true; } + + // Include transitive dependencies of all top-level dependencies + Dictionary includedDependencies = new(StringComparer.OrdinalIgnoreCase); + Stack dependencyListToWalk = new(_mainProjectDependencies); + + while (dependencyListToWalk.Count != 0) + { + var dependencyName = dependencyListToWalk.Pop(); + if (!includedDependencies.ContainsKey(dependencyName) && _excludeFromPublishPackageIds?.Contains(dependencyName) != true) + { + // There may not be a library in the assets file if a referenced project has + // PrivateAssets="all" for a package reference, and there is a package in the graph + // that depends on the same package. + if (_dependencyLibraries.TryGetValue(dependencyName, out var dependencyLibrary)) + { + includedDependencies.Add(dependencyName, dependencyLibrary); + foreach (var newDependency in _libraryDependencies[dependencyName]) + { + dependencyListToWalk.Push(newDependency.Name); + } + } + } + } + + foreach (var dependencyLibrary in _dependencyLibraries.Values) + { + if (!includedDependencies.ContainsKey(dependencyLibrary.Name)) + { + dependencyLibrary.ExcludeFromCompilation = true; + dependencyLibrary.ExcludeFromRuntime = true; + } + } } private string GetReferenceLibraryName(ReferenceInfo reference) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs index 816b94b2b580..549376a1f9c5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs @@ -64,6 +64,8 @@ public class GenerateDepsFile : TaskBase public ITaskItem CompilerOptions { get; set; } + public ITaskItem[] ExcludeFromPublishPackageReferences { get; set; } = Array.Empty(); + public ITaskItem[] RuntimeStorePackages { get; set; } // NuGet compilation assets @@ -232,6 +234,7 @@ bool ShouldIncludeRuntimeAsset(ITaskItem item) .WithDirectReferences(directReferences) .WithDependencyReferences(dependencyReferences) .WithReferenceProjectInfos(referenceProjects) + .WithExcludeFromPublishAssets(PackageReferenceConverter.GetPackageIds(ExcludeFromPublishPackageReferences)) .WithRuntimePackAssets(runtimePackAssets) .WithCompilationOptions(compilationOptions) .WithReferenceAssembliesPath(FrameworkReferenceResolver.GetDefaultReferenceAssembliesPath()) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index 4a0f8fa3fc29..eaf2b5011e62 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -1236,6 +1236,7 @@ Copyright (c) .NET Foundation. All rights reserved. PlatformLibraryName="$(MicrosoftNETPlatformLibrary)" RuntimeFrameworks="@(RuntimeFramework)" CompilerOptions="@(DependencyFileCompilerOptions)" + ExcludeFromPublishPackageReferences="@(_ExcludeFromPublishPackageReference)" RuntimeStorePackages="@(RuntimeStorePackages)" CompileReferences="@(ResolvedCompileFileDefinitions)" ResolvedNuGetFiles="@(_ResolvedNuGetFilesForPublish)" diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 6fa4bc2d0782..9ec1d30f3c2f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -338,6 +338,7 @@ Copyright (c) .NET Foundation. All rights reserved. PlatformLibraryName="$(MicrosoftNETPlatformLibrary)" RuntimeFrameworks="@(RuntimeFramework)" CompilerOptions="@(DependencyFileCompilerOptions)" + ExcludeFromPublishPackageReferences="@(_ExcludeFromPublishPackageReference)" CompileReferences="@(ResolvedCompileFileDefinitions)" ResolvedNuGetFiles="@(NativeCopyLocalItems);@(ResourceCopyLocalItems);@(RuntimeCopyLocalItems)" UserRuntimeAssemblies="@(UserRuntimeAssembly)" From 7e67bf90b62e2bff070dd076125b9f7ada8fea60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:03:46 +0000 Subject: [PATCH 642/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.13 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.13 --- 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 7ae75153e54d..5f8bc40bf34a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d - + https://github.com/dotnet/roslyn - 8639171d3f759611ca0d82e0c842bffee41f727e + fac15a8b5c8bfb92aa94fa337e8bfe804526495d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bffcb438f2c8..4194161b8c53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 - 4.13.0-3.24602.11 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 + 4.13.0-3.24602.13 From 3111303154cca1df2d7d03bd30193a0c995bc672 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:05:59 +0000 Subject: [PATCH 643/702] Update dependencies from https://github.com/dotnet/sourcelink build 20241202.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.24602.1 -> To Version 9.0.0-beta.24602.2 --- 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 c93fde1a0f54..ed1e0db1f21d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,32 +456,32 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e - + https://github.com/dotnet/sourcelink bf9eea4cf019e8f86e7fae35380533eae25f487e diff --git a/eng/Versions.props b/eng/Versions.props index 665812c0155f..1a25b2ebc184 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -296,12 +296,12 @@ - 9.0.0-beta.24602.1 - 9.0.0-beta.24602.1 - 9.0.0-beta.24602.1 - 9.0.0-beta.24602.1 - 9.0.0-beta.24602.1 - 9.0.0-beta.24602.1 + 9.0.0-beta.24602.2 + 9.0.0-beta.24602.2 + 9.0.0-beta.24602.2 + 9.0.0-beta.24602.2 + 9.0.0-beta.24602.2 + 9.0.0-beta.24602.2 From 354cc45f0cb910d534f8c3ba2a8ad231a0a6bdca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:14:13 +0000 Subject: [PATCH 644/702] Update dependencies from https://github.com/dotnet/fsharp build 20241202.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.100-beta.24522.2 -> To Version 9.0.101-beta.24602.3 --- 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 dcfa97708e83..737684d20ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,14 +87,14 @@ 1cce77968bca1366760f361c837ffbc3a6af70f0 - + https://github.com/dotnet/fsharp - f07a91420bec3f657153e16c9f047cf151c1179f + fd29258f2eb7502b09a450a8250495adb6c5caee - + https://github.com/dotnet/fsharp - f07a91420bec3f657153e16c9f047cf151c1179f + fd29258f2eb7502b09a450a8250495adb6c5caee diff --git a/eng/Versions.props b/eng/Versions.props index e35c02e3c544..acff125e09cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,7 +200,7 @@ - 12.9.100-beta.24522.2 + 12.9.101-beta.24602.3 From 451a5323e9abd247471ae3ab6cebe3ac360dee5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:38:10 +0000 Subject: [PATCH 645/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.15 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.15 --- 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 5f8bc40bf34a..9d82e48bc0b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 - + https://github.com/dotnet/roslyn - fac15a8b5c8bfb92aa94fa337e8bfe804526495d + 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4194161b8c53..42e60e0f3b81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 - 4.13.0-3.24602.13 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 + 4.13.0-3.24602.15 From c8d44ba1247f89f0e6e495275e917d4c0afe3a98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:40:43 +0000 Subject: [PATCH 646/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.14 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.14 --- 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 9d82e48bc0b6..71a4ef466519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b - + https://github.com/dotnet/roslyn - 5d2b0f4ab5fd4f2f97aa616e376b867c43d156c7 + 8be164990fdb75d11a597093b9fdfc431cc7436b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 42e60e0f3b81..c7225512d592 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 - 4.13.0-3.24602.15 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 + 4.13.0-3.24602.14 From dd898fd192a1d093c026372a176d9d3feb88f4e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 01:55:46 +0000 Subject: [PATCH 647/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.17 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.17 --- 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 71a4ef466519..fc040e3ecfd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 - + https://github.com/dotnet/roslyn - 8be164990fdb75d11a597093b9fdfc431cc7436b + 3469b8b36102640dd9421729e1c7a8309e923191 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c7225512d592..d394fd3d80d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 - 4.13.0-3.24602.14 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 + 4.13.0-3.24602.17 From 58a04691205f68c33eceb5f5fbc355ee258d11a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 02:02:19 +0000 Subject: [PATCH 648/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.16 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.16 --- 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 fc040e3ecfd2..03e0985bc087 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 - + https://github.com/dotnet/roslyn - 3469b8b36102640dd9421729e1c7a8309e923191 + 3f262e0ec94a693d18d58a6199e12a90eba2a911 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d394fd3d80d0..68474f00b30f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 - 4.13.0-3.24602.17 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 + 4.13.0-3.24602.16 From 31fe4b0724fe545b57b6d8d8479fb2f1df926518 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:10:06 -0500 Subject: [PATCH 649/702] Attempt to resolve workload gc bug --- .../dotnet-workload/WorkloadUtilities.cs | 37 +++++++++++++++++++ .../install/WorkloadGarbageCollector.cs | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs new file mode 100644 index 000000000000..cffbaf893fc8 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -0,0 +1,37 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Deployment.DotNet.Releases; + +namespace Microsoft.DotNet.Workloads.Workload +{ + internal class WorkloadUtilities + { + internal static int VersionCompare(string first, string second) + { + if (first.Equals(second)) + { + return 0; + } + + var firstDash = first.IndexOf('-'); + var secondDash = second.IndexOf('-'); + firstDash = firstDash < 0 ? first.Length : firstDash; + secondDash = secondDash < 0 ? second.Length : secondDash; + + var firstVersion = new Version(first.Substring(0, firstDash)); + var secondVersion = new Version(second.Substring(0, secondDash)); + + var comparison = firstVersion.CompareTo(secondVersion); + if (comparison != 0) + { + return comparison; + } + + var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + + return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs index d9d72f80154f..0b74c06101d6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadGarbageCollector.cs @@ -115,7 +115,7 @@ void GarbageCollectWorkloadSets() // If there isn't a rollback state file, don't garbage collect the latest workload set installed for the feature band if (installedWorkloadSets.Any()) { - var latestWorkloadSetVersion = installedWorkloadSets.Keys.MaxBy(k => new ReleaseVersion(k)); + var latestWorkloadSetVersion = installedWorkloadSets.Keys.Aggregate((s1, s2) => WorkloadUtilities.VersionCompare(s1, s2) >= 0 ? s1 : s2); _workloadSets[latestWorkloadSetVersion] = GCAction.Keep; _verboseReporter.WriteLine($"GC: Keeping latest installed workload set version {latestWorkloadSetVersion}"); } From afe318ba27bb4ef93ae3b29fe1ae2af01eb4f782 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 02:16:02 +0000 Subject: [PATCH 650/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.18 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.18 --- 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 03e0985bc087..1b728a3e9caa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 - + https://github.com/dotnet/roslyn - 3f262e0ec94a693d18d58a6199e12a90eba2a911 + a5eacafa7227792ca5f10537c761119fee80ceb7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 68474f00b30f..a96b0335e227 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 - 4.13.0-3.24602.16 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 + 4.13.0-3.24602.18 From 6fd2176371a16ab8e12679b354b3c2df15e890d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 02:24:33 +0000 Subject: [PATCH 651/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.19 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.19 --- 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 1b728a3e9caa..050ad014e2f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f - + https://github.com/dotnet/roslyn - a5eacafa7227792ca5f10537c761119fee80ceb7 + 3a76975ade69f58b2222754d19cae171de71bc5f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a96b0335e227..c27a2dfb6d6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 - 4.13.0-3.24602.18 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 + 4.13.0-3.24602.19 From 58538ae79c579a9a820ce416bb9229a78cf17302 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 03:05:49 +0000 Subject: [PATCH 652/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.21 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.21 --- 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 050ad014e2f0..79fa41c124e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 - + https://github.com/dotnet/roslyn - 3a76975ade69f58b2222754d19cae171de71bc5f + c988fa3335017848346cafffdda2279cf737c676 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c27a2dfb6d6d..420a65741658 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 - 4.13.0-3.24602.19 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 + 4.13.0-3.24602.21 From 0a1399da55bb390364da1411ce223e601a289ec7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 03:11:19 +0000 Subject: [PATCH 653/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.20 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.20 --- 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 79fa41c124e3..05eccba849e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 - + https://github.com/dotnet/roslyn - c988fa3335017848346cafffdda2279cf737c676 + 4de50b6de1b3f3631212373178ff9c8651d01ca6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 420a65741658..568489b06d9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 - 4.13.0-3.24602.21 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 + 4.13.0-3.24602.20 From cc6e471cb35ddc70eed18d430841b2af5f97bb6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 03:39:23 +0000 Subject: [PATCH 654/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.22 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.22 --- 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 05eccba849e7..a0e03297a68a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 - + https://github.com/dotnet/roslyn - 4de50b6de1b3f3631212373178ff9c8651d01ca6 + 64aa04724b357c61351fc0a90e18014fc53e7a28 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 568489b06d9c..0e87a7b2cd98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 - 4.13.0-3.24602.20 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 + 4.13.0-3.24602.22 From f31977e612836e8b1692f2cdfe501b6418aed732 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 04:12:15 +0000 Subject: [PATCH 655/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.23 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.23 --- 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 a0e03297a68a..b3c69d09fbd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 - + https://github.com/dotnet/roslyn - 64aa04724b357c61351fc0a90e18014fc53e7a28 + 6c2553e61e8825ca06876fa782046eaa6c85edf9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0e87a7b2cd98..8b342b6532f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 - 4.13.0-3.24602.22 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 + 4.13.0-3.24602.23 From 786910b250481afe5f49ca724da897f998312148 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 04:58:46 +0000 Subject: [PATCH 656/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.24 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.24 --- 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 b3c69d09fbd9..14e3fdea05e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e - + https://github.com/dotnet/roslyn - 6c2553e61e8825ca06876fa782046eaa6c85edf9 + ad6795a50273e90af90fa534498f856abed0b85e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8b342b6532f5..92a3f2b7402f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 - 4.13.0-3.24602.23 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 + 4.13.0-3.24602.24 From ff2cbfe8438ed6c060311eb987f3e0ea7253c733 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 05:33:18 +0000 Subject: [PATCH 657/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.25 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.25 --- 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 14e3fdea05e4..6f78fa48a3b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 - + https://github.com/dotnet/roslyn - ad6795a50273e90af90fa534498f856abed0b85e + e19c3ae7abcacd8b2af5058601917e1eb5222ec5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 92a3f2b7402f..008edec75a56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 - 4.13.0-3.24602.24 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 + 4.13.0-3.24602.25 From 36574cf8c4c45f76073c77284626199d2c305bb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 10:44:41 +0000 Subject: [PATCH 658/702] Update dependencies from https://github.com/dotnet/roslyn build 20241203.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24603.1 --- 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 6f78fa48a3b8..4f2e1e7edffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a - + https://github.com/dotnet/roslyn - e19c3ae7abcacd8b2af5058601917e1eb5222ec5 + ea73dc337175ff0e40fffc93a00364e1fc21cc9a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 008edec75a56..5d55df5eb2bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 - 4.13.0-3.24602.25 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 + 4.13.0-3.24603.1 From 31d907645899b0c9656a40886da898e68aee2630 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 10:50:12 +0000 Subject: [PATCH 659/702] Update dependencies from https://github.com/dotnet/roslyn build 20241202.26 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24602.26 --- 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 4f2e1e7edffe..85932709f8c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 - + https://github.com/dotnet/roslyn - ea73dc337175ff0e40fffc93a00364e1fc21cc9a + 089e61c59dcb3d46fe766abc85176ef8e42e4d58 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5d55df5eb2bd..d12192b15bd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 - 4.13.0-3.24603.1 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 + 4.13.0-3.24602.26 From 7875a5c7ef06ed0f42f2bb0efc37770a803eaa09 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:36:10 -0500 Subject: [PATCH 660/702] Fix bad test --- .../MvcBuildIntegrationTestLegacy.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs index 1447b3977762..d80b56699761 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs @@ -113,9 +113,9 @@ public void Build_ProducesDepsFileWithCompilationContext_ButNoReferences() depsFile.Should().Exist(); var dependencyContext = ReadDependencyContext(depsFile.FullName); - // Ensure some compile references exist - var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "System.Runtime.CompilerServices.Unsafe"); - packageReference.Assemblies.Should().NotBeEmpty(); + // Ensure compile references from a PrivateAssets="all" PackageReference don't exist + var packageReference = dependencyContext.CompileLibraries.FirstOrDefault(l => l.Name == "System.Runtime.CompilerServices.Unsafe", defaultValue: null); + packageReference.Should().BeNull(); var projectReference = dependencyContext.CompileLibraries.First(l => l.Name == TestProjectName); projectReference.Assemblies.Should().NotBeEmpty(); From 09baaa738f95853be6807e0cd07800c64a869eca Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:39:06 -0500 Subject: [PATCH 661/702] Cleaner comparison --- .../dotnet/commands/dotnet-workload/WorkloadUtilities.cs | 6 +++--- .../SdkDirectoryWorkloadManifestProvider.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs index cffbaf893fc8..0b3ab2fbbe11 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -28,10 +28,10 @@ internal static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); - return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + return modifiedFirst.CompareTo(modifiedSecond); } } } diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index bcd9f3981028..19a1045cfc33 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -230,10 +230,10 @@ private static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = "1.1.1" + (firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = "1.1.1" + (secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); - return new ReleaseVersion(modifiedFirst).CompareTo(new ReleaseVersion(modifiedSecond)); + return modifiedFirst.CompareTo(modifiedSecond); } void ThrowExceptionIfManifestsNotAvailable() From fbc08a807db7bbc70876396ce0df906b6b449077 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 18:39:14 +0000 Subject: [PATCH 662/702] Update dependencies from https://github.com/dotnet/roslyn build 20241203.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24603.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85932709f8c1..341fa55a8eac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ e9dab83bc86ec414b7288d3f8be48a2b14eabb5d - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 - + https://github.com/dotnet/roslyn - 089e61c59dcb3d46fe766abc85176ef8e42e4d58 + a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d12192b15bd0..354da500b76a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -223,14 +223,14 @@ - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 - 4.13.0-3.24602.26 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 + 4.13.0-3.24603.2 From ee67019dee2b6275e8e4c2761e017df4e23109c7 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:21:06 -0500 Subject: [PATCH 663/702] Force overwrite --- .../install/FileBasedInstaller.cs | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index 6ba629c06799..1585c5e33f1f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -133,6 +133,11 @@ public async Task GetWorkloadSetContentsAsync(string workloadSetVer } public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, ITransactionContext transactionContext, DirectoryPath? offlineCache = null) + { + InstallWorkloads(workloadIds, sdkFeatureBand, transactionContext, overwriteExistingPacks: false, offlineCache); + } + + public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, ITransactionContext transactionContext, bool overwriteExistingPacks, DirectoryPath? offlineCache = null) { var packInfos = GetPacksInWorkloads(workloadIds); @@ -146,7 +151,11 @@ public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand transactionContext.Run( action: () => { - if (!PackIsInstalled(packInfo)) + if (PackIsInstalled(packInfo) && !overwriteExistingPacks) + { + _reporter.WriteLine(string.Format(LocalizableStrings.WorkloadPackAlreadyInstalledMessage, packInfo.ResolvedPackageId, packInfo.Version)); + } + else { shouldRollBackPack = true; string packagePath; @@ -175,22 +184,30 @@ public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand if (IsSingleFilePack(packInfo)) { - File.Copy(packagePath, packInfo.Path); + File.Copy(packagePath, packInfo.Path, overwrite: overwriteExistingPacks); } else { var tempExtractionDir = Path.Combine(_tempPackagesDir.Value, $"{packInfo.ResolvedPackageId}-{packInfo.Version}-extracted"); tempDirsToDelete.Add(tempExtractionDir); + + // This directory should have been deleted, but remove it just in case + if (overwriteExistingPacks && Directory.Exists(tempExtractionDir)) + { + Directory.Delete(tempExtractionDir, recursive: true); + } + Directory.CreateDirectory(tempExtractionDir); var packFiles = _nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(tempExtractionDir)).GetAwaiter().GetResult(); + if (overwriteExistingPacks && Directory.Exists(packInfo.Path)) + { + Directory.Delete(packInfo.Path, recursive: true); + } + FileAccessRetrier.RetryOnMoveAccessFailure(() => DirectoryPath.MoveDirectory(tempExtractionDir, packInfo.Path)); } - } - else - { - _reporter.WriteLine(string.Format(LocalizableStrings.WorkloadPackAlreadyInstalledMessage, packInfo.ResolvedPackageId, packInfo.Version)); - } + } WritePackInstallationRecord(packInfo, sdkFeatureBand); }, @@ -237,8 +254,7 @@ public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand public void RepairWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, DirectoryPath? offlineCache = null) { - // TODO: Actually re-extract the packs to fix any corrupted files. - CliTransaction.RunNew(context => InstallWorkloads(workloadIds, sdkFeatureBand, context, offlineCache)); + CliTransaction.RunNew(context => InstallWorkloads(workloadIds, sdkFeatureBand, context, overwriteExistingPacks: true, offlineCache)); } string GetManifestInstallDirForFeatureBand(string sdkFeatureBand) From 9bdf99c2987dfcbab51695b60b16a30b99ebf0a2 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:01:07 -0500 Subject: [PATCH 664/702] string.Empty --> null --- src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs | 4 ++-- .../SdkDirectoryWorkloadManifestProvider.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs index 0b3ab2fbbe11..b621d0939767 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadUtilities.cs @@ -28,8 +28,8 @@ internal static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? null : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? null : second.Substring(secondDash)); return modifiedFirst.CompareTo(modifiedSecond); } diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index 19a1045cfc33..a56622cf5a69 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -230,8 +230,8 @@ private static int VersionCompare(string first, string second) return comparison; } - var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? string.Empty : first.Substring(firstDash)); - var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? string.Empty : second.Substring(secondDash)); + var modifiedFirst = new ReleaseVersion(1, 1, 1, firstDash == first.Length ? null : first.Substring(firstDash)); + var modifiedSecond = new ReleaseVersion(1, 1, 1, secondDash == second.Length ? null : second.Substring(secondDash)); return modifiedFirst.CompareTo(modifiedSecond); } From c9d7a7666b8bdb5763541c3626005e8a13471fa5 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:48:55 -0500 Subject: [PATCH 665/702] Target by framework --- .../MvcBuildIntegrationTestLegacy.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs index d80b56699761..9c4d881277f0 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTestLegacy.cs @@ -113,9 +113,18 @@ public void Build_ProducesDepsFileWithCompilationContext_ButNoReferences() depsFile.Should().Exist(); var dependencyContext = ReadDependencyContext(depsFile.FullName); - // Ensure compile references from a PrivateAssets="all" PackageReference don't exist - var packageReference = dependencyContext.CompileLibraries.FirstOrDefault(l => l.Name == "System.Runtime.CompilerServices.Unsafe", defaultValue: null); - packageReference.Should().BeNull(); + if (TargetFramework.Equals("netcoreapp2.2")) + { + // Ensure compile references from a PrivateAssets="all" PackageReference don't exist + var packageReference = dependencyContext.CompileLibraries.FirstOrDefault(l => l.Name == "System.Runtime.CompilerServices.Unsafe", defaultValue: null); + packageReference.Should().BeNull(); + } + else + { + // Ensure some compile references exist + var packageReference = dependencyContext.CompileLibraries.First(l => l.Name == "System.Runtime.CompilerServices.Unsafe"); + packageReference.Assemblies.Should().NotBeEmpty(); + } var projectReference = dependencyContext.CompileLibraries.First(l => l.Name == TestProjectName); projectReference.Assemblies.Should().NotBeEmpty(); From 89fa8e3ba32c586f47329638f76233ff137fc033 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 20:52:08 +0000 Subject: [PATCH 666/702] Update dependencies from https://github.com/dotnet/roslyn build 20241203.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24603.3 --- 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 c674a6743878..f742790c2e68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3dc980eeb06dd912f1e6fe5d06a23a67a4b659e7 - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb - + https://github.com/dotnet/roslyn - a4ebe9cb7a825a4d061f486ac08e0c4c8651bd07 + 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0f92ac294172..ac24ccb65d1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 - 4.13.0-3.24603.2 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 + 4.13.0-3.24603.3 From bb213ef4c864625ab952537f026652ef6a301575 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 21:32:22 +0000 Subject: [PATCH 667/702] Update dependencies from https://github.com/dotnet/roslyn build 20241203.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24603.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f742790c2e68..535b7d37f354 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3dc980eeb06dd912f1e6fe5d06a23a67a4b659e7 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 - + https://github.com/dotnet/roslyn - 45483ea0d54a7d7d1284e7a4e56a3d45d05bceeb + 0e035cfafe6e16334b139c89475b89f078696d73 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ac24ccb65d1f..82965b63017c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 - 4.13.0-3.24603.3 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 + 4.13.0-3.24603.4 From cc95a84876f50933196c8bd83530e9645cf2a1a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Dec 2024 22:00:54 +0000 Subject: [PATCH 668/702] Update dependencies from https://github.com/dotnet/roslyn build 20241203.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.13.0-3.24576.11 -> To Version 4.13.0-3.24603.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 535b7d37f354..8ad791722d17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3dc980eeb06dd912f1e6fe5d06a23a67a4b659e7 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 - + https://github.com/dotnet/roslyn - 0e035cfafe6e16334b139c89475b89f078696d73 + d94a5505a6515a2d5350c7055853fc431e6dcfa4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 82965b63017c..b1e59af42c3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,14 +218,14 @@ - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 - 4.13.0-3.24603.4 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 + 4.13.0-3.24603.5 From 27f7f91c86016eec763f2d58ade480fbf4e1dcee Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 17:39:21 -0800 Subject: [PATCH 669/702] Update src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs Co-authored-by: Michael Yanni --- .../DependencyContextBuilder.cs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs index f358a6d65ba8..1f1c4c4a14d8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs @@ -829,18 +829,17 @@ private void CalculateExcludedLibraries() while (dependencyListToWalk.Count != 0) { var dependencyName = dependencyListToWalk.Pop(); - if (!includedDependencies.ContainsKey(dependencyName) && _excludeFromPublishPackageIds?.Contains(dependencyName) != true) + // There may not be a library in the assets file if a referenced project has + // PrivateAssets="all" for a package reference, and there is a package in the graph + // that depends on the same package. + if (!includedDependencies.ContainsKey(dependencyName) && + _excludeFromPublishPackageIds?.Contains(dependencyName) != true && + _dependencyLibraries.TryGetValue(dependencyName, out var dependencyLibrary)) { - // There may not be a library in the assets file if a referenced project has - // PrivateAssets="all" for a package reference, and there is a package in the graph - // that depends on the same package. - if (_dependencyLibraries.TryGetValue(dependencyName, out var dependencyLibrary)) + includedDependencies.Add(dependencyName, dependencyLibrary); + foreach (var newDependency in _libraryDependencies[dependencyName]) { - includedDependencies.Add(dependencyName, dependencyLibrary); - foreach (var newDependency in _libraryDependencies[dependencyName]) - { - dependencyListToWalk.Push(newDependency.Name); - } + dependencyListToWalk.Push(newDependency.Name); } } } From 7c92aa32e814d051fada525f210d8c073aefe807 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:51:29 -0500 Subject: [PATCH 670/702] Comments --- .../WorkloadSearchVersionsCommandParser.cs | 7 ++--- src/Common/WorkloadSetVersion.cs | 29 +++++++------------ 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs index aa85989e35d6..a9a4bbfa5186 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/search/WorkloadSearchVersionsCommandParser.cs @@ -57,12 +57,9 @@ private static CliCommand ConstructCommand() command.Validators.Add(result => { var versionArgument = result.GetValue(WorkloadVersionArgument); - if (versionArgument is not null) + if (versionArgument is not null && !WorkloadSetVersion.IsWorkloadSetPackageVersion(versionArgument)) { - if (!WorkloadSetVersion.IsWorkloadSetPackageVersion(versionArgument)) - { - result.AddError(string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, versionArgument)); - } + result.AddError(string.Format(CommandLineValidation.LocalizableStrings.UnrecognizedCommandOrArgument, versionArgument)); } }); diff --git a/src/Common/WorkloadSetVersion.cs b/src/Common/WorkloadSetVersion.cs index b15cfdc0a171..907b9f5b9f42 100644 --- a/src/Common/WorkloadSetVersion.cs +++ b/src/Common/WorkloadSetVersion.cs @@ -8,34 +8,29 @@ namespace Microsoft.DotNet.Workloads.Workload { static class WorkloadSetVersion { - public static bool IsWorkloadSetPackageVersion(string workloadSetVersion) + private static string[] SeparateCoreComponents(string workloadSetVersion, out string[] sections) { + sections = workloadSetVersion.Split(['-', '+'], 2); + return sections[0].Split('.'); + } - string[] sections = workloadSetVersion.Split(['-', '+'], 2); - string versionCore = sections[0]; - string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; - - string[] coreComponents = versionCore.Split('.'); - return coreComponents.Length >= 3 && coreComponents.Length <= 4; + public static bool IsWorkloadSetPackageVersion(string workloadSetVersion) + { + int coreComponentsLength = SeparateCoreComponents(workloadSetVersion, out _).Length; + return coreComponentsLength >= 3 && coreComponentsLength <= 4; } public static string ToWorkloadSetPackageVersion(string workloadSetVersion, out SdkFeatureBand sdkFeatureBand) { - string[] sections = workloadSetVersion.Split(['-', '+'], 2); - string versionCore = sections[0]; - string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; - - string[] coreComponents = versionCore.Split('.'); + string[] coreComponents = SeparateCoreComponents(workloadSetVersion, out string[] sections); string major = coreComponents[0]; string minor = coreComponents[1]; string patch = coreComponents[2]; - string packageVersion = $"{major}.{patch}."; if (coreComponents.Length == 3) { // No workload set patch version packageVersion += "0"; - // Use preview specifier (if any) from workload set version as part of SDK feature band sdkFeatureBand = new SdkFeatureBand(workloadSetVersion); } @@ -43,18 +38,16 @@ public static string ToWorkloadSetPackageVersion(string workloadSetVersion, out { // Workload set version has workload patch version (ie 4 components) packageVersion += coreComponents[3]; - // Don't include any preview specifiers in SDK feature band sdkFeatureBand = new SdkFeatureBand($"{major}.{minor}.{patch}"); } - if (preReleaseOrBuild != null) + if (sections.Length > 1) { // Figure out if we split on a '-' or '+' char separator = workloadSetVersion[sections[0].Length]; - packageVersion += separator + preReleaseOrBuild; + packageVersion += separator + sections[1]; } - return packageVersion; } From 26da2646b1dc6e9f0ce1504cbcd555be4f3c0ece Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Dec 2024 12:27:29 +0000 Subject: [PATCH 671/702] Update dependencies from https://github.com/nuget/nuget.client build 6.13.0.84 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.13.0-preview.1.73 -> To Version 6.13.0-preview.1.84 --- 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 885a3147dd4f..11b7c1616d7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c - + https://github.com/nuget/nuget.client - cee6d943f9a6fa38daf5adba4d4dae9d230e83c6 + aef398ffa7d4e2e9f5f0d1f3b1b6215f9958689c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 33f2f275bfde..98a1bcaad826 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -151,18 +151,18 @@ - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 - 6.13.0-preview.1.73 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 + 6.13.0-preview.1.84 From 18ab0cecd7506ad7a6e08c9b06112d603ef93d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Wed, 4 Dec 2024 09:18:05 -0800 Subject: [PATCH 672/702] Wait for project changes when unchanged project doesn't build (#45167) --- .../dotnet-watch/HotReloadDotNetWatcher.cs | 3 +- .../WatchNoDepsApp/WatchNoDepsApp.csproj | 4 ++ .../HotReload/ApplyDeltaTests.cs | 69 +++++++++++++++++++ .../Utilities/TestReporter.cs | 18 ++++- 4 files changed, 89 insertions(+), 5 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 89124521e6f0..ca5348aea93b 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -122,8 +122,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke if (!await BuildProjectAsync(rootProjectOptions.ProjectPath, rootProjectOptions.BuildArguments, iterationCancellationToken)) { // error has been reported: - waitForFileChangeBeforeRestarting = false; - return; + continue; } rootRunningProject = await projectLauncher.TryLaunchProcessAsync( diff --git a/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj b/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj index 25ae2984a550..37feccc1aaef 100644 --- a/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj +++ b/test/TestAssets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 02ab38a3f907..402167c0f735 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -65,6 +65,75 @@ public static void Print() await App.AssertOutputLineStartsWith("Changed!"); } + /// + /// Unchanged project doesn't build. Wait for source change and rebuild. + /// + [Fact] + public async Task BaselineCompilationError() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + var programPath = Path.Combine(testAsset.Path, "Program.cs"); + File.WriteAllText(programPath, + """ + Console.Write + """); + + App.Start(testAsset, []); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForFileChangeBeforeRestarting, failure: _ => false); + + UpdateSourceFile(programPath, """ + System.Console.WriteLine(""); + """); + + await App.AssertOutputLineStartsWith(""); + } + + /// + /// We currently do not support applying project changes. + /// The workaround is to restart via Ctrl+R. + /// + [Fact] + public async Task ProjectChangeAndRestart() + { + var testAsset = TestAssets.CopyTestAsset("WatchNoDepsApp") + .WithSource(); + + var programPath = Path.Combine(testAsset.Path, "Program.cs"); + var projectPath = Path.Combine(testAsset.Path, "WatchNoDepsApp.csproj"); + + App.Start(testAsset, ["--no-exit"], testFlags: TestFlags.ReadKeyFromStdin); + + await App.AssertOutputLineStartsWith(MessageDescriptor.WaitingForChanges); + + // missing System.Linq import: + UpdateSourceFile(programPath, content => content.Replace(""" + Console.WriteLine("Started"); + """, + """ + Console.WriteLine($">>> {typeof(Enumerable)}"); + """)); + + await App.AssertOutputLineStartsWith("dotnet watch ⌚ Unable to apply hot reload due to compilation errors.", failure: _ => false); + + UpdateSourceFile(projectPath, content => content.Replace(""" + + """, + """ + + """)); + + // project change not applied: + await App.AssertOutputLineStartsWith("dotnet watch ⌚ Unable to apply hot reload due to compilation errors.", failure: _ => false); + + // Ctlr+R rebuilds and restarts: + App.SendControlR(); + + await App.AssertOutputLineStartsWith(">>> System.Linq.Enumerable", failure: _ => false); + } + [Fact] public async Task ChangeFileInFSharpProject() { diff --git a/test/dotnet-watch.Tests/Utilities/TestReporter.cs b/test/dotnet-watch.Tests/Utilities/TestReporter.cs index 0f402c2cce69..b02a7ee5d5e6 100644 --- a/test/dotnet-watch.Tests/Utilities/TestReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/TestReporter.cs @@ -24,7 +24,7 @@ public bool IsVerbose public void ReportProcessOutput(OutputLine line) { - output.WriteLine(line.Content); + WriteTestOutput(line.Content); ProcessOutput.Add(line.Content); OnProcessOutput?.Invoke(line); @@ -34,7 +34,7 @@ public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) { var content = $"[{project.GetDisplayName()}]: {line.Content}"; - output.WriteLine(content); + WriteTestOutput(content); ProcessOutput.Add(content); OnProjectProcessOutput?.Invoke(project.ProjectInstance.FullPath, line); @@ -67,7 +67,7 @@ public void Report(MessageDescriptor descriptor, string prefix, object?[] args) { if (descriptor.TryGetMessage(prefix, args, out var message)) { - output.WriteLine($"{ToString(descriptor.Severity)} {descriptor.Emoji} {message}"); + WriteTestOutput($"{ToString(descriptor.Severity)} {descriptor.Emoji} {message}"); } if (descriptor.Id.HasValue && _actions.TryGetValue(descriptor.Id.Value, out var action)) @@ -76,6 +76,18 @@ public void Report(MessageDescriptor descriptor, string prefix, object?[] args) } } + private void WriteTestOutput(string message) + { + try + { + output.WriteLine(message); + } + catch (InvalidOperationException) + { + // May happen when a test is aborted and no longer running. + } + } + private static string ToString(MessageSeverity severity) => severity switch { From 567f4f18ecc3e8f406bb0d281afc696d7fcd92ff Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 3 Dec 2024 14:02:00 -0800 Subject: [PATCH 673/702] Include the .NET Framework buildhost executable in the SDK. This is necessary for dotnet-format to loading .NET Framework projects. --- src/Layout/redist/targets/GenerateLayout.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index e7cd9e392c3e..84838632c10f 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -113,7 +113,8 @@ - + + From f5ce52e9eddd5b2e51cea8036025a059295c4ddc Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:45:16 -0500 Subject: [PATCH 674/702] Add test specifically for this case --- .../GivenThatWeWantToBuildADesktopLibrary.cs | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs index 127aaf3882cd..557741e430d5 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs @@ -225,6 +225,32 @@ public void It_can_preserve_compilation_context_and_reference_netstandard_librar } } + [Theory] + [InlineData("RazorSimpleMvc22", "netcoreapp2.2", "SimpleMvc22")] + [InlineData("DesktopReferencingNetStandardLibrary", "net46", "Library")] + public void PackageReferences_with_private_assets_do_not_appear_in_deps_file(string asset, string targetFramework, string exeName) + { + var testAsset = _testAssetsManager + .CopyTestAsset(asset) + .WithSource(); + + var buildCommand = new BuildCommand(testAsset); + buildCommand.Execute().Should().Pass(); + + using (var depsJsonFileStream = File.OpenRead(Path.Combine(buildCommand.GetOutputDirectory(targetFramework).FullName, exeName + ".deps.json"))) + { + var dependencyContext = new DependencyContextJsonReader().Read(depsJsonFileStream); + if (asset.Equals("DesktopReferencingNetStandardLibrary")) + { + dependencyContext.CompileLibraries.Any(l => l.Name.Equals("Library")).Should().BeTrue(); + } + else + { + dependencyContext.CompileLibraries.Any(l => l.Name.Equals("Microsoft.AspNetCore.App")).Should().BeFalse(); + } + } + } + [WindowsOnlyFact] public void It_resolves_assembly_conflicts_with_a_NETFramework_library() { From 4b761c750242b5d973830f6edbdd519d868d88fd Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 6 Dec 2024 08:48:43 -0500 Subject: [PATCH 675/702] Add check --- .../CommandResolution/CompositeCommandResolver.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs index 8aea52d488c7..8c15a17be927 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Cli.Utils; + namespace Microsoft.DotNet.CommandFactory { public class CompositeCommandResolver : ICommandResolver @@ -33,6 +35,7 @@ public CommandSpec Resolve(CommandResolverArguments commandResolverArguments) if (commandSpec != null) { + TelemetryEventEntry.SendFiltered(Tuple.Create(commandResolverArguments.CommandName.GetHashCode(), commandResolver.GetType())); return commandSpec; } } From 7ea5f4b01e55a16f90c952669493027f1323caf6 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:49:18 -0500 Subject: [PATCH 676/702] Add structure --- .../CommandResolution/CompositeCommandResolver.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs index 8c15a17be927..e716884e2c4c 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs @@ -7,6 +7,7 @@ namespace Microsoft.DotNet.CommandFactory { public class CompositeCommandResolver : ICommandResolver { + private const string CommandResolveEvent = "dotnet/cli/commandresolution/commandresolved"; private IList _orderedCommandResolvers; public IEnumerable OrderedCommandResolvers @@ -35,7 +36,12 @@ public CommandSpec Resolve(CommandResolverArguments commandResolverArguments) if (commandSpec != null) { - TelemetryEventEntry.SendFiltered(Tuple.Create(commandResolverArguments.CommandName.GetHashCode(), commandResolver.GetType())); + TelemetryEventEntry.TrackEvent(CommandResolveEvent, new Dictionary() + { + { "commandName", commandResolverArguments.CommandName.GetHashCode().ToString() }, + { "commandResolver", commandResolver.GetType().ToString() } + }); + return commandSpec; } } From 47ab5e9ff66dc972c371c801c27089cd40aab129 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:05:15 -0500 Subject: [PATCH 677/702] PR comments --- .../CommandResolution/CompositeCommandResolver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs index e716884e2c4c..bba9b9b09721 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.CommandFactory { public class CompositeCommandResolver : ICommandResolver { - private const string CommandResolveEvent = "dotnet/cli/commandresolution/commandresolved"; + private const string CommandResolveEvent = "commandresolution/commandresolved"; private IList _orderedCommandResolvers; public IEnumerable OrderedCommandResolvers @@ -38,7 +38,7 @@ public CommandSpec Resolve(CommandResolverArguments commandResolverArguments) { TelemetryEventEntry.TrackEvent(CommandResolveEvent, new Dictionary() { - { "commandName", commandResolverArguments.CommandName.GetHashCode().ToString() }, + { "commandName", Sha256Hasher.HashWithNormalizedCasing(commandResolverArguments.CommandName) }, { "commandResolver", commandResolver.GetType().ToString() } }); From 8e0572a1f2ccfdd2e59b182b40faf3ea59784cd9 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:36:22 -0500 Subject: [PATCH 678/702] =?UTF-8?q?Prevent=20null=20ref=20in=20tests=20?= =?UTF-8?q?=F0=9F=98=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommandResolution/CompositeCommandResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs index bba9b9b09721..df5e1b8426db 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/CompositeCommandResolver.cs @@ -38,7 +38,7 @@ public CommandSpec Resolve(CommandResolverArguments commandResolverArguments) { TelemetryEventEntry.TrackEvent(CommandResolveEvent, new Dictionary() { - { "commandName", Sha256Hasher.HashWithNormalizedCasing(commandResolverArguments.CommandName) }, + { "commandName", commandResolverArguments is null ? string.Empty : Sha256Hasher.HashWithNormalizedCasing(commandResolverArguments.CommandName) }, { "commandResolver", commandResolver.GetType().ToString() } }); From 449ccc04bceea773c5881f5395bb6e1001ae1cef Mon Sep 17 00:00:00 2001 From: Rikki Gibson Date: Tue, 10 Dec 2024 17:03:35 -0800 Subject: [PATCH 679/702] format: stop checking for dotnet cli version (#44958) --- .../Commands/FormatCommandCommon.cs | 26 ------------------- src/BuiltInTools/dotnet-format/Resources.resx | 3 --- .../dotnet-format/xlf/Resources.cs.xlf | 5 ---- .../dotnet-format/xlf/Resources.de.xlf | 5 ---- .../dotnet-format/xlf/Resources.es.xlf | 5 ---- .../dotnet-format/xlf/Resources.fr.xlf | 5 ---- .../dotnet-format/xlf/Resources.it.xlf | 5 ---- .../dotnet-format/xlf/Resources.ja.xlf | 5 ---- .../dotnet-format/xlf/Resources.ko.xlf | 5 ---- .../dotnet-format/xlf/Resources.pl.xlf | 5 ---- .../dotnet-format/xlf/Resources.pt-BR.xlf | 5 ---- .../dotnet-format/xlf/Resources.ru.xlf | 5 ---- .../dotnet-format/xlf/Resources.tr.xlf | 5 ---- .../dotnet-format/xlf/Resources.zh-Hans.xlf | 5 ---- .../dotnet-format/xlf/Resources.zh-Hant.xlf | 5 ---- 15 files changed, 94 deletions(-) diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs index 20486f7baa0e..a801de15dfbf 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs @@ -15,7 +15,6 @@ internal static class FormatCommandCommon internal const int UnhandledExceptionExitCode = 1; internal const int CheckFailedExitCode = 2; internal const int UnableToLocateMSBuildExitCode = 3; - internal const int UnableToLocateDotNetCliExitCode = 4; private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" }; private static string[] SeverityLevels => new[] { "info", "warn", "error" }; @@ -102,14 +101,6 @@ internal static async Task FormatAsync(FormatOptions formatOptions, ILogger var runtimeVersion = GetRuntimeVersion(); logger.LogDebug(Resources.The_dotnet_runtime_version_is_0, runtimeVersion); - if (!TryGetDotNetCliVersion(out var dotnetVersion)) - { - logger.LogError(Resources.Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH); - return UnableToLocateDotNetCliExitCode; - } - - logger.LogTrace(Resources.The_dotnet_CLI_version_is_0, dotnetVersion); - if (!TryLoadMSBuild(out var msBuildPath)) { logger.LogError(Resources.Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer); @@ -354,23 +345,6 @@ private static string EnsureTrailingSlash(string path) ?.InformationalVersion; } - internal static bool TryGetDotNetCliVersion([NotNullWhen(returnValue: true)] out string? dotnetVersion) - { - try - { - var processInfo = ProcessRunner.CreateProcess("dotnet", "--version", captureOutput: true, displayWindow: false); - var versionResult = processInfo.Result.GetAwaiter().GetResult(); - - dotnetVersion = versionResult.OutputLines[0].Trim(); - return true; - } - catch - { - dotnetVersion = null; - return false; - } - } - internal static bool TryLoadMSBuild([NotNullWhen(returnValue: true)] out string? msBuildPath) { try diff --git a/src/BuiltInTools/dotnet-format/Resources.resx b/src/BuiltInTools/dotnet-format/Resources.resx index 999aa66a5a2d..ec627d90ce53 100644 --- a/src/BuiltInTools/dotnet-format/Resources.resx +++ b/src/BuiltInTools/dotnet-format/Resources.resx @@ -225,9 +225,6 @@ Standard input markers ('/dev/stdin', '-') can only be used either with `--include` or `--exclude`, but not both. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - The dotnet CLI version is '{0}'. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf index f86d04054ce8..f3a21d499b4d 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf @@ -377,11 +377,6 @@ Nepovedlo se najít MSBuild. Ujistěte se, že se sada .NET SDK nainstalovala pomocí oficiálního instalačního programu. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Nepovedlo se najít .NET CLI. Ujistěte se, že se nachází v proměnné PATH. - - Unable to organize imports for '{0}'. The document is too complex. Nepovedlo se uspořádat importy pro {0}. Dokument je příliš složitý. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf index 677400e07673..40a49347e259 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf @@ -377,11 +377,6 @@ MSBuild wurde nicht gefunden. Stellen Sie sicher, dass das .NET SDK mit dem offiziellen Installationsprogramm installiert wurde. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Die dotnet-CLI wurde nicht gefunden. Stellen Sie sicher, dass sie sich im Pfad befindet. - - Unable to organize imports for '{0}'. The document is too complex. Importe für "{0}" können nicht organisiert werden. Das Dokument ist zu komplex. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf index 79008550cfdd..775cdef7cdf3 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf @@ -377,11 +377,6 @@ No se encuentra MSBuild. Asegúrese de que el SDK de .NET se haya instalado con el instalador oficial. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - No se encuentra la CLI de dotnet. Asegúrese de que esté en la ruta de acceso (PATH). - - Unable to organize imports for '{0}'. The document is too complex. No se pueden organizar las importaciones para "{0}". El documento es demasiado complejo. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf index 7115ef2dd68a..c29da3ec3b44 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf @@ -377,11 +377,6 @@ Impossible de localiser MSBuild. Vérifiez que le SDK .NET a été installé avec le programme d'installation officiel. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Impossible de localiser l'interface CLI dotnet. Vérifiez qu'elle est dans le chemin. - - Unable to organize imports for '{0}'. The document is too complex. Impossible d'organiser les importations pour '{0}'. Le document est trop complexe. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf index 3ffa3a39380f..2aeb29336f18 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf @@ -377,11 +377,6 @@ Non è possibile individuare MSBuild. Assicurarsi che .NET SDK sia stato installato con il programma di installazione ufficiale. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Non è possibile individuare l'interfaccia della riga di comando di dotnet. Assicurarsi che sia indicata in PATH. - - Unable to organize imports for '{0}'. The document is too complex. Non è possibile organizzare le importazioni per '{0}'. Il documento è troppo complesso. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf index 11fa905930d7..4cf225955ceb 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf @@ -377,11 +377,6 @@ MSBuild が見つかりません。.NET SDK が正式なインストーラーでインストールされたことを確認してください。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI が見つかりません。PATH 上にあることを確認してください。 - - Unable to organize imports for '{0}'. The document is too complex. '{0}' のインポートを整理できません。ドキュメントが複雑すぎます。 diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf index e8d31acc2adb..5fe1286052e1 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf @@ -377,11 +377,6 @@ MSBuild를 찾을 수 없습니다. 공식 설치 관리자를 사용하여 .NET SDK를 설치했는지 확인하세요. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI를 찾을 수 없습니다. PATH에 있는지 확인하세요. - - Unable to organize imports for '{0}'. The document is too complex. '{0}'에 대한 가져오기를 구성할 수 없습니다. 문서가 너무 복잡합니다. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf index 936d356f2ac0..37b8a4e1f484 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf @@ -377,11 +377,6 @@ Nie można zlokalizować programu MSBuild. Upewnij się, że zestaw .NET SDK został zainstalowany przy użyciu oficjalnego instalatora. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Nie można zlokalizować wiersza polecenia dotnet. Upewnij się, że znajduje się on w ścieżce. - - Unable to organize imports for '{0}'. The document is too complex. Nie można zorganizować importów dla elementu „{0}”. Dokument jest zbyt złożony. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf index 8061e736ecbe..b57c3e3b44f4 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf @@ -377,11 +377,6 @@ Não é possível localizar o MSBuild. Verifique se o SDK do .NET foi instalado com o instalador oficial. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Não é possível localizar a CLI do dotnet. Verifique se está no CAMINHO. - - Unable to organize imports for '{0}'. The document is too complex. Não é possível organizar importações para '{0}'. O documento é muito complexo. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf index 738cdc715ecd..876497b11b1e 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf @@ -377,11 +377,6 @@ Не удается найти MSBuild. Убедитесь, что пакет SDK для .NET был установлен с официальным установщиком. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Не удалось найти CLI dotnet. Убедитесь, что путь к нему добавлен в переменную среды PATH. - - Unable to organize imports for '{0}'. The document is too complex. Не удается организовать импорты для "{0}". Слишком сложный документ. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf index a2e299a0719d..c20259208904 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf @@ -377,11 +377,6 @@ MSBuild bulunamıyor. .NET SDK'nın resmi yükleyici kullanılarak yüklendiğinden emin olun. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI bulunamıyor. dotnet CLI'nin PATH üzerinde olduğundan emin olun. - - Unable to organize imports for '{0}'. The document is too complex. '{0}' için içeri aktarmalar düzenlenemiyor. Belge çok karmaşık. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf index 2159fb65a4d1..88482781e59c 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf @@ -377,11 +377,6 @@ 无法找到 MSBuild。请确保 .NET SDK 是与官方安装程序一起安装的。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - 找不到 dotnet CLI。请确保它在路径上。 - - Unable to organize imports for '{0}'. The document is too complex. 无法整理“{0}”的导入项。文档太复杂。 diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf index 68ef3223f390..10d7cfa16699 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf @@ -377,11 +377,6 @@ 找不到 MSBuild。請確認已使用正式安裝程式安裝了 .NET SDK。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - 找不到 dotnet CLI。請確認其位於 PATH 上。 - - Unable to organize imports for '{0}'. The document is too complex. 無法組織 '{0}' 的匯入。文件太複雜。 From c45af5a71ff9a4c1cc03c79ae73e591d9c1b8f02 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Thu, 5 Dec 2024 15:19:33 -0800 Subject: [PATCH 680/702] Restore detailed test logging to console output --- .../SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs index 99f111f3c177..24b8237217b1 100644 --- a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs +++ b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs @@ -152,7 +152,7 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) 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}"; + $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --logger \"console;verbosity=detailed\" --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}"; Log.LogMessage($"Creating work item with properties Identity: {assemblyName}, PayloadDirectory: {publishDirectory}, Command: {command}"); From 739f5f86b24d76fd8a1fdee44693682235af520c Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Tue, 10 Dec 2024 12:58:58 -0800 Subject: [PATCH 681/702] Disable InsecureRegistry test --- test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs index 81740674b438..37384ba7c18e 100644 --- a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs +++ b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs @@ -395,12 +395,12 @@ public async Task UploadBlobChunkedAsync_Failure() api.Verify(api => api.Blob.Upload.UploadChunkAsync(It.IsIn(absoluteUploadUri, uploadPath), It.IsAny(), It.IsAny()), Times.Exactly(1)); } + [Theory(Skip = "https://github.com/dotnet/sdk/issues/42820")] [InlineData(true, true, true)] [InlineData(false, true, true)] [InlineData(true, false, true)] [InlineData(false, false, true)] [InlineData(false, false, false)] - [Theory] public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps, bool httpServerCloseAbortive) { ILogger logger = _loggerFactory.CreateLogger(nameof(InsecureRegistry)); From f5a22006eb0610133751847d52c3ab425f8c52bb Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Tue, 10 Dec 2024 14:23:38 -0800 Subject: [PATCH 682/702] Skip DotnetNewListTests --- test/dotnet-new.Tests/DotnetNewListTests.Approval.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs b/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs index 0c1995a11340..985d1b07932b 100644 --- a/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs +++ b/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs @@ -7,7 +7,8 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests { public partial class DotnetNewListTests { - [Theory] +#pragma warning disable xUnit1004 // Test methods should not be skipped + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45406")] [InlineData("-l")] [InlineData("--list")] public Task BasicTest_WhenLegacyCommandIsUsed(string commandName) @@ -27,7 +28,7 @@ public Task BasicTest_WhenLegacyCommandIsUsed(string commandName) .DisableRequireUniquePrefix(); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45406")] public Task BasicTest_WhenListCommandIsUsed() { CommandResult commandResult = new DotnetNewCommand(_log, "list") @@ -41,6 +42,7 @@ public Task BasicTest_WhenListCommandIsUsed() return Verify(commandResult.StdOut).UniqueForOSPlatform(); } +#pragma warning restore xUnit1004 [Fact] public Task Constraints_CanShowMessageIfTemplateGroupIsRestricted() From 1697fe77470bf2cb9af72570a0f34a336dc3f97e Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 11 Dec 2024 08:42:06 -0800 Subject: [PATCH 683/702] Skip failing tests --- .../GivenThatWeWantToStoreAProjectWithDependencies.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b315e318c856..1925af0e32bb 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -121,7 +121,7 @@ public void compose_dependencies_noopt() storeDirectory.Should().OnlyHaveFiles(files_on_disk); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45417")] public void store_nativeonlyassets() { TestAsset simpleDependenciesAsset = _testAssetsManager From d964f3697ee647ddfc2e7c3ed063e3bd4be023b6 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 11 Dec 2024 08:42:13 -0800 Subject: [PATCH 684/702] Skip failing tests --- .../GivenThatWeWantToBuildANetCoreApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 05a1a3aaec49..4201fa3af6d3 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -48,7 +48,7 @@ public void It_targets_the_right_shared_framework(string targetFramework, string } // Test behavior when implicit version differs for framework-dependent and self-contained apps - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45417")] [InlineData("netcoreapp1.0", false, true, "1.0.5")] [InlineData("netcoreapp1.0", true, true, "1.0.16")] [InlineData("netcoreapp1.0", false, false, "1.0.5")] From 19991a64cb2601fa3896eb7a92e547a1b1e65e9e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 12 Dec 2024 02:10:52 -0800 Subject: [PATCH 685/702] Update vmr-prepare.yml file --- eng/pipelines/templates/steps/vmr-prepare.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 8cb5bae7815c..6b5b3c3f3ec9 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -15,7 +15,9 @@ steps: - powershell: | $branchName = "${{ parameters.vmrBranch }}" -replace "refs/heads/", "" - git checkout --track origin/$branchName || exit 1 + if (-not (git checkout --track origin/$branchName)) { + throw "Failed to checkout branch $branchName" + } echo "##vso[task.setvariable variable=vmrBranch]$branchName" displayName: Check out ${{ parameters.vmrBranch }} workingDirectory: $(Agent.BuildDirectory)/vmr From cc2d8c174608956a0293a64280a654947006e34d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 12 Dec 2024 11:22:55 +0100 Subject: [PATCH 686/702] Remove test-templates repo from VMR --- eng/Version.Details.xml | 30 ------------------- eng/Versions.props | 5 ---- .../content/eng/allowed-vmr-binaries.txt | 3 -- .../content/repo-projects/sdk.proj | 1 - .../content/repo-projects/test-templates.proj | 15 ---------- .../ExclusionsHelper.cs | 4 +-- .../LicenseScanTests/LicenseExclusions.txt | 7 ----- src/VirtualMonoRepo/source-mappings.json | 4 --- 8 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 src/SourceBuild/content/repo-projects/test-templates.proj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34f6bc2e6279..0e2ad43dec3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -359,36 +359,6 @@ https://github.com/dotnet/aspnetcore 61be94cbcb4726afaa107f91c349fc4328263b44 - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 01712257e7ac9363b002637d399206fd93fc724b - - - - https://github.com/dotnet/test-templates - 01712257e7ac9363b002637d399206fd93fc724b - - https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 07ee7714d326..4a7c72a624f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,11 +85,6 @@ 10.0.0-alpha.1.24605.2 - - - - 1.1.0-rtm.24576.1 - 10.0.0-alpha.1.24610.2 diff --git a/src/SourceBuild/content/eng/allowed-vmr-binaries.txt b/src/SourceBuild/content/eng/allowed-vmr-binaries.txt index 0b3f7c3ca6cc..7a1aeec70e39 100644 --- a/src/SourceBuild/content/eng/allowed-vmr-binaries.txt +++ b/src/SourceBuild/content/eng/allowed-vmr-binaries.txt @@ -130,9 +130,6 @@ src/symreader/src/PdbTestResources/Resources/* # templating src/templating/test/Microsoft.TemplateEngine.TestTemplates/nupkg_templates/*.nupkg -# test-templates -src/test-templates/Templates/**/*.nupkg - # vstest src/vstest/samples/Microsoft.TestPlatform.*/Adapter/Microsoft.VisualStudio.TestPlatform.*.dll src/vstest/temp/cpp/**/*.dll diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 426902cd6945..dc9f0fa45604 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -60,7 +60,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj deleted file mode 100644 index 64bf44782cca..000000000000 --- a/src/SourceBuild/content/repo-projects/test-templates.proj +++ /dev/null @@ -1,15 +0,0 @@ - - - - true - - - - - - - - - - - diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/ExclusionsHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/ExclusionsHelper.cs index 8c0188f5ada4..477cc70a8692 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/ExclusionsHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/ExclusionsHelper.cs @@ -23,8 +23,8 @@ internal class ExclusionsHelper private readonly string _baselineSubDir; // Use this to narrow down the scope of exclusions to a specific category. - // For instance, setting this to "test-templates" will consider - // "src/test-templates/exclusions.txt" but not "src/arcade/exclusions.txt". + // For instance, setting this to "vstest" will consider + // "src/vstest/exclusions.txt" but not "src/arcade/exclusions.txt". private readonly Regex? _exclusionRegex; private readonly Dictionary> _suffixToExclusions; diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/LicenseScanTests/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/LicenseScanTests/LicenseExclusions.txt index 83785a09c7e1..d30ecf82abdd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/LicenseScanTests/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/LicenseScanTests/LicenseExclusions.txt @@ -220,13 +220,6 @@ src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.i # False positive src/sourcelink/docs/GitSpec/GitSpec.md|unknown-license-reference -# -# test-templates -# - -# Not applicable to source -src/test-templates/Templates/**/*.vstemplate - # # vstest # diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 6f6017efa801..3ff3d2f27d26 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -154,10 +154,6 @@ "name": "templating", "defaultRemote": "https://github.com/dotnet/templating" }, - { - "name": "test-templates", - "defaultRemote": "https://github.com/dotnet/test-templates" - }, { "name": "vstest", "defaultRemote": "https://github.com/microsoft/vstest", From 1c02b102910960194e354201606f23387154d7c2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 12 Dec 2024 15:59:04 +0100 Subject: [PATCH 687/702] Delete src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch --- ...yn-dependencies-coming-from-maintena.patch | 110 ------------------ 1 file changed, 110 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch diff --git a/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch b/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch deleted file mode 100644 index 69fe0a94d85c..000000000000 --- a/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 49d5aea80a1c6a9fb0f724f87c9c9e00824dfafa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= - <1175054+carlossanlop@users.noreply.github.com> -Date: Tue, 26 Nov 2024 16:11:41 -0800 -Subject: [PATCH] Only update roslyn dependencies coming from - maintenance-packages when source build is true. Tracking issue: - https://github.com/dotnet/sdk/issues/45155 - ---- - eng/Directory.Packages.props | 18 +++++++----------- - eng/Versions.props | 26 ++++++++++++++++++++++++++ - 2 files changed, 33 insertions(+), 11 deletions(-) - -diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props -index 1466d926085..e9cfd1c429a 100644 ---- a/eng/Directory.Packages.props -+++ b/eng/Directory.Packages.props -@@ -184,7 +184,7 @@ - - - -- -+ - - - -@@ -194,9 +194,9 @@ - - - -- -- -- -+ -+ -+ - - - -@@ -205,7 +205,7 @@ - - - -- -+ - - - -@@ -233,7 +233,7 @@ - --> - - -- -+ - - - -@@ -307,11 +307,7 @@ - - - -- -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 3144be9ee76..97624c7e1e3 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -16,6 +16,32 @@ - --> - $(MajorVersion).$(MinorVersion).0.0 - -+ -+ -+ 6.1.0 -+ 4.6.0 -+ 4.9.0 -+ 4.6.0 -+ 4.6.0 -+ 6.1.0 -+ 4.6.0 -+ -+ -+ 6.0.1 -+ 4.5.1 -+ -+ 4.8.6 -+ 4.5.5 -+ 4.5.0 -+ 6.0.0 -+ 4.5.4 -+ - --- -2.47.0.windows.2 - From ea1d5b307798eb8a62256737f421de5c6c78d57b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Dec 2024 12:42:59 +0100 Subject: [PATCH 688/702] Fix xunit.runner.json inclusion --- test/Directory.Build.props | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/Directory.Build.props b/test/Directory.Build.props index ddd4b2b2773a..cb15df6b34a0 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,10 +1,9 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) $(DefaultItemExcludes);**/*.tmp + $(MSBuildThisFileDirectory)xunit.runner.json + $(MSBuildThisFileDirectory)xunit.runner.json @@ -38,7 +37,4 @@ - - - From 5dc88fc5c971c2a3bf7c95d39ae3a9623ec3e75b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Dec 2024 14:01:09 -0800 Subject: [PATCH 689/702] Skip BlazorWasm watch test as fallout from the net10 change Per tmat --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index e10b0a23ba92..b1a3ac470f3d 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -303,7 +303,7 @@ class AppUpdateHandler } } - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45299")] [CombinatorialData] public async Task BlazorWasm(bool projectSpecifiesCapabilities) { From 5161a4c6fb337aa238a68de6ccdb6c6960484fa2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 15 Dec 2024 22:37:08 -0800 Subject: [PATCH 690/702] Skip failing dotnet-watch test due to net10 branding issues --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index b1a3ac470f3d..b67c51241295 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -385,7 +385,7 @@ public async Task BlazorWasm_MSBuildWarning() await App.AssertWaitingForChanges(); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45299")] public async Task Razor_Component_ScopedCssAndStaticAssets() { var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps") From e5a8c453ae2cc837609126562e12e7e914e39752 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 11:51:04 +0100 Subject: [PATCH 691/702] upload artifacts to inspect the dotnet sdk --- eng/pipelines/templates/jobs/vmr-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 5903dae5a770..231b8f5c3a6a 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -194,6 +194,7 @@ jobs: path: $(artifactsStagingDir) artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts + condition: succeededOrFailed() sbomEnabled: true # Using build artifacts to enable publishing the vertical manifests to a single artifact from different jobs @@ -567,6 +568,7 @@ jobs: - publish: $(artifactsStagingDir) artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts + condition: succeededOrFailed() continueOnError: true # Using build artifacts to enable publishing the vertical manifests to a single artifact from different jobs From 5f8a897503f3a0bb927bdb8401502437959fc0af Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 17 Dec 2024 12:04:45 +0100 Subject: [PATCH 692/702] Revert vmr-prepare --- eng/pipelines/templates/steps/vmr-prepare.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 6b5b3c3f3ec9..0a34630a5400 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -10,14 +10,9 @@ steps: displayName: Clone dotnet/dotnet path: vmr clean: true - fetchTags: true - fetchDepth: 0 - - powershell: | - $branchName = "${{ parameters.vmrBranch }}" -replace "refs/heads/", "" - if (-not (git checkout --track origin/$branchName)) { - throw "Failed to checkout branch $branchName" - } - echo "##vso[task.setvariable variable=vmrBranch]$branchName" + - script: | + git checkout --track origin/${{ parameters.vmrBranch }} + echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}" displayName: Check out ${{ parameters.vmrBranch }} workingDirectory: $(Agent.BuildDirectory)/vmr From aa84f3ce10f812af797a30e5fe58e818de5f3c5e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 15:34:02 +0100 Subject: [PATCH 693/702] Move test-templates into 10.0 folder --- .../.template.config/dotnetcli.host.json | 0 .../MSTest-CSharp/.template.config/ide.host.json | 0 .../MSTest-CSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../MSTest-CSharp/.template.config/template.json | 0 .../MSTest-CSharp/Company.TestProject1.csproj | 0 .../content/MSTest-CSharp/MSTestSettings.cs | 0 .../content/MSTest-CSharp/Test1.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../MSTest-FSharp/.template.config/ide.host.json | 0 .../MSTest-FSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../MSTest-FSharp/.template.config/template.json | 0 .../MSTest-FSharp/Company.TestProject1.fsproj | 0 .../content/MSTest-FSharp/MSTestSettings.fs | 0 .../content/MSTest-FSharp/Test1.fs | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/ide.host.json | 0 .../.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../.template.config/template.json | 0 .../MSTest-VisualBasic/Company.TestProject1.vbproj | 0 .../content/MSTest-VisualBasic/MSTestSettings.vb | 0 .../content/MSTest-VisualBasic/Test1.vb | 0 .../.template.config/dotnetcli.host.json | 0 .../NUnit-CSharp/.template.config/ide.host.json | 0 .../NUnit-CSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../NUnit-CSharp/.template.config/template.json | 0 .../NUnit-CSharp/Company.TestProject1.csproj | 0 .../content/NUnit-CSharp/UnitTest1.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../NUnit-FSharp/.template.config/ide.host.json | 0 .../NUnit-FSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../NUnit-FSharp/.template.config/template.json | 0 .../NUnit-FSharp/Company.TestProject1.fsproj | 0 .../content/NUnit-FSharp/Program.fs | 0 .../content/NUnit-FSharp/UnitTest1.fs | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/ide.host.json | 0 .../NUnit-VisualBasic/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../.template.config/template.json | 0 .../NUnit-VisualBasic/Company.TestProject1.vbproj | 0 .../content/NUnit-VisualBasic/UnitTest1.vb | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/ide.host.json | 0 .../.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../.template.config/template.json | 0 .../Company.TestProject1.csproj | 0 .../Playwright-MSTest-CSharp/MSTestSettings.cs | 0 .../content/Playwright-MSTest-CSharp/Test1.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/ide.host.json | 0 .../.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../.template.config/template.json | 0 .../Company.TestProject1.csproj | 0 .../content/Playwright-NUnit-CSharp/UnitTest1.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../XUnit-CSharp/.template.config/ide.host.json | 0 .../XUnit-CSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../XUnit-CSharp/.template.config/template.json | 0 .../XUnit-CSharp/Company.TestProject1.csproj | 0 .../content/XUnit-CSharp/UnitTest1.cs | 0 .../.template.config/dotnetcli.host.json | 0 .../XUnit-FSharp/.template.config/ide.host.json | 0 .../XUnit-FSharp/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../XUnit-FSharp/.template.config/template.json | 0 .../XUnit-FSharp/Company.TestProject1.fsproj | 0 .../content/XUnit-FSharp/Program.fs | 0 .../content/XUnit-FSharp/Tests.fs | 0 .../.template.config/dotnetcli.host.json | 0 .../.template.config/ide.host.json | 0 .../XUnit-VisualBasic/.template.config/ide/icon.ico | Bin .../localize/templatestrings.cs.json | 0 .../localize/templatestrings.de.json | 0 .../localize/templatestrings.en.json | 0 .../localize/templatestrings.es.json | 0 .../localize/templatestrings.fr.json | 0 .../localize/templatestrings.it.json | 0 .../localize/templatestrings.ja.json | 0 .../localize/templatestrings.ko.json | 0 .../localize/templatestrings.pl.json | 0 .../localize/templatestrings.pt-BR.json | 0 .../localize/templatestrings.ru.json | 0 .../localize/templatestrings.tr.json | 0 .../localize/templatestrings.zh-Hans.json | 0 .../localize/templatestrings.zh-Hant.json | 0 .../.template.config/template.json | 0 .../XUnit-VisualBasic/Company.TestProject1.vbproj | 0 .../content/XUnit-VisualBasic/UnitTest1.vb | 0 226 files changed, 0 insertions(+), 0 deletions(-) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/Company.TestProject1.csproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/MSTestSettings.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-CSharp/Test1.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/Company.TestProject1.fsproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/MSTestSettings.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-FSharp/Test1.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/Company.TestProject1.vbproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/MSTestSettings.vb (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/MSTest-VisualBasic/Test1.vb (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/Company.TestProject1.csproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-CSharp/UnitTest1.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/Company.TestProject1.fsproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/Program.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-FSharp/UnitTest1.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/Company.TestProject1.vbproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/NUnit-VisualBasic/UnitTest1.vb (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/MSTestSettings.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-MSTest-CSharp/Test1.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/Playwright-NUnit-CSharp/UnitTest1.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/Company.TestProject1.csproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-CSharp/UnitTest1.cs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/Company.TestProject1.fsproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/Program.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-FSharp/Tests.fs (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/ide.host.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/ide/icon.ico (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/.template.config/template.json (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/Company.TestProject1.vbproj (100%) rename template_feed/{Microsoft.DotNet.Common.ProjectTemplates.9.0 => Microsoft.DotNet.Common.ProjectTemplates.10.0}/content/XUnit-VisualBasic/UnitTest1.vb (100%) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Company.TestProject1.csproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/MSTestSettings.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/MSTestSettings.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/MSTestSettings.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Test1.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-CSharp/Test1.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Test1.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Company.TestProject1.fsproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/MSTestSettings.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/MSTestSettings.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/MSTestSettings.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Test1.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-FSharp/Test1.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Test1.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/MSTestSettings.vb similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/MSTestSettings.vb rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/MSTestSettings.vb diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Test1.vb similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/MSTest-VisualBasic/Test1.vb rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Test1.vb diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/Company.TestProject1.csproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/UnitTest1.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-CSharp/UnitTest1.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/UnitTest1.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Company.TestProject1.fsproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Program.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/Program.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Program.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/UnitTest1.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-FSharp/UnitTest1.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/UnitTest1.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/UnitTest1.vb similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/NUnit-VisualBasic/UnitTest1.vb rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/UnitTest1.vb diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/MSTestSettings.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Test1.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-MSTest-CSharp/Test1.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Test1.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/UnitTest1.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/Playwright-NUnit-CSharp/UnitTest1.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/UnitTest1.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/Company.TestProject1.csproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/UnitTest1.cs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-CSharp/UnitTest1.cs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/UnitTest1.cs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Company.TestProject1.fsproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Program.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Program.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Program.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Tests.fs similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-FSharp/Tests.fs rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Tests.fs diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/dotnetcli.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/ide.host.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide.host.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/ide.host.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/ide/icon.ico diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/.template.config/template.json rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/UnitTest1.vb similarity index 100% rename from template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/XUnit-VisualBasic/UnitTest1.vb rename to template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/UnitTest1.vb From 2a32186ef8d157d2c6223f2662cd700cecde0e59 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 15:36:12 +0100 Subject: [PATCH 694/702] Update test-templates TFM to net10.0 and version to 10.0 --- .../.template.config/localize/templatestrings.cs.json | 4 ++-- .../.template.config/localize/templatestrings.de.json | 4 ++-- .../.template.config/localize/templatestrings.en.json | 4 ++-- .../.template.config/localize/templatestrings.es.json | 4 ++-- .../.template.config/localize/templatestrings.fr.json | 4 ++-- .../.template.config/localize/templatestrings.it.json | 4 ++-- .../.template.config/localize/templatestrings.ja.json | 4 ++-- .../.template.config/localize/templatestrings.ko.json | 4 ++-- .../.template.config/localize/templatestrings.pl.json | 4 ++-- .../localize/templatestrings.pt-BR.json | 4 ++-- .../.template.config/localize/templatestrings.ru.json | 4 ++-- .../.template.config/localize/templatestrings.tr.json | 4 ++-- .../localize/templatestrings.zh-Hans.json | 4 ++-- .../localize/templatestrings.zh-Hant.json | 4 ++-- .../MSTest-CSharp/.template.config/template.json | 10 +++++----- .../content/MSTest-CSharp/Company.TestProject1.csproj | 4 ++-- .../.template.config/localize/templatestrings.cs.json | 4 ++-- .../.template.config/localize/templatestrings.de.json | 4 ++-- .../.template.config/localize/templatestrings.en.json | 4 ++-- .../.template.config/localize/templatestrings.es.json | 4 ++-- .../.template.config/localize/templatestrings.fr.json | 4 ++-- .../.template.config/localize/templatestrings.it.json | 4 ++-- .../.template.config/localize/templatestrings.ja.json | 4 ++-- .../.template.config/localize/templatestrings.ko.json | 4 ++-- .../.template.config/localize/templatestrings.pl.json | 4 ++-- .../localize/templatestrings.pt-BR.json | 4 ++-- .../.template.config/localize/templatestrings.ru.json | 4 ++-- .../.template.config/localize/templatestrings.tr.json | 4 ++-- .../localize/templatestrings.zh-Hans.json | 4 ++-- .../localize/templatestrings.zh-Hant.json | 4 ++-- .../MSTest-FSharp/.template.config/template.json | 10 +++++----- .../content/MSTest-FSharp/Company.TestProject1.fsproj | 4 ++-- .../.template.config/localize/templatestrings.cs.json | 4 ++-- .../.template.config/localize/templatestrings.de.json | 4 ++-- .../.template.config/localize/templatestrings.en.json | 4 ++-- .../.template.config/localize/templatestrings.es.json | 4 ++-- .../.template.config/localize/templatestrings.fr.json | 4 ++-- .../.template.config/localize/templatestrings.it.json | 4 ++-- .../.template.config/localize/templatestrings.ja.json | 4 ++-- .../.template.config/localize/templatestrings.ko.json | 4 ++-- .../.template.config/localize/templatestrings.pl.json | 4 ++-- .../localize/templatestrings.pt-BR.json | 4 ++-- .../.template.config/localize/templatestrings.ru.json | 4 ++-- .../.template.config/localize/templatestrings.tr.json | 4 ++-- .../localize/templatestrings.zh-Hans.json | 4 ++-- .../localize/templatestrings.zh-Hant.json | 4 ++-- .../MSTest-VisualBasic/.template.config/template.json | 10 +++++----- .../MSTest-VisualBasic/Company.TestProject1.vbproj | 4 ++-- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../NUnit-CSharp/.template.config/template.json | 10 +++++----- .../content/NUnit-CSharp/Company.TestProject1.csproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../NUnit-FSharp/.template.config/template.json | 10 +++++----- .../content/NUnit-FSharp/Company.TestProject1.fsproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../NUnit-VisualBasic/.template.config/template.json | 10 +++++----- .../NUnit-VisualBasic/Company.TestProject1.vbproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 4 ++-- .../.template.config/localize/templatestrings.de.json | 4 ++-- .../.template.config/localize/templatestrings.en.json | 4 ++-- .../.template.config/localize/templatestrings.es.json | 4 ++-- .../.template.config/localize/templatestrings.fr.json | 4 ++-- .../.template.config/localize/templatestrings.it.json | 4 ++-- .../.template.config/localize/templatestrings.ja.json | 4 ++-- .../.template.config/localize/templatestrings.ko.json | 4 ++-- .../.template.config/localize/templatestrings.pl.json | 4 ++-- .../localize/templatestrings.pt-BR.json | 4 ++-- .../.template.config/localize/templatestrings.ru.json | 4 ++-- .../.template.config/localize/templatestrings.tr.json | 4 ++-- .../localize/templatestrings.zh-Hans.json | 4 ++-- .../localize/templatestrings.zh-Hant.json | 4 ++-- .../.template.config/template.json | 10 +++++----- .../Company.TestProject1.csproj | 4 ++-- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 10 +++++----- .../Company.TestProject1.csproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../XUnit-CSharp/.template.config/template.json | 10 +++++----- .../content/XUnit-CSharp/Company.TestProject1.csproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../XUnit-FSharp/.template.config/template.json | 10 +++++----- .../content/XUnit-FSharp/Company.TestProject1.fsproj | 2 +- .../.template.config/localize/templatestrings.cs.json | 2 +- .../.template.config/localize/templatestrings.de.json | 2 +- .../.template.config/localize/templatestrings.en.json | 2 +- .../.template.config/localize/templatestrings.es.json | 2 +- .../.template.config/localize/templatestrings.fr.json | 2 +- .../.template.config/localize/templatestrings.it.json | 2 +- .../.template.config/localize/templatestrings.ja.json | 2 +- .../.template.config/localize/templatestrings.ko.json | 2 +- .../.template.config/localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../.template.config/localize/templatestrings.ru.json | 2 +- .../.template.config/localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../XUnit-VisualBasic/.template.config/template.json | 10 +++++----- .../XUnit-VisualBasic/Company.TestProject1.vbproj | 2 +- 176 files changed, 280 insertions(+), 280 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json index 7583b86cf1c6..c17ebf19e214 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json index 6efc8d1d8cf8..2c9187ad2beb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json index d9bc6dc97a68..c0048f488ef4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json index 305229b9a359..a3cf38a2156a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json index e45be9f93711..6e6bce30a1ee 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json index f5e8728d97f0..c45fd3eb88c5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituisci framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json index 14c905b12790..b0313a2b4b06 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json index 2fd4493ada1f..4e832c3d322e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json index ea2eac97efd4..8a37912abd8a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Platforma", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index 16fd3fa54a67..1f3273fe8c7d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json index 047c6cfe751b..7ed35e4cbd0e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json index 8b3bf65eaade..54bc6df0bfef 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index e66977ab72ac..c41fbb0391a3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index ecd10175e093..3796b9095c79 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json index ad72039df120..e697716d6bc2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", "precedence": "11000", - "identity": "Microsoft.Test.MSTest.CSharp.9.0", + "identity": "Microsoft.Test.MSTest.CSharp.10.0", "shortName": "mstest", "tags": { "language": "C#", @@ -31,11 +31,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", + "choice": "net10.0", "description": ".NET 9" }, { - "choice": "net9.0-windows", + "choice": "net10.0-windows", "description": ".NET 9 (Windows only)" }, { @@ -91,8 +91,8 @@ "description": ".NET Framework 4.6.2" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj index caa5b15e2d06..b946e74e8821 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) @@ -32,7 +32,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json index 840926e34472..9ec25c0046a6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json index dbc7c16b6a03..6415afe0b2c4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json index 25995d0d38dc..bb1c18e8ed67 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json index 3bc4d3e9bef8..31b4380c7b1a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json index 550002afe6ec..4e6fce4520ca 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json index 8c88c602d95d..01d888659d58 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json index ccbdb25e928f..9928352883dd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json index 8d49fc97c0d7..c536cbfb7f72 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json index 48f6f6715065..164c0a5a3236 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json index f59995dc88b1..5a6201faef0c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json index d311df0bf35a..3b3219a2c21a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json index 1de6366539af..02546690876e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 24f4160c6432..a35ee9e69901 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 22b497209460..dee514cc5584 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json index 1dff74b7dccc..15032f348ea6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", "precedence": "11000", - "identity": "Microsoft.Test.MSTest.FSharp.9.0", + "identity": "Microsoft.Test.MSTest.FSharp.10.0", "shortName": "mstest", "tags": { "language": "F#", @@ -31,11 +31,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", + "choice": "net10.0", "description": ".NET 9" }, { - "choice": "net9.0-windows", + "choice": "net10.0-windows", "description": ".NET 9 (Windows only)" }, { @@ -91,8 +91,8 @@ "description": ".NET Framework 4.6.2" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj index 27f64ac9f1b6..342f7ca670f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) @@ -37,7 +37,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json index 84992e4fa119..81e40c467a90 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json index 3a483a010d56..a40db37f4ca2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json index 9a72dcaf9eda..4ccd49a990d0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json index 7d02ba6ffbbb..d8f00753ae41 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json index 6679f4711bf1..da7ab39ded3c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json index 2de6e9b0d37c..c6a156fdf7a1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json index a5a85dfa68ea..6d9dd9a56b80 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json index f45b6f1fcd68..ef40ee138fad 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json index 702b44d00f54..ede2c767e9b3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Platforma", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index a4d5aba9b4f8..c3ae0fdaa149 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json index a240b80377d6..33a409a043f2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json index bc010fff2fb2..6263fc00d41f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index 5cfad0340162..a4e0df5ebffd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index d43072b1e195..57331d973e85 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json index e001b37b7f06..16a52dcf66b9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", "precedence": "11000", - "identity": "Microsoft.Test.MSTest.VisualBasic.9.0", + "identity": "Microsoft.Test.MSTest.VisualBasic.10.0", "shortName": "mstest", "tags": { "language": "VB", @@ -31,11 +31,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", + "choice": "net10.0", "description": ".NET 9" }, { - "choice": "net9.0-windows", + "choice": "net10.0-windows", "description": ".NET 9 (Windows only)" }, { @@ -91,8 +91,8 @@ "description": ".NET Framework 4.6.2" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj index caa5b15e2d06..b946e74e8821 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) @@ -32,7 +32,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json index 9954de885524..f4b8efc6f99c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json index 633ac5a5448d..c60a1f45130f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json index 3b001b8859e9..b766ce12d96e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json index 3004c46be3f7..e5aca0829613 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json index a374d6ad2ca8..50a9eaf7cdcc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json index d03fa98d148d..1caf7cd8cade 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json index b0c87888a5af..42669e1163a1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json index f76476604b65..73691e4051cc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json index af6dca1ab606..7c393cc732f4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index e730b9fec3cc..7e30eb2f047d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json index f0c872ef07f1..5b5f0be4fc6b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json index a38c3fe4313e..8ff7762ceeaa 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 94f6cc688f7e..31d99eeea02a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index cc5e6f68594d..641d51ead5f8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json index a457114aa8f2..a5917517b6f3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json @@ -8,7 +8,7 @@ "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", "precedence": "11000", - "identity": "NUnit3.DotNetNew.Template.CSharp.9.0", + "identity": "NUnit3.DotNetNew.Template.CSharp.10.0", "shortName": "nunit", "tags": { "language": "C#", @@ -32,12 +32,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj index 54f2e899613a..db1d8ece4b23 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json index 44bce1dce044..2f14d205a4f6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json index 8bcf0524f5f4..9dbc40663365 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json index bd3ee8137ecd..eb2e284da8c0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json index 77de98763d73..9ee4b9d23fb1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json index 99261ea67f81..7e003d08d99c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json index 109564f221e5..e888aec336e7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json index c2cfd377b0a1..1e1444f4c0bd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json index c8959254fa64..3d690e3cb242 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json index e77daf82f5ae..23d3b6764f5f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json index ddf10204eb91..318efee36957 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json index bc6018415c7f..fff314fcf804 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json index 8e7226222ff5..cc5e3de0e417 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json index bf2ac453ccac..98bc6e335da9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 0a9ca0e9c48a..d2fbaf7cf44d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json index 9198a9194f8d..5faf4adefdfe 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json @@ -8,7 +8,7 @@ "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", "precedence": "11000", - "identity": "NUnit3.DotNetNew.Template.FSharp.9.0", + "identity": "NUnit3.DotNetNew.Template.FSharp.10.0", "shortName": "nunit", "tags": { "language": "F#", @@ -32,12 +32,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj index a92fbf4f17bd..a84b80a3492f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json index 47c58110be13..948582708682 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json index c4f6de71fdfb..d3172ba52c06 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json index cd09da07d35d..5c66ede97250 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json index 7646487e9a55..9a3d0e6e2067 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json index 76baa5e9f88d..cdb8760b3521 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json index b45caf7660c0..8c0e631762e4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json index 85c60156ec55..cac46e90fa5f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json index 4af8e48f6fb3..983ac988e64f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json index 441b1c4a952e..28fae6b7366a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index 8915b5105f24..232d32bc3afa 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json index 993d3034811c..fb491aaf82a8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json index aee9a61a4513..802dd355a3cb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index 5676dc93f8d6..9e9b143c8644 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index 6416181da161..c8532d26e052 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json index f968814bafa6..a664568fe0b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json @@ -8,7 +8,7 @@ "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", "precedence": "11000", - "identity": "NUnit3.DotNetNew.Template.VisualBasic.9.0", + "identity": "NUnit3.DotNetNew.Template.VisualBasic.10.0", "shortName": "nunit", "tags": { "language": "VB", @@ -32,12 +32,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj index 06a8cce31deb..8d27a5210365 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json index eef66383be40..21edca1313db 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json index 7849c4e0eaba..24b5e13cc5fc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json index 05129394dbc2..78c8ac96f92f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json index c18173426fbb..ebe40edaabbb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json index 3cf4e3501ebb..ac58451013b2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json index a5bf580dc1d6..bef9eca8bbdb 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json index ccefaf4b6587..3394298b0f60 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json index eeb8a52bce4b..805e8189fc68 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json index d0552dd197a7..97a4af10850e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index d6502e56a1b3..d0227fb753bd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json index db078e96eb56..e6caeddb99db 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json index 0e8882559087..098c324d3e03 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 03bc292abf19..80cb3812ff59 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index fdb96e87b953..d7b04d5c936a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,8 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": ".NET 9", - "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 9", + "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json index 0ae4e448f112..c13f724a79b3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.Playwright.MSTest", "precedence": "11000", - "identity": "Microsoft.Test.Playwright.MSTest.CSharp.9.0", + "identity": "Microsoft.Test.Playwright.MSTest.CSharp.10.0", "shortName": "mstest-playwright", "tags": { "language": "C#", @@ -31,11 +31,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", + "choice": "net10.0", "description": ".NET 9" }, { - "choice": "net9.0-windows", + "choice": "net10.0-windows", "description": ".NET 9 (Windows only)" }, { @@ -91,8 +91,8 @@ "description": ".NET Framework 4.6.2" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj index 4ff20f517af8..378ba4599c25 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) @@ -33,7 +33,7 @@ - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json index 8e54470849b5..3f2392b6579a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json index 766534361e3a..95b714435d58 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json index 9a25c57f5cb1..8355638e38f5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json index 1ad2bdb22d80..861ff21d45fc 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json index 4adbfd743e7a..27b3a2f26df9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json index 066a2b7e8a28..53da72d5c626 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json index 6467f88fd9d7..9e33fc2368c5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json index 990b58d734c8..4531cfacacda 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json index 5ee5a51f1e0c..3b9d20f930f2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index b62468189344..de5dda80d21f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json index da495429668f..29b5a32c0c51 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json index ba3d48433658..7926538e08e9 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 91ddf6b8a37b..5c6f8b1447c3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 844dc1a6560b..2300924811e5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json index fb724864a494..cbbc27dfa79e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.Playwright.NUnit", "precedence": "11000", - "identity": "Microsoft.Test.Playwright.NUnit.CSharp.9.0", + "identity": "Microsoft.Test.Playwright.NUnit.CSharp.10.0", "shortName": "nunit-playwright", "tags": { "language": "C#", @@ -31,12 +31,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj index 73ad86c6315f..0425ec75fe1e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 $(ProjectLanguageVersion) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json index d0080f216ec4..b860e7a91962 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json index c36da154c4f4..be77d05be890 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json index dbf6c2188a51..47c72c7192da 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json index e3665a5882dc..8da2b713bb9f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json index bb0caa1c3a4e..c7c3d51ad26f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json index c410d45dbbb9..447c6c03a64d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json index f58e744cdd11..c7d2438ec69c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json index 4569dd2da09d..8ba3246be2ea 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json index d802efacf9d0..6fc40822dc85 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Platforma", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json index a99c65709407..f774157cfb79 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json index a35d248e8b58..6830d4974b65 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json index 9c5935563bb9..0121340d5e93 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 8e011c975aba..179b6d2cdb27 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json index c45a20b5c6d5..18ccb5575129 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json index 693bd7b31292..dd5d9b9bc527 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", "precedence": "11000", - "identity": "Microsoft.Test.xUnit.CSharp.9.0", + "identity": "Microsoft.Test.xUnit.CSharp.10.0", "shortName": "xunit", "tags": { "language": "C#", @@ -31,12 +31,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj index f8dfe44840f8..cbce87cf4fc5 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 enable diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json index 65c41424cc2e..78fa5c781f3c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json index 388456f070ce..c160f9959f58 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json index 376d0b7e73b6..373107d96640 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json index 20d717c22293..31341187ca0c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json index 6e6ba438a796..d14eeed32f47 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json index 19e8fa7b022b..9ebc3fd7164d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json index 65525242dc69..74399f220006 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json index c4a462f2ff68..66d4ed97b8a0 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json index 70f60366605d..e45b61f27861 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json index 210719f75632..914d01ec8ce6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json index 2361f4dd8cb9..3f752e7c1e3d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json index 527fff292d01..7083772a4a6f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 8b68cc68b87b..6987eb15e833 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json index ce4a0c7c2ef4..ee9381c71956 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json index 38fa0bb0f31c..265816739ae3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", "precedence": "11000", - "identity": "Microsoft.Test.xUnit.FSharp.9.0", + "identity": "Microsoft.Test.xUnit.FSharp.10.0", "shortName": "xunit", "tags": { "language": "F#", @@ -31,12 +31,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj index c48820765553..96421d5c0a0e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TargetFrameworkOverride Company.TestProject1 true diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json index d0080f216ec4..b860e7a91962 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Určuje, jestli se má pro projekt povolit balení (přes „dotnet pack“).", "symbols/EnablePack/displayName": "Povolit balíček", "symbols/skipRestore/description": "Je-li zadáno, přeskočí automatické obnovení projektu při vytvoření.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json index c36da154c4f4..be77d05be890 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Ziel net9.0", + "symbols/Framework/choices/net10.0/description": "Ziel net10.0", "symbols/EnablePack/description": "Gibt an, ob die Paketerstellung (über \"dotnet pack\") für das Projekt aktiviert werden soll.", "symbols/EnablePack/displayName": "Paket aktivieren", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json index dbf6c2188a51..47c72c7192da 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Whether or not to enable packaging (via \"dotnet pack\") for the project.", "symbols/EnablePack/displayName": "Enable pack", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json index e3665a5882dc..8da2b713bb9f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net9.0/description": "Net9.0 de destino", + "symbols/Framework/choices/net10.0/description": "net10.0 de destino", "symbols/EnablePack/description": "Indica si se va a habilitar o no el empaquetado (a través de \"dotnet pack\") para el proyecto.", "symbols/EnablePack/displayName": "Habilitar paquete", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json index bb0caa1c3a4e..c7c3d51ad26f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net9.0/description": "Net9.0 cible", + "symbols/Framework/choices/net10.0/description": "net10.0 cible", "symbols/EnablePack/description": "Indique s’il faut activer ou non la création de packages (via « dotnet pack ») pour le projet.", "symbols/EnablePack/displayName": "Activer le pack", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json index c410d45dbbb9..447c6c03a64d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net9.0/description": "Net9.0 di destinazione", + "symbols/Framework/choices/net10.0/description": "net10.0 di destinazione", "symbols/EnablePack/description": "Indica se abilitare o meno la creazione del pacchetto (tramite \"dotnet pack\") per il progetto.", "symbols/EnablePack/displayName": "Abilita pacchetto", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json index c7a225c1033d..cf5f3c00e288 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net9.0/description": "ターゲット net9.0", + "symbols/Framework/choices/net10.0/description": "ターゲット net10.0", "symbols/EnablePack/description": "(\"dotnet pack\" を使用して) プロジェクトのパッケージ化を有効にするかどうか。", "symbols/EnablePack/displayName": "パックを有効にする", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json index 4569dd2da09d..8ba3246be2ea 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "프로젝트에 대해 패키징(\"dotnet pack\"을 통해)을 활성화할지 여부", "symbols/EnablePack/displayName": "팩 사용", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json index 11cfecf91103..3c180485d1e7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0", + "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0", "symbols/EnablePack/description": "Określa, czy włączyć pakowanie (za pośrednictwem „pakietu dotnet”) dla projektu.", "symbols/EnablePack/displayName": "Włącz pakiet", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index a99c65709407..f774157cfb79 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/EnablePack/description": "Se deseja ou não habilitar o empacotamento (via \"dotnet pack\") para o projeto.", "symbols/EnablePack/displayName": "Habilitar pacote", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json index a35d248e8b58..6830d4974b65 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net9.0/description": "Целевая среда net9.0", + "symbols/Framework/choices/net10.0/description": "Целевая среда net10.0", "symbols/EnablePack/description": "Следует ли включить упаковку (через \"dotnet pack\") для проекта.", "symbols/EnablePack/displayName": "Включить пакет", "symbols/skipRestore/description": "Позволяет пропускать автоматическое восстановление проекта при создании.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json index 9c5935563bb9..0121340d5e93 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net9.0/description": "Hedef net9.0", + "symbols/Framework/choices/net10.0/description": "Hedef net10.0", "symbols/EnablePack/description": "Proje için paketlemeyi etkinleştirip etkinleştirmeme ayarı ( \"dotnet pack\" üzerinden).", "symbols/EnablePack/displayName": "Paketi etkinleştir", "symbols/skipRestore/description": "Belirtilmişse, oluşturma anında projenin otomatik geri yüklenmesini atlar.", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index 8e011c975aba..179b6d2cdb27 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net9.0/description": "目标 net9.0", + "symbols/Framework/choices/net10.0/description": "目标 net10.0", "symbols/EnablePack/description": "是否(通过 \"dotnet pack\")为项目启用打包。", "symbols/EnablePack/displayName": "启用包", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index c45a20b5c6d5..18ccb5575129 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net9.0/description": "目標 net9.0", + "symbols/Framework/choices/net10.0/description": "目標 net10.0", "symbols/EnablePack/description": "是否要啟用專案的封裝 (透過 \"dotnet pack\")。", "symbols/EnablePack/displayName": "啟用壓縮", "symbols/skipRestore/description": "如果指定，則會在建立時跳過專案的自動還原。", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json index b7a71a5f0699..407fa140351c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", "precedence": "11000", - "identity": "Microsoft.Test.xUnit.VisualBasic.9.0", + "identity": "Microsoft.Test.xUnit.VisualBasic.10.0", "shortName": "xunit", "tags": { "language": "VB", @@ -31,12 +31,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "EnablePack": { "type": "parameter", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj index 666df509d85e..f7bde4de0756 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj @@ -2,7 +2,7 @@ Company.TestProject1 - net9.0 + net10.0 TargetFrameworkOverride true false From 3ffd4b1d3f71f9a6eda600886adb9945e0f296ad Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 17:03:06 +0100 Subject: [PATCH 695/702] Update precedence --- .../MSTest-CSharp-TestClass/.template.config/template.json | 2 +- .../content/NUnit-CSharp-Item/.template.config/template.json | 2 +- .../content/NUnit-FSharp-Item/.template.config/template.json | 2 +- .../NUnit-VisualBasic-Item/.template.config/template.json | 2 +- .../content/MSTest-CSharp/.template.config/template.json | 2 +- .../content/MSTest-FSharp/.template.config/template.json | 2 +- .../content/MSTest-VisualBasic/.template.config/template.json | 2 +- .../content/NUnit-CSharp/.template.config/template.json | 2 +- .../content/NUnit-FSharp/.template.config/template.json | 2 +- .../content/NUnit-VisualBasic/.template.config/template.json | 2 +- .../Playwright-MSTest-CSharp/.template.config/template.json | 2 +- .../Playwright-NUnit-CSharp/.template.config/template.json | 2 +- .../content/XUnit-CSharp/.template.config/template.json | 2 +- .../content/XUnit-FSharp/.template.config/template.json | 2 +- .../content/XUnit-VisualBasic/.template.config/template.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json index ef0644585695..bf550a473f1b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/MSTest-CSharp-TestClass/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "Creates a new MSTest test class", "groupIdentity": "Microsoft.Test.MSTest.TestClass", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.MSTest.TestClass.CSharp.9.0", "shortName": "mstest-class", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json index 773bca9627c8..f2de209e44d8 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-CSharp-Item/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "Creates a new NUnit test class", "groupIdentity": "NUnit3.DotNetNew.ItemTemplate", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.ItemTemplate.CSharp.9.0", "shortName": "nunit-test", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json index 030b402264b8..b0c7f91862e9 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-FSharp-Item/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "Creates a new NUnit test class", "groupIdentity": "NUnit3.DotNetNew.ItemTemplate", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.ItemTemplate.FSharp.9.0", "shortName": "nunit-test", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/template.json index 1391a994cc03..ce8c24f969b4 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/NUnit-VisualBasic-Item/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "Creates a new NUnit test class", "groupIdentity": "NUnit3.DotNetNew.ItemTemplate", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.ItemTemplate.VisualBasic.9.0", "shortName": "nunit-test", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json index e697716d6bc2..47abd184e136 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.MSTest.CSharp.10.0", "shortName": "mstest", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json index 15032f348ea6..21b1f1dd9e40 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.MSTest.FSharp.10.0", "shortName": "mstest", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json index 16a52dcf66b9..9b9296837628 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains MSTest tests that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.MSTest", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.MSTest.VisualBasic.10.0", "shortName": "mstest", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json index a5917517b6f3..6b31a8439339 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.Template.CSharp.10.0", "shortName": "nunit", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json index 5faf4adefdfe..72c5dae8347e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.Template.FSharp.10.0", "shortName": "nunit", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json index a664568fe0b6..cf39a816d358 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains NUnit tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "NUnit3.DotNetNew.Template", - "precedence": "11000", + "precedence": "12000", "identity": "NUnit3.DotNetNew.Template.VisualBasic.10.0", "shortName": "nunit", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json index c13f724a79b3..6dadc34e261d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains Playwright tests using MSTest test framework, that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.Playwright.MSTest", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.Playwright.MSTest.CSharp.10.0", "shortName": "mstest-playwright", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json index cbbc27dfa79e..de3c0063934b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains Playwright tests using NUnit test framework, that can run on .NET on Windows, Linux and MacOS.", "groupIdentity": "Microsoft.Test.Playwright.NUnit", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.Playwright.NUnit.CSharp.10.0", "shortName": "nunit-playwright", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json index dd5d9b9bc527..4267937bfd3b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.xUnit.CSharp.10.0", "shortName": "xunit", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json index 265816739ae3..e3cee6e75741 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.xUnit.FSharp.10.0", "shortName": "xunit", "tags": { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json index 407fa140351c..8d63b4b475d3 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/.template.config/template.json @@ -6,7 +6,7 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project that contains xUnit.net tests that can run on .NET on Windows, Linux and macOS", "groupIdentity": "Microsoft.Test.xUnit", - "precedence": "11000", + "precedence": "12000", "identity": "Microsoft.Test.xUnit.VisualBasic.10.0", "shortName": "xunit", "tags": { From b4342d57436cb06428b76625b03318f367b00434 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 17:11:16 +0100 Subject: [PATCH 696/702] Keep shadow copying disabled --- test/xunit.runner.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/xunit.runner.json b/test/xunit.runner.json index b6b56f537621..1fca20845e33 100644 --- a/test/xunit.runner.json +++ b/test/xunit.runner.json @@ -2,5 +2,6 @@ "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json", "diagnosticMessages": true, "longRunningTestSeconds": 20, - "showLiveOutput": true + "showLiveOutput": true, + "shadowCopy": false } From 92269411b27c3f7ad0aeb6e872b9a22ef0bd33d5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2024 18:29:35 +0100 Subject: [PATCH 697/702] update tempate test tfm --- test/EndToEnd.Tests/ProjectBuildTests.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/EndToEnd.Tests/ProjectBuildTests.cs b/test/EndToEnd.Tests/ProjectBuildTests.cs index 664a9e241ee9..9d71dc9b5c6d 100644 --- a/test/EndToEnd.Tests/ProjectBuildTests.cs +++ b/test/EndToEnd.Tests/ProjectBuildTests.cs @@ -408,11 +408,7 @@ private static string DetectExpectedDefaultFramework(string template = "") { // TODO: This block need to be updated when every template updates their default tfm. // Currently winforms updated their default templates target but not others. - if (template.StartsWith("mstest") - || template.StartsWith("winforms") - || template.StartsWith("wpf") - || template.StartsWith("nunit") - || template.StartsWith("xunit")) + if (template.StartsWith("winforms") || template.StartsWith("wpf")) { return $"net9.0"; } From 70ab6b6977623f73fc34e006e77534af4f69b7f9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 14:44:24 +0100 Subject: [PATCH 698/702] Add roslyn patch --- ...fix-compiler-errors-immutablehashset.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch new file mode 100644 index 000000000000..935fcd5a3576 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch @@ -0,0 +1,32 @@ +From 3947cd2577d601a06cdf3d859c62f8b55c91b623 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Wed, 18 Dec 2024 14:38:02 +0100 +Subject: [PATCH] FIx build errors with newer toolset and dependencies + +Fixes the following two errors: +- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] +- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] + +The underlying SDK being used is "10.0.100-alpha.1.24555.54" + +Backport: https://github.com/dotnet/roslyn/pull/76486 + +--- + .../ExternalAccess/Watch/Api/WatchHotReloadService.cs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs b/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs +index 2173339e29b..b7cfb0356df 100644 +--- a/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs ++++ b/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs +@@ -68,8 +68,8 @@ public readonly struct Updates( + ModuleUpdateStatus status, + ImmutableArray diagnostics, + ImmutableArray projectUpdates, +- IReadOnlySet projectsToRestart, +- IReadOnlySet projectsToRebuild) ++ ImmutableHashSet projectsToRestart, ++ ImmutableHashSet projectsToRebuild) + { + /// + /// Status of the updates. From 0a225e83f9c5a0f2b0f9d278bef6d0d2e94f5afc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 15:16:10 +0100 Subject: [PATCH 699/702] Update template TFMs --- .../.template.config/localize/templatestrings.cs.json | 6 ++++-- .../.template.config/localize/templatestrings.de.json | 6 ++++-- .../.template.config/localize/templatestrings.en.json | 6 ++++-- .../.template.config/localize/templatestrings.es.json | 6 ++++-- .../.template.config/localize/templatestrings.fr.json | 6 ++++-- .../.template.config/localize/templatestrings.it.json | 6 ++++-- .../.template.config/localize/templatestrings.ja.json | 6 ++++-- .../.template.config/localize/templatestrings.ko.json | 6 ++++-- .../.template.config/localize/templatestrings.pl.json | 6 ++++-- .../localize/templatestrings.pt-BR.json | 6 ++++-- .../.template.config/localize/templatestrings.ru.json | 6 ++++-- .../.template.config/localize/templatestrings.tr.json | 6 ++++-- .../localize/templatestrings.zh-Hans.json | 6 ++++-- .../localize/templatestrings.zh-Hant.json | 6 ++++-- .../MSTest-CSharp/.template.config/template.json | 10 +++++++++- .../.template.config/localize/templatestrings.cs.json | 6 ++++-- .../.template.config/localize/templatestrings.de.json | 6 ++++-- .../.template.config/localize/templatestrings.en.json | 6 ++++-- .../.template.config/localize/templatestrings.es.json | 6 ++++-- .../.template.config/localize/templatestrings.fr.json | 6 ++++-- .../.template.config/localize/templatestrings.it.json | 6 ++++-- .../.template.config/localize/templatestrings.ja.json | 6 ++++-- .../.template.config/localize/templatestrings.ko.json | 6 ++++-- .../.template.config/localize/templatestrings.pl.json | 6 ++++-- .../localize/templatestrings.pt-BR.json | 6 ++++-- .../.template.config/localize/templatestrings.ru.json | 6 ++++-- .../.template.config/localize/templatestrings.tr.json | 6 ++++-- .../localize/templatestrings.zh-Hans.json | 6 ++++-- .../localize/templatestrings.zh-Hant.json | 6 ++++-- .../MSTest-FSharp/.template.config/template.json | 10 +++++++++- .../.template.config/localize/templatestrings.cs.json | 6 ++++-- .../.template.config/localize/templatestrings.de.json | 6 ++++-- .../.template.config/localize/templatestrings.en.json | 6 ++++-- .../.template.config/localize/templatestrings.es.json | 6 ++++-- .../.template.config/localize/templatestrings.fr.json | 6 ++++-- .../.template.config/localize/templatestrings.it.json | 6 ++++-- .../.template.config/localize/templatestrings.ja.json | 6 ++++-- .../.template.config/localize/templatestrings.ko.json | 6 ++++-- .../.template.config/localize/templatestrings.pl.json | 6 ++++-- .../localize/templatestrings.pt-BR.json | 6 ++++-- .../.template.config/localize/templatestrings.ru.json | 6 ++++-- .../.template.config/localize/templatestrings.tr.json | 6 ++++-- .../localize/templatestrings.zh-Hans.json | 6 ++++-- .../localize/templatestrings.zh-Hant.json | 6 ++++-- .../MSTest-VisualBasic/.template.config/template.json | 10 +++++++++- .../.template.config/localize/templatestrings.cs.json | 6 ++++-- .../.template.config/localize/templatestrings.de.json | 6 ++++-- .../.template.config/localize/templatestrings.en.json | 6 ++++-- .../.template.config/localize/templatestrings.es.json | 6 ++++-- .../.template.config/localize/templatestrings.fr.json | 6 ++++-- .../.template.config/localize/templatestrings.it.json | 6 ++++-- .../.template.config/localize/templatestrings.ja.json | 6 ++++-- .../.template.config/localize/templatestrings.ko.json | 6 ++++-- .../.template.config/localize/templatestrings.pl.json | 6 ++++-- .../localize/templatestrings.pt-BR.json | 6 ++++-- .../.template.config/localize/templatestrings.ru.json | 6 ++++-- .../.template.config/localize/templatestrings.tr.json | 6 ++++-- .../localize/templatestrings.zh-Hans.json | 6 ++++-- .../localize/templatestrings.zh-Hant.json | 2 ++ .../.template.config/template.json | 10 +++++++++- 60 files changed, 258 insertions(+), 114 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json index c17ebf19e214..90949e4d4a2f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (jenom Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json index 2c9187ad2beb..72bd5ba201b7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (nur Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json index c0048f488ef4..23438a626050 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows only)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json index a3cf38a2156a..1787687b1e97 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json index 6e6bce30a1ee..92df5d07b578 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows uniquement)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json index c45fd3eb88c5..0ecc964a2b5b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituisci framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json index b0313a2b4b06..a5cd73b9ee1d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows のみ)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json index 4e832c3d322e..0a04a4673531 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10(Windows만 해당)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json index 8a37912abd8a..c9fdc148bd48 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Platforma", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (tylko system Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index 1f3273fe8c7d..292ace6ccbdd 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (somente Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json index 7ed35e4cbd0e..928e28705747 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (только для Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json index 54bc6df0bfef..d0ca2ca4c465 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (yalnızca Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index c41fbb0391a3..0699b04ab637 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (仅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 3796b9095c79..55a1df310c93 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (僅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json index 47abd184e136..d63ecec5fc45 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json @@ -32,10 +32,18 @@ "choices": [ { "choice": "net10.0", - "description": ".NET 9" + "description": ".NET 10" }, { "choice": "net10.0-windows", + "description": ".NET 10 (Windows only)" + }, + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", "description": ".NET 9 (Windows only)" }, { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json index 9ec25c0046a6..0a7e1c4ce3b6 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (jenom Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json index 6415afe0b2c4..e7b25fccb442 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (nur Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json index bb1c18e8ed67..ec3cf1bec85e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows only)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json index 31b4380c7b1a..85a050607356 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json index 4e6fce4520ca..4a34be376d5c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows uniquement)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json index 01d888659d58..cf1d0c23d6d2 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json index 9928352883dd..8cfa574ceb35 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows のみ)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json index c536cbfb7f72..db999f123292 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10(Windows만 해당)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json index 164c0a5a3236..2fc39b85f69e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (tylko system Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json index 5a6201faef0c..3674eb49ec57 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (somente Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json index 3b3219a2c21a..85064d1f3673 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (только для Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json index 02546690876e..f0db9accfa26 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (yalnızca Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json index a35ee9e69901..d662df313966 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (仅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json index dee514cc5584..a7bb050b775d 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (僅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json index 21b1f1dd9e40..b4538b3c475a 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json @@ -32,10 +32,18 @@ "choices": [ { "choice": "net10.0", - "description": ".NET 9" + "description": ".NET 10" }, { "choice": "net10.0-windows", + "description": ".NET 10 (Windows only)" + }, + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", "description": ".NET 9 (Windows only)" }, { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json index 81e40c467a90..2064d2b109a4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (jenom Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json index a40db37f4ca2..3fc7a76173e8 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (nur Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json index 4ccd49a990d0..9758560f9433 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows only)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json index d8f00753ae41..227f27b145b4 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json index da7ab39ded3c..b6b4ad0e3a70 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows uniquement)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json index c6a156fdf7a1..6ab1957c4529 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json index 6d9dd9a56b80..f8e3fef7e617 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows のみ)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json index ef40ee138fad..6f46572375c7 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10(Windows만 해당)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json index ede2c767e9b3..54ec2936fa4b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Platforma", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (tylko system Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json index c3ae0fdaa149..fd5ab216c9de 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (somente Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json index 33a409a043f2..a19c3c966e40 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (только для Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json index 6263fc00d41f..b647767d430f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (yalnızca Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json index a4e0df5ebffd..33c39f8d5198 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (仅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json index 57331d973e85..b8e94e05061f 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目標架構覆寫", "symbols/Framework/description": "專案的目標 Framework。", "symbols/Framework/displayName": "架構", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (僅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json index 9b9296837628..9b41ff110a56 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json @@ -32,10 +32,18 @@ "choices": [ { "choice": "net10.0", - "description": ".NET 9" + "description": ".NET 10" }, { "choice": "net10.0-windows", + "description": ".NET 10 (Windows only)" + }, + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", "description": ".NET 9 (Windows only)" }, { diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json index 21edca1313db..ab88f233c1a1 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury", "symbols/Framework/description": "Cílová architektura pro projekt.", "symbols/Framework/displayName": "Architektura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (jenom Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (jenom Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (jenom Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (jenom Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json index 24b5e13cc5fc..69504dc97d3e 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Überschreibung des Zielframeworks", "symbols/Framework/description": "Das Zielframework für das Projekt.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (nur Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (nur Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (nur Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (nur Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json index 78c8ac96f92f..9ed1d6f28d3b 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Target framework override", "symbols/Framework/description": "The target framework for the project.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows only)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows only)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows only)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows only)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json index ebe40edaabbb..587b4bf49756 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino", "symbols/Framework/description": "Marco de destino del proyecto.", "symbols/Framework/displayName": "Marco", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json index ac58451013b2..4aaaec3bd586 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Remplacement du cadre cible", "symbols/Framework/description": "Framework cible du projet.", "symbols/Framework/displayName": "Infrastructure", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows uniquement)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows uniquement)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows uniquement)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows uniquement)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json index bef9eca8bbdb..8badcf6ede67 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Sostituzione del framework di destinazione", "symbols/Framework/description": "Il framework di destinazione per il progetto.", "symbols/Framework/displayName": "Framework", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (solo Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (solo Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (solo Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (solo Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json index 3394298b0f60..bd8519a9b930 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", "symbols/Framework/displayName": "フレームワーク", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (Windows のみ)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (Windows のみ)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (Windows のみ)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (Windows のみ)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json index 805e8189fc68..a75343bbbf39 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", "symbols/Framework/displayName": "프레임워크", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9(Windows만 해당)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10(Windows만 해당)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9(Windows만 해당)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8(Windows만 해당)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json index 97a4af10850e..295d39852a47 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Zastąpienie struktury docelowej", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", "symbols/Framework/displayName": "Struktura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (tylko system Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (tylko system Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (tylko system Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (tylko system Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json index d0227fb753bd..ace29986181c 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino", "symbols/Framework/description": "A estrutura de destino do projeto.", "symbols/Framework/displayName": "Estrutura", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (somente Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (somente Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (somente Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (somente Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json index e6caeddb99db..ef5313d27a70 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы", "symbols/Framework/description": "Целевая платформа для проекта.", "symbols/Framework/displayName": "Платформа", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (только для Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (только для Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (только для Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (только для Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json index 098c324d3e03..2daa2133c618 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma", "symbols/Framework/description": "Projenin hedef çerçevesi.", "symbols/Framework/displayName": "Çerçeve", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (yalnızca Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (yalnızca Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (yalnızca Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (yalnızca Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 80cb3812ff59..b01848fcaafe 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,8 +6,10 @@ "symbols/TargetFrameworkOverride/displayName": "目标框架替代", "symbols/Framework/description": "项目的目标框架。", "symbols/Framework/displayName": "框架", - "symbols/Framework/choices/net10.0/description": ".NET 9", - "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (仅限 Windows)", + "symbols/Framework/choices/net10.0/description": ".NET 10", + "symbols/Framework/choices/net10.0-windows/description": ".NET 10 (仅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 9", + "symbols/Framework/choices/net9.0-windows/description": ".NET 9 (仅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (仅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json index d7b04d5c936a..2ef9ff776c26 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -8,6 +8,8 @@ "symbols/Framework/displayName": "架構", "symbols/Framework/choices/net10.0/description": ".NET 9", "symbols/Framework/choices/net10.0-windows/description": ".NET 9 (僅限 Windows)", + "symbols/Framework/choices/net9.0/description": ".NET 10", + "symbols/Framework/choices/net9.0-windows/description": ".NET 10 (僅限 Windows)", "symbols/Framework/choices/net8.0/description": ".NET 8", "symbols/Framework/choices/net8.0-windows/description": ".NET 8 (僅限 Windows)", "symbols/Framework/choices/net7.0/description": ".NET 7", diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json index 6dadc34e261d..fcf6da24c994 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json @@ -32,10 +32,18 @@ "choices": [ { "choice": "net10.0", - "description": ".NET 9" + "description": ".NET 10" }, { "choice": "net10.0-windows", + "description": ".NET 10 (Windows only)" + }, + { + "choice": "net9.0", + "description": ".NET 9" + }, + { + "choice": "net9.0-windows", "description": ".NET 9 (Windows only)" }, { From 74a830d6dcc0a89edd8cd6081e950cf72133f115 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 16:32:18 +0100 Subject: [PATCH 700/702] Update roslyn patch --- ...1-fix-compiler-errors-downgraded-sci.patch | 30 +++++++++++++++++ ...fix-compiler-errors-immutablehashset.patch | 32 ------------------- 2 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch delete mode 100644 src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch new file mode 100644 index 000000000000..e27514953f22 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch @@ -0,0 +1,30 @@ +From 826604a1eef61831f205169d392b33983aa0340c Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Wed, 18 Dec 2024 14:38:02 +0100 +Subject: [PATCH] FIx build errors with newer toolset and dependencies + +Fixes the following two errors: +- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] +- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] + +The underlying SDK being used is "10.0.100-alpha.1.24555.54" + +Backport: https://github.com/dotnet/roslyn/pull/76486 + +--- + .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +index c3729dd7244..48a5d9c53a7 100644 +--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj ++++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +@@ -139,7 +139,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch deleted file mode 100644 index 935fcd5a3576..000000000000 --- a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3947cd2577d601a06cdf3d859c62f8b55c91b623 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 18 Dec 2024 14:38:02 +0100 -Subject: [PATCH] FIx build errors with newer toolset and dependencies - -Fixes the following two errors: -- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] -- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] - -The underlying SDK being used is "10.0.100-alpha.1.24555.54" - -Backport: https://github.com/dotnet/roslyn/pull/76486 - ---- - .../ExternalAccess/Watch/Api/WatchHotReloadService.cs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs b/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs -index 2173339e29b..b7cfb0356df 100644 ---- a/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs -+++ b/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs -@@ -68,8 +68,8 @@ public readonly struct Updates( - ModuleUpdateStatus status, - ImmutableArray diagnostics, - ImmutableArray projectUpdates, -- IReadOnlySet projectsToRestart, -- IReadOnlySet projectsToRebuild) -+ ImmutableHashSet projectsToRestart, -+ ImmutableHashSet projectsToRebuild) - { - /// - /// Status of the updates. From e1729a68f62dff84eacf703e74f4a36cceebb3cb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 16:43:36 +0100 Subject: [PATCH 701/702] update roslyn patch againnnn --- ...errors-downgraded-sci-and-other-deps.patch | 63 +++++++++++++++++++ ...1-fix-compiler-errors-downgraded-sci.patch | 30 --------- 2 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch delete mode 100644 src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch new file mode 100644 index 000000000000..446c674f1447 --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch @@ -0,0 +1,63 @@ +From c8355ffa159872e061789a62e02768c8f52e7c53 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Wed, 18 Dec 2024 14:38:02 +0100 +Subject: [PATCH] FIx build errors with newer toolset and dependencies + +Fixes the following two errors: +- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] +- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] + +The underlying SDK being used is "10.0.100-alpha.1.24555.54" + +Backport: https://github.com/dotnet/roslyn/pull/76486 + +--- + src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj | 4 ++-- + .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 2 +- + .../Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj +index 94c47e9a01e..e946b3ad490 100644 +--- a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj ++++ b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj +@@ -31,9 +31,9 @@ + will import everything but content files from Microsoft.CodeAnalysis.Analyzers, specifically, analyzers. + --> + +- ++ + +- ++ + + + +diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +index c3729dd7244..48a5d9c53a7 100644 +--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj ++++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +@@ -139,7 +139,7 @@ + + + +- ++ + + + +diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +index 7ddf1ce681c..877356417e5 100644 +--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj ++++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +@@ -29,8 +29,8 @@ + since it's now automatic, and Source Build will ensure we get a proper one automatically if we do nothing; if we reference the older version + then source build may only give us a reference assembly would fail if we then try to actually run that output. --> + +- +- ++ ++ + + + diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch deleted file mode 100644 index e27514953f22..000000000000 --- a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 826604a1eef61831f205169d392b33983aa0340c Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 18 Dec 2024 14:38:02 +0100 -Subject: [PATCH] FIx build errors with newer toolset and dependencies - -Fixes the following two errors: -- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] -- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] - -The underlying SDK being used is "10.0.100-alpha.1.24555.54" - -Backport: https://github.com/dotnet/roslyn/pull/76486 - ---- - .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -index c3729dd7244..48a5d9c53a7 100644 ---- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj -@@ -139,7 +139,7 @@ - - - -- -+ - - - From 21b02992c87d2ef29c042782f03d3c80d6c7888e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 17:47:03 +0100 Subject: [PATCH 702/702] Fix System.Threading.Channels change in roslyn patch --- ...iler-errors-downgraded-sci-and-other-deps-again.patch} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename src/SourceBuild/patches/roslyn/{0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch => 0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch} (95%) diff --git a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch similarity index 95% rename from src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch rename to src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch index 446c674f1447..6efd1335a2e1 100644 --- a/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch +++ b/src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch @@ -1,4 +1,4 @@ -From c8355ffa159872e061789a62e02768c8f52e7c53 Mon Sep 17 00:00:00 2001 +From 7cb9fb458c533d0ba183ae84563167b365df7145 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Dec 2024 14:38:02 +0100 Subject: [PATCH] FIx build errors with newer toolset and dependencies @@ -7,8 +7,6 @@ Fixes the following two errors: - src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] - src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet' to 'System.Collections.Generic.IReadOnlySet' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0] -The underlying SDK being used is "10.0.100-alpha.1.24555.54" - Backport: https://github.com/dotnet/roslyn/pull/76486 --- @@ -47,7 +45,7 @@ index c3729dd7244..48a5d9c53a7 100644 diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj -index 7ddf1ce681c..877356417e5 100644 +index 7ddf1ce681c..9e889061c83 100644 --- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj @@ -29,8 +29,8 @@ @@ -56,7 +54,7 @@ index 7ddf1ce681c..877356417e5 100644 - - -+ ++ +