Skip to content

[release/3.0] Update dependencies from 3 repositories #2181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 3 commits into from
Aug 13, 2019
Merged

[release/3.0] Update dependencies from 3 repositories #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c7f3bf
Update dependencies from https://github.com/dotnet/roslyn build 20190…
Aug 13, 2019
b03fc9e
Update dependencies from https://github.com/dotnet/core-setup build 2…
Aug 13, 2019
2c553b8
Update dependencies from https://github.com/dotnet/arcade build 20190…
Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,43 +58,43 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview9-19412-05">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview9-19413-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>36307f09572a38e5dff2995683ac5bcb33f46ce9</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview9-19412-05">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview9-19413-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>36307f09572a38e5dff2995683ac5bcb33f46ce9</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview9-19412-05">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview9-19413-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
<Sha>36307f09572a38e5dff2995683ac5bcb33f46ce9</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19411.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19411.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19411.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.17" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta3-19413-06">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta3-19413-08">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ac06df1bffb7b7fd0e5bf63cc91921af76b21e03</Sha>
<Sha>40b3c24da722148153675112d727b030f448454e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview9-19412-05</NETStandardLibraryRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview9-19413-05</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview9-19413-05</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview9-19413-05</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview9.19409.17</MicrosoftWin32RegistryPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.6.0-preview9.19409.17</SystemComponentModelAnnotationsPackageVersion>
Expand All @@ -61,9 +61,9 @@
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.17</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19411.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta3-19413-06</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta3-19413-08</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) {
}

if ($Internal) {
$Queue = "Windows.10.Amd64.ClientRS5.Perf"
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
$PerfLabArguments = "--upload-to-perflab-container"
$ExtraBenchmarkDotNetArguments = ""
$Creator = ""
Expand Down
36 changes: 18 additions & 18 deletions eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then
if [[ "$architecture" = "arm64" ]]; then
queue=Ubuntu.1804.Arm64.Perf
else
queue=Ubuntu.1804.Amd64.Perf
queue=Ubuntu.1804.Amd64.Tiger.Perf
fi
fi

Expand All @@ -157,20 +157,20 @@ if [[ "$use_core_run" = true ]]; then
fi

# Make sure all of our variables are available for future steps
echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run"
echo "##vso[task.setvariable variable=Architecture]$architecture"
echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory"
echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory"
echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory"
echo "##vso[task.setvariable variable=Queue]$queue"
echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments"
echo "##vso[task.setvariable variable=Python]python3"
echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments"
echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments"
echo "##vso[task.setvariable variable=BDNCategories]$run_categories"
echo "##vso[task.setvariable variable=TargetCsproj]$csproj"
echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo"
echo "##vso[task.setvariable variable=Creator]$creator"
echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix"
echo "##vso[task.setvariable variable=Kind]$kind"
echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework"
Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19411.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19411.1"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7"
}
}