[master] Update dependencies from dotnet/arcade (#6323)
* Update dependencies from https://github.com/dotnet/arcade build 20200208.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20108.2 * Update dependencies from https://github.com/dotnet/arcade build 20200209.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20109.1
This commit is contained in:
parent
17ab007c83
commit
4ce8d08145
4 changed files with 7 additions and 7 deletions
|
@ -104,9 +104,9 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20107.14">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20109.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>c84720afc91b635e2fbeb5dbd7e2742f18773e0e</Sha>
|
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Param(
|
||||||
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
|
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
|
||||||
[string] $CoreRootDirectory,
|
[string] $CoreRootDirectory,
|
||||||
[string] $BaselineCoreRootDirectory,
|
[string] $BaselineCoreRootDirectory,
|
||||||
[string] $Architecture=$env:archType,
|
[string] $Architecture="x64",
|
||||||
[string] $Framework="netcoreapp5.0",
|
[string] $Framework="netcoreapp5.0",
|
||||||
[string] $CompilationMode="Tiered",
|
[string] $CompilationMode="Tiered",
|
||||||
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
|
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
|
||||||
|
@ -50,7 +50,7 @@ if ($Internal) {
|
||||||
}
|
}
|
||||||
|
|
||||||
# FIX ME: This is a workaround until we get this from the actual pipeline
|
# FIX ME: This is a workaround until we get this from the actual pipeline
|
||||||
$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
|
$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
|
||||||
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
|
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
|
||||||
|
|
||||||
if ($RunFromPerformanceRepo) {
|
if ($RunFromPerformanceRepo) {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
source_directory=$BUILD_SOURCESDIRECTORY
|
source_directory=$BUILD_SOURCESDIRECTORY
|
||||||
core_root_directory=
|
core_root_directory=
|
||||||
baseline_core_root_directory=
|
baseline_core_root_directory=
|
||||||
architecture=$archType
|
architecture=x64
|
||||||
framework=netcoreapp5.0
|
framework=netcoreapp5.0
|
||||||
compilation_mode=tiered
|
compilation_mode=tiered
|
||||||
repository=$BUILD_REPOSITORY_NAME
|
repository=$BUILD_REPOSITORY_NAME
|
||||||
|
@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
|
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
|
||||||
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
|
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
|
||||||
|
|
||||||
if [[ "$run_from_perf_repo" = true ]]; then
|
if [[ "$run_from_perf_repo" = true ]]; then
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
"dotnet": "5.0.100-alpha1-015949"
|
"dotnet": "5.0.100-alpha1-015949"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20107.14"
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue