Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20220511.14 (#1385)

[main] Update dependencies from dotnet/arcade
pull/1389/head
dotnet-maestro[bot] 4 years ago
committed by GitHub
parent
commit
abb54e6a09
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 11
      eng/common/init-tools-native.ps1
  3. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22260.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22261.14">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha> <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22260.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22261.14">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha> <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22260.2"> <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22261.14">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha> <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22260.2"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22261.14">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha> <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22260.2"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22261.14">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baad99219dda29b3c8efd7d627393cda4b38372</Sha> <Sha>666b83fa183306e9adec817c903ec93da2a4703c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

11
eng/common/init-tools-native.ps1

@ -93,7 +93,7 @@ try {
$ToolVersion = "" $ToolVersion = ""
} }
$ArcadeToolsDirectory = "C:\arcade-tools" $ArcadeToolsDirectory = "C:\arcade-tools"
if (Test-Path $ArcadeToolsDirectory -eq $False) { if (-not (Test-Path $ArcadeToolsDirectory)) {
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
exit 1 exit 1
} }
@ -103,13 +103,14 @@ try {
exit 1 exit 1
} }
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
if (Test-Path -Path "$BinPathFile" -eq $False) { if (-not (Test-Path -Path "$BinPathFile")) {
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
exit 1 exit 1
} }
$BinPath = Get-Content "$BinPathFile" $BinPath = Get-Content "$BinPathFile"
Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..." $ToolPath = Convert-Path -Path $BinPath
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)" Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
} }
} }
exit 0 exit 0
@ -188,7 +189,7 @@ try {
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
return $InstallBin return $InstallBin
} }
else { elseif (-not ($PathPromotion)) {
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
exit 1 exit 1
} }

2
global.json

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22260.2" "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22261.14"
} }
} }

Loading…
Cancel
Save