pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix inconsistent System.Runtime.CompilerServices.Unsafe versions.

pull/2191/head
Daniel Grunwald 5 years ago
parent
2d0df349d8
commit
faa46d6ea5
4 changed files with 24 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
  2. 10
      ILSpy/ILSpy.csproj
  3. 4
      ILSpy/Properties/app.config.template
  4. 5
      packages.props

11
ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
Unescape View File

@ -73,9 +73,18 @@ @@ -73,9 +73,18 @@
<Page Include="ReadyToRunOptionPage.xaml" />
</ItemGroup>
<Import Project="../packages.props"/>
<ItemGroup>
<PackageReference Include="Iced" Version="1.8.0" />
<PackageReference Include="ILCompiler.Reflection.ReadyToRun" Version="1.0.11-alpha" />
<!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and
System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output
directory, we're at risk of overwriting our dependencies with different versions.
So ensure NuGet uses consistent versions (from our packages.props) for these.
-->
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
</ItemGroup>
<Target Name="RemoveTransitiveProjectReferences" AfterTargets="IncludeTransitiveProjectReferences">
@ -84,4 +93,4 @@ @@ -84,4 +93,4 @@
</ItemGroup>
</Target>
</Project>
</Project>

10
ILSpy/ILSpy.csproj
Unescape View File

@ -52,6 +52,8 @@ @@ -52,6 +52,8 @@
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
<PackageReference Include="Dirkster.AvalonDock" Version="3.6.1" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.3.7" />
<PackageReference Include="System.Composition" Version="1.3.0" />
@ -69,7 +71,7 @@ @@ -69,7 +71,7 @@
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml" />
</ItemGroup>
@ -837,8 +839,8 @@ @@ -837,8 +839,8 @@
<VCToolsVersionPropsFileNameDefault>Microsoft.VCToolsVersion.default.props</VCToolsVersionPropsFileNameDefault>
<!-- This is necessary as long as AppVeyor does not offer Visual Studio 2019 RC or later -->
<VCToolsVersionPropsFileNameVS2019Preview>Microsoft.VCToolsVersion.v142.default.props</VCToolsVersionPropsFileNameVS2019Preview>
<VCToolsVersionPropsFile>$(VCBasePath)Auxiliary\Build\$(VCToolsVersionPropsFileNameDefault)</VCToolsVersionPropsFile>
<VCToolsVersionPropsFile Condition="!Exists('$(VCToolsVersionPropsFile)')">$(VCBasePath)Auxiliary\Build\$(VCToolsVersionPropsFileNameVS2019Preview)</VCToolsVersionPropsFile>
<VCToolsVersionPropsFile>$(VCBasePath)Auxiliary\Build\$(VCToolsVersionPropsFileNameDefault)</VCToolsVersionPropsFile>
<VCToolsVersionPropsFile Condition="!Exists('$(VCToolsVersionPropsFile)')">$(VCBasePath)Auxiliary\Build\$(VCToolsVersionPropsFileNameVS2019Preview)</VCToolsVersionPropsFile>
</PropertyGroup>
<Import Project="$(VCToolsVersionPropsFile)" Condition="Exists('$(VCToolsVersionPropsFile)')" />
@ -866,4 +868,4 @@ @@ -866,4 +868,4 @@
<Exec Condition="'$(VCToolsVersion)'!=''" Command="&quot;$(VCBasePath)Tools\MSVC\$(VCToolsVersion)\bin\Hostx64\x64\editbin.exe&quot; /stack:16777216 &quot;$(TargetPath)&quot;&#xD;&#xA;EXIT 0" />
<Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)sn.exe&quot; -R &quot;$(TargetPath)&quot; &quot;$(SolutionDir)\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk&quot;" />
</Target>
</Project>
</Project>

4
ILSpy/Properties/app.config.template
Unescape View File

@ -32,6 +32,10 @@ @@ -32,6 +32,10 @@
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

5
packages.props
Unescape View File

@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- Centrally define the versions of the NuGet packages we use -->
<!-- Centrally define the versions of the NuGet packages we use.
Note: when updating these, ensure to also adjust the binding redirects in app.config.template appropriately.
-->
<PropertyGroup>
<HumanizerVersion>2.2.0</HumanizerVersion>
<SystemCollectionsImmutableVersion>5.0.0-preview.8.20407.11</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>5.0.0-preview.8.20407.11</SystemReflectionMetadataVersion>
<SystemCompilerServicesUnsafeVersion>4.7.1</SystemCompilerServicesUnsafeVersion>
<ILAsmVersion>5.0.0-rc.2.20475.5</ILAsmVersion> <!-- Microsoft.NETCore.ILAsm -->
<RoslynVersion>3.8.0-4.final</RoslynVersion> <!-- Microsoft.CodeAnalysis.* -->
<MonoCecilVersion>0.10.3</MonoCecilVersion>

Write Preview
Loading…
Cancel
Save