Skip to content

Commit

Permalink
Update to latest IL SDK
Browse files Browse the repository at this point in the history
And remove workaround for ILProj loading in VS.
  • Loading branch information
ericstj committed Mar 15, 2019
1 parent 51036b6 commit d7c7d9b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
10 changes: 6 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,15 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27512-77">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27515-71">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>5831fe40394fcdc34fa161041956d379db433dd6</Sha>
<Sha>68fad02f41707a5333992cd7701e75aefb4e51c8</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27512-77">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27515-71">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>5831fe40394fcdc34fa161041956d379db433dd6</Sha>
<Sha>68fad02f41707a5333992cd7701e75aefb4e51c8</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>
<!-- CoreCLR-updated dependencies -->
<PropertyGroup>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview4-27512-77</MicrosoftNetCoreIlasmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27515-71</MicrosoftNETCoreILAsmPackageVersion>
</PropertyGroup>
<!-- Arcade-updated dependencies -->
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19162.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19162.7",
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27512-77"
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27515-71"
}
}
6 changes: 0 additions & 6 deletions src/Accessibility/src/Accessibility.ilproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,4 @@
ReferenceOutputAssembly="false"
OutputItemType="ILResourceReference" />
</ItemGroup>

<!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
<PropertyGroup>
<ManagedDesignTimeTargetsPath Condition="'$(ManagedDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets</ManagedDesignTimeTargetsPath>
</PropertyGroup>
<Import Project="$(ManagedDesignTimeTargetsPath)" Condition="'$(ManagedDesignTimeTargetsPath)' != '' and Exists('$(ManagedDesignTimeTargetsPath)')" />
</Project>

0 comments on commit d7c7d9b

Please sign in to comment.