Skip to content

Commit

Permalink
Merge branch 'release/3.0' => 'release/3.1' (#2254)
Browse files Browse the repository at this point in the history
  • Loading branch information
dougbu authored Aug 29, 2019
2 parents 067d4fd + 4d05164 commit efb8b8c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc1-19427-13">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc1-19428-14">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1c0f7e38cc371a298353a459c53138f23ba40a2a</Sha>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</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-rc1-19427-13">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-rc1-19428-14">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1c0f7e38cc371a298353a459c53138f23ba40a2a</Sha>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19427-13">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19428-14">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1c0f7e38cc371a298353a459c53138f23ba40a2a</Sha>
<Sha>0175edb2b0d0c5f541560f4056bb7633d1445688</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand All @@ -92,9 +92,9 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19428-02">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.1-beta3-19429-03">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c82648d8964d1e683f92b7daa91beef2fdc5fb72</Sha>
<Sha>4d9190ea3daac1ccf7a92aa4e0a169ab29ca8f9f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 4 additions & 4 deletions eng/Versions.props
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-rc1-19427-13</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc1-19427-13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-rc1-19427-13</NETStandardLibraryRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc1-19428-14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc1-19428-14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-rc1-19428-14</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftWin32RegistryPackageVersion>4.6.0-rc1.19420.10</MicrosoftWin32RegistryPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.6.0-rc1.19420.10</SystemComponentModelAnnotationsPackageVersion>
Expand All @@ -63,7 +63,7 @@
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19425.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.1-beta3-19428-02</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>3.3.1-beta3-19429-03</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down

0 comments on commit efb8b8c

Please sign in to comment.