зеркало из https://github.com/dotnet/msbuild.git
[automated] Merge branch 'vs17.9' => 'main' (#9577)
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840417 (#9566) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Update dependencies from https://github.com/dotnet/arcade build 20231220.2 (#9574) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23580.1 -> To Version 8.0.0-beta.23620.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9575) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 NuGet.Build.Tasks From Version 6.9.0-preview.1.64 -> To Version 6.9.0-preview.1.67 * Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23615.7 -> To Version 4.9.0-3.23621.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9580) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 NuGet.Build.Tasks From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.70 * Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23629.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> --------- Co-authored-by: dotnet bot <dotnet-bot@dotnetfoundation.org> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
This commit is contained in:
dotnet-maestro-bot
GitHub
Родитель
b860fe5882
Коммит
bbe185f58b
|
|
@ -66,9 +66,9 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23580.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
|
||||
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
|
|
@ -76,18 +76,18 @@
|
|||
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
|
||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.64">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.70">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>2a234707a663f731e4de93cba4014ed1a8259def</Sha>
|
||||
<Sha>6a82332d4936d893fb1e22fd86f2e3cb4d54c471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23615.7">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23629.3">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51</Sha>
|
||||
<Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23620.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
|
||||
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@
|
|||
Otherwise, this version of dotnet will not be installed and the build will error out. -->
|
||||
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
|
||||
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23580.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23620.2</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23615.7</MicrosoftNetCompilersToolsetVersion>
|
||||
<NuGetBuildTasksVersion>6.9.0-preview.1.64</NuGetBuildTasksVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23629.3</MicrosoftNetCompilersToolsetVersion>
|
||||
<NuGetBuildTasksVersion>6.9.0-preview.1.70</NuGetBuildTasksVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
|
||||
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ jobs:
|
|||
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
|
||||
|
||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||
- task: NuGetAuthenticate@0
|
||||
- task: NuGetAuthenticate@1
|
||||
|
||||
- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
|
||||
- task: DownloadPipelineArtifact@2
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ jobs:
|
|||
condition: ${{ parameters.condition }}
|
||||
continueOnError: ${{ parameters.continueOnError }}
|
||||
|
||||
- task: NuGetAuthenticate@0
|
||||
- task: NuGetAuthenticate@1
|
||||
|
||||
- task: PowerShell@2
|
||||
displayName: Publish Build Assets
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ stages:
|
|||
# This is necessary whenever we want to publish/restore to an AzDO private feed
|
||||
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
|
||||
# otherwise it'll complain about accessing a private feed.
|
||||
- task: NuGetAuthenticate@0
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'Authenticate to AzDO Feeds'
|
||||
|
||||
# Signing validation will optionally work with the buildmanifest file which is downloaded from
|
||||
|
|
@ -266,7 +266,7 @@ stages:
|
|||
BARBuildId: ${{ parameters.BARBuildId }}
|
||||
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
|
||||
|
||||
- task: NuGetAuthenticate@0
|
||||
- task: NuGetAuthenticate@1
|
||||
|
||||
- task: PowerShell@2
|
||||
displayName: Publish Using Darc
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
"xcopy-msbuild": "17.8.1-2"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23580.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
</trans-unit>
|
||||
<trans-unit id="DurationDisplay">
|
||||
<source>({0:F1}s)</source>
|
||||
<target state="translated">({0:F1}s)</target>
|
||||
<target state="translated">({0:F1} sn)</target>
|
||||
<note>
|
||||
{0}: duration in seconds with 1 decimal point
|
||||
</note>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче