huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update dependencies from https://github.com/dotnet/arcade build 20200112.1 (#18312) 

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20062.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20062.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20062.1
This commit is contained in:
dotnet-maestro[bot] 2020-01-13 20:45:46 +00:00 committed by GitHub
parent 605c522fa3
commit c9829d073f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eng/Version.Details.xml
View File

@ -417,17 +417,17 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>d0ae16ea86aa6bd6c533e2a6fe8b5bdd38607f91</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20058.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>48bae09d7d8ec0e6879fe2b8d08872cd87f084ca</Sha>
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20058.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>48bae09d7d8ec0e6879fe2b8d08872cd87f084ca</Sha>
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20058.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>48bae09d7d8ec0e6879fe2b8d08872cd87f084ca</Sha>
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20060.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
<Uri>https://github.com/dotnet/extensions</Uri>

2
eng/Versions.props
View File

@ -60,7 +60,7 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20058.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20062.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta1-19606-04</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup -->

3
eng/common/performance/performance-setup.ps1
View File

@ -49,7 +49,8 @@ if ($Internal) {
$HelixSourcePrefix = "official"
}
$CommonSetupArguments="--frameworks $Framework --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
# 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"
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
if ($RunFromPerformanceRepo) {

2
eng/common/performance/performance-setup.sh
View File

@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
fi
fi
common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations"
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
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

4
global.json
View File

@ -25,7 +25,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20058.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20058.1"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20062.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20062.1"
}
}