projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 771d6e8 80eccfe)
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
authorAnirudh Agnihotry <anirudhagnihotry098@gmail.com>
Tue, 10 Sep 2019 19:42:32 +0000 (12:42 -0700)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 19:42:32 +0000 (12:42 -0700)
1  2 
eng/Version.Details.xml patch | diff1 | diff2 | blob | history
eng/Versions.props patch | diff1 | diff2 | blob | history

diff --cc eng/Version.Details.xml
index 9f3e80d,777a0d2..34c1f96
--- 1/eng/Version.Details.xml
--- 2/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@@ -2,35 -2,35 +2,35 @@@
    <ProductDependencies>
    </ProductDependencies>
    <ToolsetDependencies>
 -    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19458.2">
 +    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19459.10">
        <Uri>https://github.com/dotnet/arcade</Uri>
 -      <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
 +      <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19458.2">
 +    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19459.10">
        <Uri>https://github.com/dotnet/arcade</Uri>
 -      <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
 +      <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19458.2">
 +    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19459.10">
        <Uri>https://github.com/dotnet/arcade</Uri>
 -      <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
 +      <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19458.2">
 +    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19459.10">
        <Uri>https://github.com/dotnet/arcade</Uri>
 -      <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
 +      <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19458.3">
 +    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19460.1">
        <Uri>https://github.com/dotnet/corefx</Uri>
 -      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
 +      <Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc2.19458.3">
 +    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc2.19460.1">
        <Uri>https://github.com/dotnet/corefx</Uri>
 -      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
 +      <Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc2-19459-40">
+     <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19459.38">
        <Uri>https://github.com/dotnet/core-setup</Uri>
-       <Sha>ade240a7f970e5187e4e0ea47581681df085d44b</Sha>
+       <Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha>
      </Dependency>
 -    <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190909.1">
 +    <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190910.1">
        <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
        <Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
      </Dependency>
diff --cc eng/Versions.props
index 1d5b33d,a949e75..4640534
--- 1/eng/Versions.props
--- 2/eng/Versions.props
+++ b/eng/Versions.props
@@@ -21,11 -21,11 +21,11 @@@
      <!-- roslyn -->
      <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
      <!-- corefx -->
 -    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-rc2.19458.3</MicrosoftPrivateCoreFxNETCoreAppVersion>
 -    <MicrosoftNETCorePlatformsVersion>3.0.0-rc2.19458.3</MicrosoftNETCorePlatformsVersion>
 +    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-rc2.19460.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
 +    <MicrosoftNETCorePlatformsVersion>3.0.0-rc2.19460.1</MicrosoftNETCorePlatformsVersion>
      <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
      <!-- core-setup -->
-     <MicrosoftNETCoreAppVersion>3.0.0-rc2-19459-40</MicrosoftNETCoreAppVersion>
+     <MicrosoftNETCoreAppVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppVersion>
      <!-- dotnet-core-internal-tooling -->
      <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion>
      <!-- dotnet-optimization -->
Domain: Dotnet / Core;