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
commit
1ef136d6e6
  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

@ -44,8 +44,6 @@ @@ -44,8 +44,6 @@
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" 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="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="NUnit" Version="3.12.0" />

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

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

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

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

2
ILSpy.Tests/ILSpy.Tests.csproj

@ -49,8 +49,6 @@ @@ -49,8 +49,6 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" 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="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="Moq" Version="4.14.1" />
</ItemGroup>

2
ILSpy/ILSpy.csproj

@ -56,8 +56,6 @@ @@ -56,8 +56,6 @@
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="OSVersionHelper" Version="1.0.11" />
<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" />
</ItemGroup>

4
ILSpy/Properties/app.config.template

@ -26,11 +26,11 @@ @@ -26,11 +26,11 @@
</dependentAssembly>
<dependentAssembly>
<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>
<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>
</assemblyBinding>
</runtime>

Loading…
Cancel
Save