зеркало из https://github.com/dotnet/msbuild.git
Update dependencies from dotnet/arcade (#9315)
* Update dependencies from https://github.com/dotnet/arcade build 20231016.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23516.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * Revert the dotnet version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
This commit is contained in:
Родитель
43ffadf95d
Коммит
3a2f9ba61c
|
@ -58,14 +58,14 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23516.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
|
<Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
|
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
|
||||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="NuGet.Build.Tasks" Version="6.8.0-rc.122">
|
<Dependency Name="NuGet.Build.Tasks" Version="6.8.0-rc.122">
|
||||||
|
@ -77,9 +77,9 @@
|
||||||
<Sha>d49b29ecbf9bd72fe6023ad1b8aad9a8db7e7c3a</Sha>
|
<Sha>d49b29ecbf9bd72fe6023ad1b8aad9a8db7e7c3a</Sha>
|
||||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23463.1">
|
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23516.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
|
<Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
Otherwise, this version of dotnet will not be installed and the build will error out. -->
|
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>
|
<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>
|
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
|
||||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23463.1</MicrosoftDotNetXUnitExtensionsVersion>
|
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23516.4</MicrosoftDotNetXUnitExtensionsVersion>
|
||||||
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||||
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
|
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
|
||||||
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23510.8</MicrosoftNetCompilersToolsetVersion>
|
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23510.8</MicrosoftNetCompilersToolsetVersion>
|
||||||
|
|
|
@ -64,7 +64,7 @@ try {
|
||||||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||||
|
|
|
@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
||||||
}
|
}
|
||||||
|
|
||||||
# Minimum VS version to require.
|
# Minimum VS version to require.
|
||||||
$vsMinVersionReqdStr = '17.6'
|
$vsMinVersionReqdStr = '17.7'
|
||||||
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
|
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
|
||||||
|
|
||||||
# If the version of msbuild is going to be xcopied,
|
# If the version of msbuild is going to be xcopied,
|
||||||
# use this version. Version matches a package here:
|
# use this version. Version matches a package here:
|
||||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
|
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
|
||||||
$defaultXCopyMSBuildVersion = '17.6.0-2'
|
$defaultXCopyMSBuildVersion = '17.8.1-2'
|
||||||
|
|
||||||
if (!$vsRequirements) {
|
if (!$vsRequirements) {
|
||||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||||
|
|
|
@ -10,6 +10,6 @@
|
||||||
"xcopy-msbuild": "17.7.4"
|
"xcopy-msbuild": "17.7.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1"
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче