提交 535544a3 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[master] Update dependencies from dotnet/arcade (#41515)

* Update dependencies from https://github.com/dotnet/arcade build 20200207.14

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20107.14

* Update dependencies from https://github.com/dotnet/arcade build 20200208.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20108.2
上级 5858196e
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20107.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20108.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7185ec14965fac5f22ed6102871c9b1c90cbbca</Sha> <Sha>490732cf6dcb77631fee038da1af0df1518c2fb0</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
...@@ -2,7 +2,7 @@ Param( ...@@ -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) { ...@@ -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 @@ ...@@ -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 ...@@ -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
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
"xcopy-msbuild": "16.4.0-alpha" "xcopy-msbuild": "16.4.0-alpha"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20107.3" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20108.2"
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册