Skip to content

Commit

Permalink
Merge pull request dotnet#41483 from dotnet/darc-release/3.1-f1ceb06f…
Browse files Browse the repository at this point in the history
…-90ab-4732-acc8-75dfa6866951

[release/3.1] Update dependencies from dotnet/coreclr
  • Loading branch information
wtgodbe authored Oct 1, 2019
2 parents e61772d + 49b7992 commit 1bfc20a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-preview1.19480.2">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-preview1.19501.2">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>0303386d3bdc4dc9b9ea59fbaadfe0d896f960ee</Sha>
<Sha>b5d201599d9aff5c26327a2f65828ed635911382</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.0-preview1.19480.2">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.0-preview1.19501.2">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>0303386d3bdc4dc9b9ea59fbaadfe0d896f960ee</Sha>
<Sha>b5d201599d9aff5c26327a2f65828ed635911382</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.0-preview1.19480.2">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.0-preview1.19501.2">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>0303386d3bdc4dc9b9ea59fbaadfe0d896f960ee</Sha>
<Sha>b5d201599d9aff5c26327a2f65828ed635911382</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<MicrosoftNETCoreDotNetHostPackageVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmPackageVersion>3.1.0-preview1.19480.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.0-preview1.19480.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.1.0-preview1.19501.2</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.0-preview1.19501.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19474.3",
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19474.3",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "3.1.0-preview1.19480.2"
"Microsoft.NET.Sdk.IL": "3.1.0-preview1.19501.2"
}
}

0 comments on commit 1bfc20a

Please sign in to comment.