Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/runtime build 2021…
Browse files Browse the repository at this point in the history
…0920.1 (dotnet/linker#2284)

[main] Update dependencies from dotnet/runtime


Commit migrated from dotnet/linker@6f6ad01
  • Loading branch information
dotnet-maestro[bot] authored Sep 20, 2021
1 parent c94dfa5 commit 31b1c50
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/tools/illink/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>734d875ba2abfb5c8f5f52368e7d4711ee366e31</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.21456.1">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.21470.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e10374429b5af32debc4660aa9bce41cfb903e</Sha>
<Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
<!--
This would introduce a cyclic dependency, so it's explictly not enabled for now
<SourceBuild RepoName="runtime" />
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PropertyGroup>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<!-- ilasm -->
<MicrosoftNETSdkILPackageVersion>7.0.0-alpha.1.21456.1</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETSdkILPackageVersion>7.0.0-alpha.1.21470.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 -->
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21466.4",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21456.1"
"Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21470.1"
}
}

0 comments on commit 31b1c50

Please sign in to comment.