зеркало из https://github.com/dotnet/tye.git
Update dependencies from https://github.com/dotnet/arcade build 20210205.12 (#935)
[master] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
afdab89f16
Коммит
013868d87e
|
|
@ -3,25 +3,25 @@
|
|||
<ProductDependencies>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.5">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.12">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
|
||||
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21105.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21105.12">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
|
||||
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21105.5">
|
||||
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21105.12">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
|
||||
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21105.5">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21105.12">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
|
||||
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21105.5">
|
||||
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21105.12">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
|
||||
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ function InitializeBuildTool() {
|
|||
ExitWithExitCode 1
|
||||
}
|
||||
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
|
||||
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' }
|
||||
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
|
||||
} elseif ($msbuildEngine -eq "vs") {
|
||||
try {
|
||||
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
|
||||
|
|
@ -644,13 +644,26 @@ function MSBuild() {
|
|||
}
|
||||
|
||||
$toolsetBuildProject = InitializeToolset
|
||||
$path = Split-Path -parent $toolsetBuildProject
|
||||
$path = Join-Path $path (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
|
||||
if (-not (Test-Path $path)) {
|
||||
$path = Split-Path -parent $toolsetBuildProject
|
||||
$path = Join-Path $path (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')
|
||||
$basePath = Split-Path -parent $toolsetBuildProject
|
||||
$possiblePaths = @(
|
||||
# new scripts need to work with old packages, so we need to look for the old names/versions
|
||||
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
|
||||
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
|
||||
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
|
||||
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
|
||||
)
|
||||
$selectedPath = $null
|
||||
foreach ($path in $possiblePaths) {
|
||||
if (Test-Path $path -PathType Leaf) {
|
||||
$selectedPath = $path
|
||||
break
|
||||
}
|
||||
}
|
||||
$args += "/logger:$path"
|
||||
if (-not $selectedPath) {
|
||||
Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
$args += "/logger:$selectedPath"
|
||||
}
|
||||
|
||||
MSBuild-Core @args
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ function InitializeBuildTool {
|
|||
# return values
|
||||
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
|
||||
_InitializeBuildToolCommand="msbuild"
|
||||
_InitializeBuildToolFramework="netcoreapp2.1"
|
||||
_InitializeBuildToolFramework="netcoreapp3.1"
|
||||
}
|
||||
|
||||
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
|
||||
|
|
@ -414,11 +414,24 @@ function MSBuild {
|
|||
fi
|
||||
|
||||
local toolset_dir="${_InitializeToolset%/*}"
|
||||
local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll"
|
||||
if [[ ! -f $logger_path ]]; then
|
||||
logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
|
||||
# new scripts need to work with old packages, so we need to look for the old names/versions
|
||||
local selectedPath=
|
||||
local possiblePaths=()
|
||||
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
|
||||
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
|
||||
for path in "${possiblePaths[@]}"; do
|
||||
if [[ -f $path ]]; then
|
||||
selectedPath=$path
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [[ -z "$selectedPath" ]]; then
|
||||
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly."
|
||||
ExitWithExitCode 1
|
||||
fi
|
||||
args=( "${args[@]}" "-logger:$logger_path" )
|
||||
args+=( "-logger:$selectedPath" )
|
||||
fi
|
||||
|
||||
MSBuild-Core ${args[@]}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.12"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче