mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#19562)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2024-04-23 16:56:26 +00:00 committed by GitHub
parent a86b2fed47
commit 4eec557054
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -238,17 +238,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24210.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -258,14 +258,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>9ec07c3673acf5602234c244d9465bca48f49969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.5">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24223.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

2
eng/common/sdk-task.ps1
View file

@ -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.5" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

4
eng/common/tools.ps1
View file

@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.8.5
$defaultXCopyMSBuildVersion = '17.8.5'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

4
global.json
View file

@ -11,8 +11,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.5",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24223.3",
"Microsoft.Build.NoTargets": "3.7.0"
}
}