dotnet
/
sdk
зеркало из https://github.com/dotnet/sdk.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'main' into dev/Jason/Merge-the-net10-codeflows

This commit is contained in:
Andy Gocke 2024-09-16 15:44:47 -07:00 коммит произвёл GitHub
Родитель 9788afc3db ae525fbbca
Коммит 3c95614d25
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
46 изменённых файлов: 236 добавлений и 209 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

176
eng/Version.Details.xml
Просмотреть файл

@ -69,67 +69,67 @@
<Sha>9a42b800fc36b40b1c3831009137bd33accf32eb</Sha> <Sha>9a42b800fc36b40b1c3831009137bd33accf32eb</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" /> <SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24456-02"> <Dependency Name="Microsoft.Build" Version="17.12.0-preview-24463-04">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>2206a054f2c82e91918809ea27d1ef5b3f7cfc4b</Sha> <Sha>8500d97af62549fb2eeb9691d8e2ba1714ea07b4</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24456-02"> <Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24463-04">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>2206a054f2c82e91918809ea27d1ef5b3f7cfc4b</Sha> <Sha>8500d97af62549fb2eeb9691d8e2ba1714ea07b4</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24456-02"> <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24463-04">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>2206a054f2c82e91918809ea27d1ef5b3f7cfc4b</Sha> <Sha>8500d97af62549fb2eeb9691d8e2ba1714ea07b4</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" /> <SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.100-beta.24459.7"> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.100-beta.24463.5">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>ff6f1e4cc3e3bec35c6252db2a8b96c7c5362ffc</Sha> <Sha>15c05bd87541c8ac023aa2c3a0d86a5da7f1b918</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.100-beta.24459.7"> <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.100-beta.24463.5">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>ff6f1e4cc3e3bec35c6252db2a8b96c7c5362ffc</Sha> <Sha>15c05bd87541c8ac023aa2c3a0d86a5da7f1b918</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" /> <SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24460.1"> <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24463.1">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a69841b8ca9751bee0fe9fdeedc705e198e195d9</Sha> <Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24461.22"> <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24461.22">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
@ -139,74 +139,74 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a257011d726ad7b3700e003276df39bacffbcef</Sha> <Sha>3a257011d726ad7b3700e003276df39bacffbcef</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.0-rc.94"> <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Build.Tasks" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" /> <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Commands" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Commands" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.0-rc.94"> <Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Common" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Common" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Configuration" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Configuration" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Credentials" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Credentials" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.0-rc.94"> <Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Frameworks" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.LibraryModel" Version="6.12.0-rc.94"> <Dependency Name="NuGet.LibraryModel" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.ProjectModel" Version="6.12.0-rc.94"> <Dependency Name="NuGet.ProjectModel" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Protocol" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Protocol" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Packaging" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Packaging" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Versioning" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Versioning" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="NuGet.Localization" Version="6.12.0-rc.94"> <Dependency Name="NuGet.Localization" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri> <Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>5d08fbd496ee2ce63b50dfe0803edbd9701e1b35</Sha> <Sha>2982dbfc1bac22d71234d8498af6ad43e129a49c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.12.0-preview-24453-04"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.12.0-preview-24453-04">
<Uri>https://github.com/microsoft/vstest</Uri> <Uri>https://github.com/microsoft/vstest</Uri>
@ -321,22 +321,22 @@
<Sha>3a257011d726ad7b3700e003276df39bacffbcef</Sha> <Sha>3a257011d726ad7b3700e003276df39bacffbcef</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24459.1"> <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24465.1">
<Uri>https://github.com/dotnet/razor</Uri> <Uri>https://github.com/dotnet/razor</Uri>
<Sha>308833d8b85f790695be44aad273433286ff68a4</Sha> <Sha>bc0e2afe46c55eae20b0760ea4e013bb99c2c8e0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24459.1"> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24465.1">
<Uri>https://github.com/dotnet/razor</Uri> <Uri>https://github.com/dotnet/razor</Uri>
<Sha>308833d8b85f790695be44aad273433286ff68a4</Sha> <Sha>bc0e2afe46c55eae20b0760ea4e013bb99c2c8e0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24459.1"> <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24465.1">
<Uri>https://github.com/dotnet/razor</Uri> <Uri>https://github.com/dotnet/razor</Uri>
<Sha>308833d8b85f790695be44aad273433286ff68a4</Sha> <Sha>bc0e2afe46c55eae20b0760ea4e013bb99c2c8e0</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24459.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24465.1">
<Uri>https://github.com/dotnet/razor</Uri> <Uri>https://github.com/dotnet/razor</Uri>
<Sha>308833d8b85f790695be44aad273433286ff68a4</Sha> <Sha>bc0e2afe46c55eae20b0760ea4e013bb99c2c8e0</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" /> <SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24461.22"> <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24461.22">
@ -375,14 +375,14 @@
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha> <Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24459.2"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24463.2">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>cb42ab507e76aff8bdbf990c6eea2aa74a10f26a</Sha> <Sha>2b8a55f3d3f380ae10d2c2f4d0974c92727ccc22</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24459.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24463.2">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>cb42ab507e76aff8bdbf990c6eea2aa74a10f26a</Sha> <Sha>2b8a55f3d3f380ae10d2c2f4d0974c92727ccc22</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" /> <SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@ -456,34 +456,34 @@
<Uri>https://github.com/dotnet/deployment-tools</Uri> <Uri>https://github.com/dotnet/deployment-tools</Uri>
<Sha>57d7baec5f331a145174d0e8f00d7bbfdf2b77d4</Sha> <Sha>57d7baec5f331a145174d0e8f00d7bbfdf2b77d4</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24459.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24460.3">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>cad8a1c1be34c872f91ae3e0e2c871d2f48ad011</Sha> <Sha>bf1a5712940d4eb08d9640b70bc0a2e065da4ac7</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" /> <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->

66
eng/Versions.props
Просмотреть файл

@ -122,7 +122,7 @@
<!-- Supported versions --> <!-- Supported versions -->
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion> <MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion> <MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24459.2</MicrosoftDotNetTestProjectTemplates90PackageVersion> <MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24463.2</MicrosoftDotNetTestProjectTemplates90PackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime --> <!-- Dependencies from https://github.com/dotnet/runtime -->
@ -179,18 +179,18 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client --> <!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.12.0-rc.94</NuGetBuildTasksPackageVersion> <NuGetBuildTasksPackageVersion>6.12.0-rc.106</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.12.0-rc.94</NuGetBuildTasksConsolePackageVersion> <NuGetBuildTasksConsolePackageVersion>6.12.0-rc.106</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.12.0-rc.94</NuGetLocalizationPackageVersion> <NuGetLocalizationPackageVersion>6.12.0-rc.106</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.12.0-rc.94</NuGetBuildTasksPackPackageVersion> <NuGetBuildTasksPackPackageVersion>6.12.0-rc.106</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.12.0-rc.94</NuGetCommandLineXPlatPackageVersion> <NuGetCommandLineXPlatPackageVersion>6.12.0-rc.106</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.12.0-rc.94</NuGetProjectModelPackageVersion> <NuGetProjectModelPackageVersion>6.12.0-rc.106</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-rc.94</MicrosoftBuildNuGetSdkResolverPackageVersion> <MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-rc.106</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.12.0-rc.94</NuGetCommonPackageVersion> <NuGetCommonPackageVersion>6.12.0-rc.106</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.12.0-rc.94</NuGetConfigurationPackageVersion> <NuGetConfigurationPackageVersion>6.12.0-rc.106</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.12.0-rc.94</NuGetFrameworksPackageVersion> <NuGetFrameworksPackageVersion>6.12.0-rc.106</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.12.0-rc.94</NuGetPackagingPackageVersion> <NuGetPackagingPackageVersion>6.12.0-rc.106</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.12.0-rc.94</NuGetVersioningPackageVersion> <NuGetVersioningPackageVersion>6.12.0-rc.106</NuGetVersioningPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/vstest --> <!-- Dependencies from https://github.com/Microsoft/vstest -->
@ -218,8 +218,8 @@
then use that in Directory.Packages.props. 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. -->
<MicrosoftBuildVersion>17.12.0-preview-24456-02</MicrosoftBuildVersion> <MicrosoftBuildVersion>17.12.0-preview-24463-04</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24456-02</MicrosoftBuildLocalizationVersion> <MicrosoftBuildLocalizationVersion>17.12.0-preview-24463-04</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion> <MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -237,18 +237,18 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/visualfsharp --> <!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
<MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24459.7</MicrosoftFSharpCompilerPackageVersion> <MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24463.5</MicrosoftFSharpCompilerPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn --> <!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24460.1</MicrosoftNetCompilersToolsetVersion> <MicrosoftNetCompilersToolsetVersion>4.12.0-3.24463.1</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24460.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion> <MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24463.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisPackageVersion> <MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisCSharpPackageVersion> <MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion> <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion> <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion> <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24460.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24463.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@ -268,9 +268,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor --> <!-- Dependencies from https://github.com/dotnet/razor -->
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24459.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion> <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24465.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24459.1</MicrosoftCodeAnalysisRazorToolingInternalVersion> <MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24465.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24459.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion> <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24465.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf --> <!-- Dependencies from https://github.com/dotnet/wpf -->
@ -330,12 +330,12 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink --> <!-- Dependencies from https://github.com/dotnet/sourcelink -->
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24459.2</MicrosoftBuildTasksGitVersion> <MicrosoftBuildTasksGitVersion>9.0.0-beta.24460.3</MicrosoftBuildTasksGitVersion>
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24459.2</MicrosoftSourceLinkCommonVersion> <MicrosoftSourceLinkCommonVersion>9.0.0-beta.24460.3</MicrosoftSourceLinkCommonVersion>
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24459.2</MicrosoftSourceLinkAzureReposGitVersion> <MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24460.3</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24459.2</MicrosoftSourceLinkGitHubVersion> <MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24460.3</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24459.2</MicrosoftSourceLinkGitLabVersion> <MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24460.3</MicrosoftSourceLinkGitLabVersion>
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24459.2</MicrosoftSourceLinkBitbucketGitVersion> <MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24460.3</MicrosoftSourceLinkBitbucketGitVersion>
</PropertyGroup> </PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages --> <!-- Get .NET Framework reference assemblies from NuGet packages -->
<PropertyGroup> <PropertyGroup>

44
eng/pipelines/templates/jobs/vmr-build.yml
Просмотреть файл

@ -70,10 +70,10 @@ parameters:
type: boolean type: boolean
default: false default: false
# Name of a previous job (from the same template as this) whose output will be used to build this job # Name of previous job(s) (from the same template as this) whose output will be used to build this job
# The SDK from its artifacts is copied to $(sourcesPath)/.dotnet # The SDK from its artifacts is copied to $(sourcesPath)/.dotnet
- name: reuseBuildArtifactsFrom - name: reuseBuildArtifactsFrom
type: string type: object
default: '' default: ''
# Allow downloading artifacts from the internet during the build # Allow downloading artifacts from the internet during the build
@ -120,7 +120,7 @@ jobs:
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
# The build shortcuts when stage 1 build fails and doesn't produce the SDK. # The build shortcuts when stage 1 build fails and doesn't produce the SDK.
condition: succeededOrFailed() condition: succeededOrFailed()
dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }} dependsOn: ${{ parameters.reuseBuildArtifactsFrom }}
variables: variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: AzureDevOps-Artifact-Feeds-Pats - group: AzureDevOps-Artifact-Feeds-Pats
@ -205,20 +205,30 @@ jobs:
displayName: Export VMR sources displayName: Export VMR sources
workingDirectory: $(Build.StagingDirectory) workingDirectory: $(Build.StagingDirectory)
- ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }}: - ${{ if ne(parameters.reuseBuildArtifactsFrom,'') }}:
- download: current - ${{ each reuseBuildArtifacts in parameters.reuseBuildArtifactsFrom }}:
artifact: ${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts - download: current
patterns: | artifact: ${{ reuseBuildArtifacts }}_Artifacts
**/Private.SourceBuilt.Artifacts.*.tar.gz patterns: |
**/dotnet-sdk-*.tar.gz **/Private.SourceBuilt.Artifacts.*.tar.gz
displayName: Download Previous Build **/dotnet-sdk-*.tar.gz
**/*.nupkg
displayName: Download Previous Build (${{ reuseBuildArtifacts }})
- task: CopyFiles@2 - task: CopyFiles@2
displayName: Copy Previous Build displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
inputs: inputs:
SourceFolder: $(Pipeline.Workspace)/${{ parameters.reuseBuildArtifactsFrom }}_${{ parameters.architecture }}_Artifacts/assets/Release SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/assets/Release
Contents: '*.tar.gz' Contents: '*.tar.gz'
TargetFolder: $(sourcesPath)/prereqs/packages/archive/ TargetFolder: $(sourcesPath)/prereqs/packages/archive/
- task: CopyFiles@2
displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - NuGet Packages)
inputs:
SourceFolder: $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/packages
Contents: '**/*.nupkg'
OverWrite: false
TargetFolder: $(sourcesPath)/artifacts/packages/
- ${{ if eq(parameters.withPreviousSDK, 'true') }}: - ${{ if eq(parameters.withPreviousSDK, 'true') }}:
- script: | - script: |
@ -293,7 +303,7 @@ jobs:
# downloading portable versions from the internet. # downloading portable versions from the internet.
customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap" customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap"
prepSdk=false prepSdk=false
elif [[ -n '${{ parameters.reuseBuildArtifactsFrom }}' ]]; then elif [[ '${{ length(parameters.reuseBuildArtifactsFrom) }}' -gt '0' ]]; then
customPrepArgs="${customPrepArgs} --no-sdk --no-artifacts" customPrepArgs="${customPrepArgs} --no-sdk --no-artifacts"
prepSdk=false prepSdk=false
fi fi

9
eng/pipelines/templates/stages/vmr-build.yml
Просмотреть файл

@ -120,7 +120,8 @@ stages:
runOnline: true # ✅ runOnline: true # ✅
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
reuseBuildArtifactsFrom: ${{ format('{0}_Online_MsftSdk', variables.centOSStreamName) }} reuseBuildArtifactsFrom:
- ${{ format('{0}_Online_MsftSdk_x64', variables.centOSStreamName) }}
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
@ -318,7 +319,8 @@ stages:
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
reuseBuildArtifactsFrom: ${{ format('{0}_Offline_MsftSdk', variables.fedoraName) }} reuseBuildArtifactsFrom:
- ${{ format('{0}_Offline_MsftSdk_x64', variables.fedoraName) }}
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
@ -336,7 +338,8 @@ stages:
runOnline: false # 🚫 runOnline: false # 🚫
useMonoRuntime: true # ✅ useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
reuseBuildArtifactsFrom: ${{ format('{0}_Mono_Offline_MsftSdk', variables.centOSStreamName) }} reuseBuildArtifactsFrom:
- ${{ format('{0}_Mono_Offline_MsftSdk_x64', variables.centOSStreamName) }}
#### VERTICAL BUILD #### #### VERTICAL BUILD ####
- ${{ if not(parameters.isSourceOnlyBuild) }}: - ${{ if not(parameters.isSourceOnlyBuild) }}:

2
eng/restore-toolset.ps1
Просмотреть файл

@ -10,7 +10,7 @@ function InitializeCustomSDKToolset {
# The following frameworks and tools are used only for testing. # The following frameworks and tools are used only for testing.
# Do not attempt to install them in source build. # Do not attempt to install them in source build.
if ($env:DotNetBuildFromSource -eq "true" -or $productBuild -or $properties -like "*DotNetBuildRepo=true*") { if ($productBuild -or $properties -like "*DotNetBuildRepo=true*") {
return return
} }

2
src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/BaseSerializer.cs
Просмотреть файл

@ -294,4 +294,6 @@ internal abstract class BaseSerializer
Type type when type == typeof(bool) => sizeof(bool), Type type when type == typeof(bool) => sizeof(bool),
_ => 0, _ => 0,
}; };
public static bool IsNullOrEmpty<T>(T[]? list) => list is null || list.Length == 0;
} }

2
src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/CommandLineOptionMessagesSerializer.cs
Просмотреть файл

@ -167,7 +167,7 @@ namespace Microsoft.DotNet.Tools.Test
private static ushort GetFieldCount(CommandLineOptionMessages commandLineOptionMessages) => private static ushort GetFieldCount(CommandLineOptionMessages commandLineOptionMessages) =>
(ushort)((commandLineOptionMessages.ModulePath is null ? 0 : 1) + (ushort)((commandLineOptionMessages.ModulePath is null ? 0 : 1) +
(commandLineOptionMessages.CommandLineOptionMessageList is null ? 0 : 1)); (IsNullOrEmpty(commandLineOptionMessages.CommandLineOptionMessageList) ? 0 : 1));
private static ushort GetFieldCount(CommandLineOptionMessage commandLineOptionMessage) => private static ushort GetFieldCount(CommandLineOptionMessage commandLineOptionMessage) =>
(ushort)((commandLineOptionMessage.Name is null ? 0 : 1) + (ushort)((commandLineOptionMessage.Name is null ? 0 : 1) +

2
src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/DiscoveredTestMessagesSerializer.cs
Просмотреть файл

@ -148,7 +148,7 @@ namespace Microsoft.DotNet.Tools.Test
private static ushort GetFieldCount(DiscoveredTestMessages discoveredTestMessages) => private static ushort GetFieldCount(DiscoveredTestMessages discoveredTestMessages) =>
(ushort)((discoveredTestMessages.ExecutionId is null ? 0 : 1) + (ushort)((discoveredTestMessages.ExecutionId is null ? 0 : 1) +
(discoveredTestMessages.DiscoveredMessages is null ? 0 : 1)); (IsNullOrEmpty(discoveredTestMessages.DiscoveredMessages) ? 0 : 1));
private static ushort GetFieldCount(DiscoveredTestMessage discoveredTestMessage) => private static ushort GetFieldCount(DiscoveredTestMessage discoveredTestMessage) =>
(ushort)((discoveredTestMessage.Uid is null ? 0 : 1) + (ushort)((discoveredTestMessage.Uid is null ? 0 : 1) +

2
src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/FileArtifactMessagesSerializer.cs
Просмотреть файл

@ -184,7 +184,7 @@ namespace Microsoft.DotNet.Tools.Test
private static ushort GetFieldCount(FileArtifactMessages fileArtifactMessages) => private static ushort GetFieldCount(FileArtifactMessages fileArtifactMessages) =>
(ushort)((fileArtifactMessages.ExecutionId is null ? 0 : 1) + (ushort)((fileArtifactMessages.ExecutionId is null ? 0 : 1) +
(fileArtifactMessages.FileArtifacts is null ? 0 : 1)); (IsNullOrEmpty(fileArtifactMessages.FileArtifacts) ? 0 : 1));
private static ushort GetFieldCount(FileArtifactMessage fileArtifactMessage) => private static ushort GetFieldCount(FileArtifactMessage fileArtifactMessage) =>
(ushort)((fileArtifactMessage.FullPath is null ? 0 : 1) + (ushort)((fileArtifactMessage.FullPath is null ? 0 : 1) +

24
src/Cli/dotnet/commands/dotnet-test/IPC/Serializers/TestResultMessagesSerializer.cs
Просмотреть файл

@ -284,7 +284,7 @@ namespace Microsoft.DotNet.Tools.Test
return; return;
} }
WriteShort(stream, TestResultMessagesFieldsId.SuccessfulTestMessageList); WriteShort(stream, TestResultMessagesFieldsId.FailedTestMessageList);
// We will reserve an int (4 bytes) // We will reserve an int (4 bytes)
// so that we fill the size later, once we write the payload // so that we fill the size later, once we write the payload
@ -292,17 +292,17 @@ namespace Microsoft.DotNet.Tools.Test
long before = stream.Position; long before = stream.Position;
WriteInt(stream, failedTestResultMessages.Length); WriteInt(stream, failedTestResultMessages.Length);
foreach (FailedTestResultMessage successfulTestResultMessage in failedTestResultMessages) foreach (FailedTestResultMessage failedTestResultMessage in failedTestResultMessages)
{ {
WriteShort(stream, GetFieldCount(successfulTestResultMessage)); WriteShort(stream, GetFieldCount(failedTestResultMessage));
WriteField(stream, FailedTestResultMessageFieldsId.Uid, successfulTestResultMessage.Uid); WriteField(stream, FailedTestResultMessageFieldsId.Uid, failedTestResultMessage.Uid);
WriteField(stream, FailedTestResultMessageFieldsId.DisplayName, successfulTestResultMessage.DisplayName); WriteField(stream, FailedTestResultMessageFieldsId.DisplayName, failedTestResultMessage.DisplayName);
WriteField(stream, FailedTestResultMessageFieldsId.State, successfulTestResultMessage.State); WriteField(stream, FailedTestResultMessageFieldsId.State, failedTestResultMessage.State);
WriteField(stream, FailedTestResultMessageFieldsId.Reason, successfulTestResultMessage.Reason); WriteField(stream, FailedTestResultMessageFieldsId.Reason, failedTestResultMessage.Reason);
WriteField(stream, FailedTestResultMessageFieldsId.ErrorMessage, successfulTestResultMessage.ErrorMessage); WriteField(stream, FailedTestResultMessageFieldsId.ErrorMessage, failedTestResultMessage.ErrorMessage);
WriteField(stream, FailedTestResultMessageFieldsId.ErrorStackTrace, successfulTestResultMessage.ErrorStackTrace); WriteField(stream, FailedTestResultMessageFieldsId.ErrorStackTrace, failedTestResultMessage.ErrorStackTrace);
WriteField(stream, FailedTestResultMessageFieldsId.SessionUid, successfulTestResultMessage.SessionUid); WriteField(stream, FailedTestResultMessageFieldsId.SessionUid, failedTestResultMessage.SessionUid);
} }
// NOTE: We are able to seek only if we are using a MemoryStream // NOTE: We are able to seek only if we are using a MemoryStream
@ -312,8 +312,8 @@ namespace Microsoft.DotNet.Tools.Test
private static ushort GetFieldCount(TestResultMessages testResultMessages) => private static ushort GetFieldCount(TestResultMessages testResultMessages) =>
(ushort)((testResultMessages.ExecutionId is null ? 0 : 1) + (ushort)((testResultMessages.ExecutionId is null ? 0 : 1) +
(testResultMessages.SuccessfulTestMessages is null ? 0 : 1) + (IsNullOrEmpty(testResultMessages.SuccessfulTestMessages) ? 0 : 1) +
(testResultMessages.FailedTestMessages is null ? 0 : 1)); (IsNullOrEmpty(testResultMessages.FailedTestMessages) ? 0 : 1));
private static ushort GetFieldCount(SuccessfulTestResultMessage successfulTestResultMessage) => private static ushort GetFieldCount(SuccessfulTestResultMessage successfulTestResultMessage) =>
(ushort)((successfulTestResultMessage.Uid is null ? 0 : 1) + (ushort)((successfulTestResultMessage.Uid is null ? 0 : 1) +

23
src/Cli/dotnet/commands/dotnet-test/MSBuildConnectionHandler.cs
Просмотреть файл

@ -10,13 +10,13 @@ namespace Microsoft.DotNet.Cli
{ {
internal sealed class MSBuildConnectionHandler : IDisposable internal sealed class MSBuildConnectionHandler : IDisposable
{ {
private readonly string[] _args; private List<string> _args;
private readonly TestApplicationActionQueue _actionQueue; private readonly TestApplicationActionQueue _actionQueue;
private readonly PipeNameDescription _pipeNameDescription = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N")); private readonly PipeNameDescription _pipeNameDescription = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
private readonly List<NamedPipeServer> _namedPipeConnections = new(); private readonly List<NamedPipeServer> _namedPipeConnections = new();
public MSBuildConnectionHandler(string[] args, TestApplicationActionQueue actionQueue) public MSBuildConnectionHandler(List<string> args, TestApplicationActionQueue actionQueue)
{ {
_args = args; _args = args;
_actionQueue = actionQueue; _actionQueue = actionQueue;
@ -89,7 +89,8 @@ namespace Microsoft.DotNet.Cli
"-verbosity:q" "-verbosity:q"
]; ];
AddAdditionalMSBuildParameters(parseResult, msbuildCommandLineArgs); AddBinLogParameterIfExists(msbuildCommandLineArgs, _args);
AddAdditionalMSBuildParametersIfExist(parseResult, msbuildCommandLineArgs);
if (VSTestTrace.TraceEnabled) if (VSTestTrace.TraceEnabled)
{ {
@ -100,9 +101,23 @@ namespace Microsoft.DotNet.Cli
return msBuildForwardingApp.Execute(); return msBuildForwardingApp.Execute();
} }
private static void AddAdditionalMSBuildParameters(ParseResult parseResult, List<string> parameters) private static void AddBinLogParameterIfExists(List<string> msbuildCommandLineArgs, List<string> args)
{
var binLog = args.FirstOrDefault(arg => arg.StartsWith("-bl", StringComparison.OrdinalIgnoreCase));
if (!string.IsNullOrEmpty(binLog))
{
msbuildCommandLineArgs.Add(binLog);
// We remove it from the args list so that it is not passed to the test application
args.Remove(binLog);
}
}
private static void AddAdditionalMSBuildParametersIfExist(ParseResult parseResult, List<string> parameters)
{ {
string msBuildParameters = parseResult.GetValue(TestingPlatformOptions.AdditionalMSBuildParametersOption); string msBuildParameters = parseResult.GetValue(TestingPlatformOptions.AdditionalMSBuildParametersOption);
if (!string.IsNullOrEmpty(msBuildParameters)) if (!string.IsNullOrEmpty(msBuildParameters))
{ {
parameters.AddRange(msBuildParameters.Split(" ", StringSplitOptions.RemoveEmptyEntries)); parameters.AddRange(msBuildParameters.Split(" ", StringSplitOptions.RemoveEmptyEntries));

8
src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
Просмотреть файл

@ -11,8 +11,8 @@ namespace Microsoft.DotNet.Cli
internal sealed class TestApplication : IDisposable internal sealed class TestApplication : IDisposable
{ {
private readonly Module _module; private readonly Module _module;
private readonly List<string> _args;
private readonly string[] _args;
private readonly List<string> _outputData = []; private readonly List<string> _outputData = [];
private readonly List<string> _errorData = []; private readonly List<string> _errorData = [];
private readonly PipeNameDescription _pipeNameDescription = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N")); private readonly PipeNameDescription _pipeNameDescription = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Cli
public Module Module => _module; public Module Module => _module;
public TestApplication(Module module, string[] args) public TestApplication(Module module, List<string> args)
{ {
_module = module; _module = module;
_args = args; _args = args;
@ -260,7 +260,7 @@ namespace Microsoft.DotNet.Cli
builder.Append($" {CliConstants.ParametersSeparator} "); builder.Append($" {CliConstants.ParametersSeparator} ");
builder.Append(_args.Length != 0 builder.Append(_args.Count != 0
? _args.Aggregate((a, b) => $"{a} {b}") ? _args.Aggregate((a, b) => $"{a} {b}")
: string.Empty); : string.Empty);
@ -278,7 +278,7 @@ namespace Microsoft.DotNet.Cli
builder.Append($"exec {_module.DLLPath} "); builder.Append($"exec {_module.DLLPath} ");
} }
builder.Append(_args.Length != 0 builder.Append(_args.Count != 0
? _args.Aggregate((a, b) => $"{a} {b}") ? _args.Aggregate((a, b) => $"{a} {b}")
: string.Empty); : string.Empty);

4
src/Cli/dotnet/commands/dotnet-test/TestModulesFilterHandler.cs
Просмотреть файл

@ -9,11 +9,11 @@ namespace Microsoft.DotNet.Cli
{ {
internal sealed class TestModulesFilterHandler internal sealed class TestModulesFilterHandler
{ {
private readonly string[] _args; private readonly List<string> _args;
private readonly TestApplicationActionQueue _actionQueue; private readonly TestApplicationActionQueue _actionQueue;
public TestModulesFilterHandler(string[] args, TestApplicationActionQueue actionQueue) public TestModulesFilterHandler(List<string> args, TestApplicationActionQueue actionQueue)
{ {
_args = args; _args = args;
_actionQueue = actionQueue; _actionQueue = actionQueue;

4
src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
Просмотреть файл

@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Cli
private TestModulesFilterHandler _testModulesFilterHandler; private TestModulesFilterHandler _testModulesFilterHandler;
private TestApplicationActionQueue _actionQueue; private TestApplicationActionQueue _actionQueue;
private Task _namedPipeConnectionLoop; private Task _namedPipeConnectionLoop;
private string[] _args; private List<string> _args;
public TestingPlatformCommand(string name, string description = null) : base(name, description) public TestingPlatformCommand(string name, string description = null) : base(name, description)
{ {
@ -75,7 +75,7 @@ namespace Microsoft.DotNet.Cli
}); });
} }
_args = [.. parseResult.UnmatchedTokens]; _args = new List<string>(parseResult.UnmatchedTokens);
_msBuildConnectionHandler = new(_args, _actionQueue); _msBuildConnectionHandler = new(_args, _actionQueue);
_testModulesFilterHandler = new(_args, _actionQueue); _testModulesFilterHandler = new(_args, _actionQueue);
_namedPipeConnectionLoop = Task.Run(async () => await _msBuildConnectionHandler.WaitConnectionAsync(_cancellationToken.Token)); _namedPipeConnectionLoop = Task.Run(async () => await _msBuildConnectionHandler.WaitConnectionAsync(_cancellationToken.Token));

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Příklad:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Beispiel:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf сгенерированный
Просмотреть файл

@ -354,4 +354,4 @@ Ejemplo:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Exemple :
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Esempio:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Example:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Example:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Przykład:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Exemplo:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Example:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Ek ayarlara bağlı olarak, yanıt vermemeye başlama veya kilitlenme bilgi dök
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ dotnet test --blame-hang-timeout 20min
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/Cli/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf сгенерированный
Просмотреть файл

@ -352,4 +352,4 @@ Example:
</trans-unit> </trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>

2
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/RemoveInternetSourcesFromNuGetConfig.cs
Просмотреть файл

@ -37,7 +37,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
/// </summary> /// </summary>
public string[] KeepFeedPrefixes { get; set; } = []; public string[] KeepFeedPrefixes { get; set; } = [];
private readonly string[] Sections = [ "packageSources", "auditSources" ]; private readonly string[] Sections = [ "packageSources" ];
public override bool Execute() public override bool Execute()
{ {

5
src/SourceBuild/content/repo-projects/Directory.Build.props
Просмотреть файл

@ -165,8 +165,9 @@
<EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" /> <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<EnvironmentVariables Include="DotNetBuildFromSource=true" Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> <EnvironmentVariables Include="DotNetBuildFromSource=true" />
<EnvironmentVariables Include="NuGetAudit=false" Condition="'$(DotNetBuildWithOnlineFeeds)' != 'true'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'"> <ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">

2
src/Tasks/Common/Resources/Strings.resx
Просмотреть файл

@ -974,7 +974,7 @@ You may need to build the project on another operating system or architecture, o
</data> </data>
<data name="MicrosoftNetSdkCompilersToolsetRootEmpty" xml:space="preserve"> <data name="MicrosoftNetSdkCompilersToolsetRootEmpty" xml:space="preserve">
<value>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</value> <value>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</value>
<comment>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</comment> <comment>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</comment>
</data> </data>
<!-- The latest message added is MicrosoftNetSdkCompilersToolsetRootEmpty. Please update this value with each PR to catch parallel PRs both adding a new message --> <!-- The latest message added is MicrosoftNetSdkCompilersToolsetRootEmpty. Please update this value with each PR to catch parallel PRs both adding a new message -->
</root> </root>

2
src/Tasks/Common/Resources/xlf/Strings.cs.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.de.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.es.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.fr.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.it.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.ja.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.ko.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.pl.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.ru.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.tr.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf сгенерированный
Просмотреть файл

@ -596,7 +596,7 @@ The following are names of parameters or literal values and should not be transl
<trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty"> <trans-unit id="MicrosoftNetSdkCompilersToolsetRootEmpty">
<source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source> <source>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</source>
<target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target> <target state="new">NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</target>
<note>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note> <note>{StrBegins="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</note>
</trans-unit> </trans-unit>
<trans-unit id="MismatchedPlatformPackageVersion"> <trans-unit id="MismatchedPlatformPackageVersion">
<source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source> <source>NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection.</source>

2
src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets
Просмотреть файл

@ -54,7 +54,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Project="$(NuGetBuildTasksPackTargets)" <Import Project="$(NuGetBuildTasksPackTargets)"
Condition="Exists('$(NuGetBuildTasksPackTargets)') AND '$(ImportNuGetBuildTasksPackTargetsFromSdk)' == 'true'"/> Condition="Exists('$(NuGetBuildTasksPackTargets)') AND '$(ImportNuGetBuildTasksPackTargetsFromSdk)' == 'true'"/>
<!-- Import targets from Microdoft.NET.Build.Container.targets --> <!-- Import targets from Microsoft.NET.Build.Container.targets -->
<PropertyGroup> <PropertyGroup>
<_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\</_ContainersTargetsDir> <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\</_ContainersTargetsDir>
</PropertyGroup> </PropertyGroup>

5
src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets
Просмотреть файл

@ -330,11 +330,6 @@ Copyright (c) .NET Foundation. All rights reserved.
</Copy> </Copy>
</Target> </Target>
<PropertyGroup>
<MicrosoftNETCrossgenBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\net7.0\Microsoft.NET.Sdk.Crossgen.dll</MicrosoftNETCrossgenBuildTasksAssembly>
<MicrosoftNETCrossgenBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\net472\Microsoft.NET.Sdk.Crossgen.dll</MicrosoftNETCrossgenBuildTasksAssembly>
</PropertyGroup>
<!-- <!--
============================================================ ============================================================
CreateReadyToRunImages CreateReadyToRunImages

9
test/HelixTasks/AssemblyScheduler.cs
Просмотреть файл

@ -267,13 +267,14 @@ namespace Microsoft.DotNet.SdkCustomHelix.Sdk
/// </summary> /// </summary>
private static bool ShouldIncludeType(MetadataReader reader, TypeDefinition type, int testMethodCount) private static bool ShouldIncludeType(MetadataReader reader, TypeDefinition type, int testMethodCount)
{ {
// xunit only handles public, non-abstract classes // xunit only handles public, non-abstract, non-generic classes
var isPublic = var isPublic =
TypeAttributes.Public == (type.Attributes & TypeAttributes.Public) || TypeAttributes.Public == (type.Attributes & TypeAttributes.VisibilityMask) ||
TypeAttributes.NestedPublic == (type.Attributes & TypeAttributes.NestedPublic); TypeAttributes.NestedPublic == (type.Attributes & TypeAttributes.VisibilityMask);
if (!isPublic || if (!isPublic ||
TypeAttributes.Abstract == (type.Attributes & TypeAttributes.Abstract) || TypeAttributes.Abstract == (type.Attributes & TypeAttributes.Abstract) ||
TypeAttributes.Class != (type.Attributes & TypeAttributes.Class)) type.GetGenericParameters().Count != 0 ||
TypeAttributes.Class != (type.Attributes & TypeAttributes.ClassSemanticsMask))
{ {
return false; return false;
} }