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

Try upgrading to newer versions as per #2173. MEF fails to initialize for System.Collections.Immutable (binding redirect?)

pull/2178/head
Christoph Wille 5 years ago
parent
0051c4e55f
commit
1ef136d6e6
6 changed files with 6 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 5
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  3. 5
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
  4. 2
      ILSpy.Tests/ILSpy.Tests.csproj
  5. 2
      ILSpy/ILSpy.csproj
  6. 4
      ILSpy/Properties/app.config.template

2
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
Unescape View File

@ -44,8 +44,6 @@
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" /> <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20407.11" />
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20407.11" />
<PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" /> <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
Unescape View File

@ -48,9 +48,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.2.0" /> <PackageReference Include="Humanizer.Core" Version="2.2.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20371.14" />
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" /> <PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20371.14" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
Unescape View File

@ -17,9 +17,8 @@
<dependencies> <dependencies>
<group targetFramework=".NETStandard2.0"> <group targetFramework=".NETStandard2.0">
<dependency id="Humanizer.Core" version="2.2.0" /> <dependency id="Humanizer.Core" version="2.2.0" />
<dependency id="System.Collections.Immutable" version="1.5.0" /> <dependency id="System.Collections.Immutable" version="5.0.0-preview.8.20371.14" />
<dependency id="System.Reflection.Metadata" version="1.6.0" /> <dependency id="System.Reflection.Metadata" version="5.0.0-preview.8.20371.14" />
<dependency id="System.ValueTuple" version="4.3.0" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>

2
ILSpy.Tests/ILSpy.Tests.csproj
Unescape View File

@ -49,8 +49,6 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20407.11" />
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20407.11" />
<PackageReference Include="NUnit" Version="3.11.0" /> <PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="Moq" Version="4.14.1" /> <PackageReference Include="Moq" Version="4.14.1" />
</ItemGroup> </ItemGroup>

2
ILSpy/ILSpy.csproj
Unescape View File

@ -56,8 +56,6 @@
<PackageReference Include="Mono.Cecil" Version="0.10.3" /> <PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="OSVersionHelper" Version="1.0.11" /> <PackageReference Include="OSVersionHelper" Version="1.0.11" />
<PackageReference Include="DataGridExtensions" Version="2.1.1" /> <PackageReference Include="DataGridExtensions" Version="2.1.1" />
<PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
</ItemGroup> </ItemGroup>

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

@ -26,11 +26,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" /> <bindingRedirect oldVersion="0.0.0.0-5.0.0-preview.8.20371.14" newVersion="5.0.0-preview.8.20371.14" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" /> <bindingRedirect oldVersion="0.0.0.0-5.0.0-preview.8.20371.14" newVersion="5.0.0-preview.8.20371.14" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

Write Preview
Loading…
Cancel
Save