projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 242b290 1533d6a)
Merge branch 'release/3.0' into release/3.1
authorAnipik <anirudhagnihotry098@gmail.com>
Mon, 9 Sep 2019 19:12:40 +0000 (12:12 -0700)
committerAnipik <anirudhagnihotry098@gmail.com>
Mon, 9 Sep 2019 19:12:40 +0000 (12:12 -0700)
1  2 
eng/Version.Details.xml patch | diff1 | diff2 | blob | history
eng/Versions.props patch | diff1 | diff2 | blob | history
eng/pipelines/internal.yml patch | diff1 | diff2 | blob | history

diff --cc eng/Version.Details.xml
index ea3d268,6a9a348..7d1c55b
--- 1/eng/Version.Details.xml
--- 2/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@@ -2,41 -2,41 +2,41 @@@
    <ProductDependencies>
    </ProductDependencies>
    <ToolsetDependencies>
-     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19455.3">
+     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19458.2">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
+       <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19455.3">
+     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19458.2">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
+       <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19455.3">
+     <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19458.2">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
+       <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19455.3">
+     <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19458.2">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
+       <Sha>29ee79a10c58dd6863a46157e374521cac610ad8</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview9.19419.5">
+     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19458.3">
        <Uri>https://github.com/dotnet/corefx</Uri>
-       <Sha>961b953eb77922d3906506ee15a58068abfa3284</Sha>
+       <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19419.5">
+     <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc2.19458.3">
        <Uri>https://github.com/dotnet/corefx</Uri>
-       <Sha>961b953eb77922d3906506ee15a58068abfa3284</Sha>
+       <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19455-02">
 +    <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19458.7">
        <Uri>https://github.com/dotnet/core-setup</Uri>
 -      <Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
 +      <Sha>604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971</Sha>
      </Dependency>
-     <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190807.1">
+     <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190909.1">
        <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-       <Sha>f721b85e367cd7dacaa74f5761cfd34d9e4fc423</Sha>
+       <Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
      </Dependency>
-     <Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20190807.1">
+     <Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20190909.1">
        <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
-       <Sha>f721b85e367cd7dacaa74f5761cfd34d9e4fc423</Sha>
+       <Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
      </Dependency>
    </ToolsetDependencies>
  </Dependencies>
diff --cc eng/Versions.props
index 9e3fcdd,52b9907..924ed88
--- 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-preview9.19419.5</MicrosoftPrivateCoreFxNETCoreAppVersion>
-     <MicrosoftNETCorePlatformsVersion>3.0.0-preview9.19419.5</MicrosoftNETCorePlatformsVersion>
+     <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-rc2.19458.3</MicrosoftPrivateCoreFxNETCoreAppVersion>
+     <MicrosoftNETCorePlatformsVersion>3.0.0-rc2.19458.3</MicrosoftNETCorePlatformsVersion>
      <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
      <!-- core-setup -->
 -    <MicrosoftNETCoreAppVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppVersion>
 +    <MicrosoftNETCoreAppVersion>3.1.0-preview1.19458.7</MicrosoftNETCoreAppVersion>
      <!-- dotnet-core-internal-tooling -->
      <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion>
      <!-- dotnet-optimization -->
diff --cc eng/pipelines/internal.yml
Simple merge
Domain: Dotnet / Core;