Skip to content

Commit

Permalink
fix binding redirect issue
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriktsarpalis committed Aug 5, 2016
1 parent 0b48e7f commit f04854b
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 12 deletions.
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
framework: >= net45
redirects: force
redirects: on
source https://www.nuget.org/api/v2

nuget FSharp.Core ~> 4.0.0.0
Expand Down
15 changes: 8 additions & 7 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
REDIRECTS: ON
FRAMEWORK: >= NET45
NUGET
remote: https://www.nuget.org/api/v2
Argu (3.2)
FsCheck (2.5)
FsCheck (2.6)
FSharp.Core (>= 3.1.2.5)
FSharp.Compiler.Service (5.0)
FSharp.Core (4.0.0.1)
Expand Down Expand Up @@ -95,7 +96,7 @@ NUGET
Microsoft.Azure.Common (>= 2.0.1 < 3.0)
Microsoft.WindowsAzure.Management.Monitoring (4.1)
Microsoft.Azure.Common (>= 2.0.1 < 3.0)
Microsoft.WindowsAzure.Management.Network (7.1.3)
Microsoft.WindowsAzure.Management.Network (8.0)
Microsoft.Azure.Common (>= 2.1 < 3.0)
Microsoft.WindowsAzure.Management.Scheduler (6.2)
Microsoft.Azure.Common (>= 2.0.4 < 3.0)
Expand All @@ -107,7 +108,7 @@ NUGET
Microsoft.Azure.Common (>= 2.0.4 < 3.0)
Microsoft.WindowsAzure.Management.WebSites (4.0)
Microsoft.WindowsAzure.Common (>= 1.3 < 2.0)
Mono.Cecil (0.9.6.3)
Mono.Cecil (0.9.6.4)
Newtonsoft.Json (9.0.1)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Expand All @@ -121,7 +122,7 @@ NUGET
Vagabond (0.13.1)
FsPickler (>= 2.1 < 2.2)
Mono.Cecil (>= 0.9.6.3 < 0.9.7)
WindowsAzure.ServiceBus (3.3.1)
WindowsAzure.ServiceBus (3.3.2)
WindowsAzure.Storage (7.1.2)
Microsoft.Azure.KeyVault.Core (>= 1.0)
Microsoft.Data.OData (>= 5.6.4)
Expand All @@ -133,17 +134,17 @@ GITHUB
GROUP Build
NUGET
remote: https://www.nuget.org/api/v2
FAKE (4.32)
FAKE (4.36)
Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl.Build (>= 1.0.14)
Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
NuGet.CommandLine (3.4.3)
Octokit (0.20)
Octokit (0.21.1)
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (57b7731e3386ae98806970506ff731872f3c9260)
modules/Octokit/Octokit.fsx (8fd20ae42c996060bc8bedb821edfb50517cdd8b)
Octokit (>= 0.20)
23 changes: 22 additions & 1 deletion samples/MBrace.Azure.StandaloneClient/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,25 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding></runtime></configuration>
23 changes: 22 additions & 1 deletion src/MBrace.Azure.StandaloneWorker/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,28 @@

<runtime>
<gcServer enabled="true" />
</runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding></runtime>
<system.serviceModel>
<extensions>
<!-- In this extension section we are introducing all known service bus extensions. User can remove the ones they don't need. -->
Expand Down
28 changes: 27 additions & 1 deletion src/MBrace.Azure.WorkerRole/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,30 @@
</listeners>
</trace>
</system.diagnostics>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<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="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding></runtime></configuration>
33 changes: 32 additions & 1 deletion tests/MBrace.Azure.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,35 @@
</system.serviceModel><appSettings>
<!-- Service Bus specific app setings for messaging connections -->
<add key="Microsoft.ServiceBus.ConnectionString" value="Endpoint=sb://[your namespace].servicebus.windows.net;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=[your secret]" />
</appSettings></configuration>
</appSettings><runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<Paket>True</Paket>
<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="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="5.7.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="2.6.4.14350" />
</dependentAssembly>
</assemblyBinding></runtime></configuration>

0 comments on commit f04854b

Please sign in to comment.