diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-06-14 15:17:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-14 15:17:07 +0300 |
commit | cdaa684b935b77382ce5c44ba4f9ad4fa460c933 (patch) | |
tree | 7178e5f007dd69725a86d5bcfd16eba6524583bf | |
parent | caeaf2a3fb3f636805fdd4881df4f9a539fff8f6 (diff) |
Update dependencies from https://github.com/dotnet/runtime build 20210614.1 (#2093)
[main] Update dependencies from dotnet/runtime
-rw-r--r-- | eng/Version.Details.xml | 4 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | global.json | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08f980b06..5e1d7bcbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21307.1"> + <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21314.1"> <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha> + <Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <!-- This would introduce a cyclic dependency, so it's explictly not enabled for now <SourceBuild RepoName="runtime" /> diff --git a/eng/Versions.props b/eng/Versions.props index 8db2ff259..a4a351a9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ <PropertyGroup> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> <!-- ilasm --> - <MicrosoftNETSdkILPackageVersion>6.0.0-preview.6.21307.1</MicrosoftNETSdkILPackageVersion> + <MicrosoftNETSdkILPackageVersion>6.0.0-preview.6.21314.1</MicrosoftNETSdkILPackageVersion> <!-- see https://github.com/dotnet/runtime/issues/1338 --> <MicrosoftNETCoreILAsmVersion>$(MicrosoftNETSdkILPackageVersion)</MicrosoftNETCoreILAsmVersion> <!-- SRM version should match the SDK version at https://github.com/dotnet/sdk/blob/master/eng/Versions.props --> diff --git a/global.json b/global.json index a64fd5fa0..42f42ed94 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21307.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" } } |