projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65d75c7 b5ccdc3)
Merge pull request #25424 from dotnet/darc-master-e048b5ab-4671-4e74-8671-932e8299b22b
authorWilliam Godbe <wigodbe@microsoft.com>
Thu, 27 Jun 2019 20:23:32 +0000 (13:23 -0700)
committerGitHub <noreply@github.com>
Thu, 27 Jun 2019 20:23:32 +0000 (13:23 -0700)
[master] Update dependencies from dotnet/arcade

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 ad2ce5a,3a557e0..140cbd2
--- 1/eng/Version.Details.xml
--- 2/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@@ -3,33 -3,33 +3,33 @@@
    <ProductDependencies>
    </ProductDependencies>
    <ToolsetDependencies>
-     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19324.24">
+     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19326.44">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha>
+       <Sha>d39a62deaf3aa4e03c0b7dadc320a517e0e00187</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19324.24">
+     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19326.44">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha>
+       <Sha>d39a62deaf3aa4e03c0b7dadc320a517e0e00187</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19324.24">
+     <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19326.44">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha>
+       <Sha>d39a62deaf3aa4e03c0b7dadc320a517e0e00187</Sha>
      </Dependency>
-     <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19324.24">
+     <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19326.44">
        <Uri>https://github.com/dotnet/arcade</Uri>
-       <Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha>
+       <Sha>d39a62deaf3aa4e03c0b7dadc320a517e0e00187</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19326.2">
 +    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview8.19326.15">
        <Uri>https://github.com/dotnet/corefx</Uri>
 -      <Sha>219b67118e3a2d539afc1ff3bb2c10e1bc7b03d2</Sha>
 +      <Sha>6d723b8e5ae3129c0a94252292322fc19673478f</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19326.2">
 +    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19326.15">
        <Uri>https://github.com/dotnet/corefx</Uri>
 -      <Sha>219b67118e3a2d539afc1ff3bb2c10e1bc7b03d2</Sha>
 +      <Sha>6d723b8e5ae3129c0a94252292322fc19673478f</Sha>
      </Dependency>
 -    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27824-03">
 +    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27826-04">
        <Uri>https://github.com/dotnet/core-setup</Uri>
 -      <Sha>e1d780539e85f4d8de263957715f9d08db2ceef4</Sha>
 +      <Sha>5c4d829254f40bca8a85ee11f03b2d90d71aa847</Sha>
      </Dependency>
      <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190624.3">
        <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --cc eng/Versions.props
index 7243280,407ef50..a921162
--- 1/eng/Versions.props
--- 2/eng/Versions.props
+++ b/eng/Versions.props
@@@ -14,15 -14,15 +14,15 @@@
      <UsingToolXliff>false</UsingToolXliff>
      <!-- Package versions -->
      <!-- arcade -->
-     <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19324.24</MicrosoftDotNetBuildTasksFeedVersion>
-     <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19324.24</MicrosoftDotNetBuildTasksPackagingVersion>
+     <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19326.44</MicrosoftDotNetBuildTasksFeedVersion>
+     <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19326.44</MicrosoftDotNetBuildTasksPackagingVersion>
      <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
      <!-- corefx -->
 -    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19326.2</MicrosoftPrivateCoreFxNETCoreAppVersion>
 -    <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19326.2</MicrosoftNETCorePlatformsVersion>
 +    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview8.19326.15</MicrosoftPrivateCoreFxNETCoreAppVersion>
 +    <MicrosoftNETCorePlatformsVersion>3.0.0-preview8.19326.15</MicrosoftNETCorePlatformsVersion>
      <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
      <!-- core-setup -->
 -    <MicrosoftNETCoreAppVersion>3.0.0-preview7-27824-03</MicrosoftNETCoreAppVersion>
 +    <MicrosoftNETCoreAppVersion>3.0.0-preview7-27826-04</MicrosoftNETCoreAppVersion>
      <!-- dotnet-core-internal-tooling -->
      <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion>
      <!-- dotnet-optimization -->
Domain: Dotnet / Core;