Merge pull request #130 from florindragos/develop

Bump cf-dotner-sdk reference to CC v245
cloudfoundry-attic · Nov 2, 2016 · ec9eeb5 · ec9eeb5
2 parents 0c4644b + 3445907
commit ec9eeb5
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 31 deletions.
diff --git a/src/CloudFoundry.Build.Tasks.Test/CloudFoundry.Build.Tasks.Test.csproj b/src/CloudFoundry.Build.Tasks.Test/CloudFoundry.Build.Tasks.Test.csproj
@@ -37,32 +37,38 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CloudFoundry.CloudController.Common">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.Common.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.Common, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.Common.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.CloudController.V2.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.V2.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.V2.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.V2.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="CloudFoundry.CloudController.V2.Client.Fakes">
       <HintPath>FakesAssemblies\CloudFoundry.CloudController.V2.Client.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="CloudFoundry.CloudController.V3.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.V3.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.V3.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.V3.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.Loggregator.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.Loggregator.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.Loggregator.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.Loggregator.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="CloudFoundry.Loggregator.Client.Fakes">
       <HintPath>FakesAssemblies\CloudFoundry.Loggregator.Client.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="CloudFoundry.Manifests">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.Manifests.XML\CloudFoundry.Manifests.dll</HintPath>
+    <Reference Include="CloudFoundry.Manifests, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.Manifests.XML\CloudFoundry.Manifests.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="CloudFoundry.Manifests.Fakes">
       <HintPath>FakesAssemblies\CloudFoundry.Manifests.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="CloudFoundry.UAA.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.UAA.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.UAA.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.UAA.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Engine" />
     <Reference Include="Microsoft.Build.Framework" />
@@ -98,8 +104,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\WebSocket4Net.0.12\lib\net45\WebSocket4Net.dll</HintPath>
     </Reference>
-    <Reference Include="WebSocket4Net.ProxyUtilities">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\WebSocket4Net.ProxyUtilities.dll</HintPath>
+    <Reference Include="WebSocket4Net.ProxyUtilities, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\WebSocket4Net.ProxyUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="YamlDotNet, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/CloudFoundry.Build.Tasks.Test/app.config b/src/CloudFoundry.Build.Tasks.Test/app.config
@@ -25,7 +25,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.QualityTools.Testing.Fakes" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -35,6 +35,10 @@
         <assemblyIdentity name="WebSocket4Net" publicKeyToken="eb4e154b696bf72a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-0.11.0.0" newVersion="0.11.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/CloudFoundry.Build.Tasks.Test/packages.config b/src/CloudFoundry.Build.Tasks.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cf-dotnet-sdk" version="1.3.0.39" targetFramework="net45" />
+  <package id="cf-dotnet-sdk" version="1.3.0.43" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />

diff --git a/src/CloudFoundry.Build.Tasks/CloudFoundry.Build.Tasks.csproj b/src/CloudFoundry.Build.Tasks/CloudFoundry.Build.Tasks.csproj
@@ -39,23 +39,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CloudFoundry.CloudController.Common">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.Common.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.Common, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.Common.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.CloudController.V2.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.V2.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.V2.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.V2.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.CloudController.V3.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.CloudController.V3.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.CloudController.V3.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.CloudController.V3.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.Loggregator.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.Loggregator.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.Loggregator.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.Loggregator.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.Manifests">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.Manifests.XML\CloudFoundry.Manifests.dll</HintPath>
+    <Reference Include="CloudFoundry.Manifests, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.Manifests.XML\CloudFoundry.Manifests.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="CloudFoundry.UAA.Client">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\CloudFoundry.UAA.Client.dll</HintPath>
+    <Reference Include="CloudFoundry.UAA.Client, Version=1.3.0.43, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\CloudFoundry.UAA.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
@@ -100,8 +106,9 @@
       <HintPath>..\..\packages\WebSocket4Net.0.12\lib\net45\WebSocket4Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WebSocket4Net.ProxyUtilities">
-      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.39\lib\Net45\WebSocket4Net.ProxyUtilities.dll</HintPath>
+    <Reference Include="WebSocket4Net.ProxyUtilities, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\cf-dotnet-sdk.1.3.0.43\lib\Net45\WebSocket4Net.ProxyUtilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="YamlDotNet, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\YamlDotNet.3.6.0\lib\net35\YamlDotNet.dll</HintPath>

diff --git a/src/CloudFoundry.Build.Tasks/packages.config b/src/CloudFoundry.Build.Tasks/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cf-dotnet-sdk" version="1.3.0.39" targetFramework="net45" />
+  <package id="cf-dotnet-sdk" version="1.3.0.43" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />