[main] Update dependencies from dotnet/arcade (#18486)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
parent
850f501679
commit
6e134b4cd9
5 changed files with 14 additions and 14 deletions
|
@ -201,18 +201,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24080.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>b4e9225c6c2f9da42fbb611a5e8942a08476fe89</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24080.3">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>b4e9225c6c2f9da42fbb611a5e8942a08476fe89</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24080.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>b4e9225c6c2f9da42fbb611a5e8942a08476fe89</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24076.2">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
@ -222,9 +222,9 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>e9cac5ab2b545c66de5414b330d2187286d17194</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24080.3">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>b4e9225c6c2f9da42fbb611a5e8942a08476fe89</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24080.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
|
@ -64,7 +64,7 @@ try {
|
|||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||
}
|
||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty
|
||||
}
|
||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||
|
|
|
@ -379,8 +379,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
|||
|
||||
# If the version of msbuild is going to be xcopied,
|
||||
# use this version. Version matches a package here:
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
|
||||
$defaultXCopyMSBuildVersion = '17.8.1-2'
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5
|
||||
$defaultXCopyMSBuildVersion = '17.8.5'
|
||||
|
||||
if (!$vsRequirements) {
|
||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24080.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24081.4"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue