Pin Microsoft.Composition to avoid binding redirects

Related to #12
vbfox · Mar 2, 2016 · f10bc37 · f10bc37
1 parent 4a977fb
commit f10bc37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 46 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -6,6 +6,9 @@ redirects: on
 nuget FSharp.Core ~> 4
 nuget Microsoft.CodeAnalysis.CSharp.Workspaces ~> 1
 
+// IL-Repack doesn't like asssembly redirects
+nuget Microsoft.Composition 1.0.27
+
 // Unit tests
 nuget NUnit ~> 3.0.1
 nuget NFluent ~> 1.3

diff --git a/paket.lock b/paket.lock
@@ -23,15 +23,13 @@ NUGET
     Microsoft.CodeAnalysis.Workspaces.Common (1.1.1)
       Microsoft.CodeAnalysis.Common (1.1.1)
       Microsoft.Composition (>= 1.0.27)
-    Microsoft.Composition (1.0.30)
+    Microsoft.Composition (1.0.27)
     Microsoft.Net.Http (2.2.29)
       Microsoft.Bcl (>= 1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
     NFluent (1.3.1)
     NUnit (3.0.1)
     NUnit.Console (3.0.1)
-    NUnit.Runners (3.0.1)
-      NUnit.Console (3.0.1)
     Octokit (0.18.0)
       Microsoft.Net.Http
     SourceLink.Fake (1.1.0)
@@ -145,5 +143,5 @@ NUGET
 GITHUB
   remote: fsharp/FAKE
   specs:
-    modules/Octokit/Octokit.fsx (43c4800c5f132d2c2d6832a3a59232a64d83d4c0)
+    modules/Octokit/Octokit.fsx (04cbee92aa24a1f22bb4987b5cabb524e782cac0)
       Octokit
diff --git a/src/BlackFox.Stidgen/App.config b/src/BlackFox.Stidgen/App.config
@@ -3,25 +3,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
-<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-</assemblyBinding></runtime></configuration>
+</configuration>
diff --git a/tests/BlackFox.Stidgen.Tests/App.config b/tests/BlackFox.Stidgen.Tests/App.config
@@ -9,24 +9,4 @@
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
   </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="1.0.30.0" />
-  </dependentAssembly>
 </assemblyBinding></runtime></configuration>