Merge pull request #662 from openstacknetsdk/fix-build-release

Workarounds to get build/release process working again

build/build.proj

@@ -3,8 +3,9 @@
 
   <PropertyGroup>
     <Configuration>Debug</Configuration>
-    <Version>0.0.0-dev</Version>
+    <Version>1.7.8</Version>
     <PaketVersion>2.66.9</PaketVersion>
+    <WarningsNotAsErrors>612,618</WarningsNotAsErrors>
     <PaketBootstrapper>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe</PaketBootstrapper>
     <Paket>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe</Paket>
     <PackagesFolder>$(MSBuildThisFileDirectory.Replace('build\','packages'))</PackagesFolder>
@@ -92,7 +93,7 @@
     <Exec Command="$(MSBuild) $(MigrationSln) /nologo /clp:ErrorsOnly" />
   </Target>
 
-  <Target Name="Package" DependsOnTargets="Build;Documentation">
+  <Target Name="Package" DependsOnTargets="Build">
     <MakeDir Directories="..\src\corelib\bin\v4.0\$(Configuration)\deploy" />
     <Exec Command="$(ILMerge) /t:library /v4 /out:deploy/openstacknet.dll openstacknet.dll SimpleRESTServices.dll"
           WorkingDirectory="..\src\corelib\bin\v4.0\$(Configuration)" />

paket.dependencies

@@ -1,24 +1,26 @@
-source https://www.myget.org/F/openstacknetsdk/api/v2
 source https://www.nuget.org/api/v2
 redirects: on
 
-nuget EWSoftware.SHFB = 2014.11.22-beta
 nuget Flurl.Http.Signed ~> 0.7.0
-nuget Flurl.Signed ~> 1.0
+nuget Flurl.Signed ~> 1.0.10
 nuget ILMerge
 nuget Marvin.JsonPatch.Signed ~> 0.7.0
 nuget Moq
-nuget Newtonsoft.Json ~> 6.0
+nuget Newtonsoft.Json >= 6.0
 nuget NuGet.CommandLine = 3.4.4-rtm-final
 nuget SharpZipLib
-nuget SimpleRESTServices = 1.3.0.1-json002
-nuget xunit
+nuget SimpleRESTServices = 1.3.0.2
+nuget xunit ~> 2.0
 nuget xunit.abstractions
 nuget xunit.assert
 nuget xunit.core
 nuget xunit.extensibility.core
 nuget xunit.runner.console
 nuget xunit.runner.visualstudio
+
+source https://www.myget.org/F/openstacknetsdk/api/v2
+nuget EWSoftware.SHFB = 2014.11.22-beta
+
 
 group History-1.5
 	redirects: on

src/Samples/FSharpCodeSamples/app.config

@@ -5,6 +5,6 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
   </dependentAssembly>
 </assemblyBinding></runtime></configuration>

src/corelib/Core/Providers/IComputeProvider.cs

@@ -13,7 +13,7 @@ namespace net.openstack.Core.Providers
     /// <para>Represents a provider for the OpenStack Compute service.</para>
     /// </summary>
     /// <seealso href="http://docs.openstack.org/api/openstack-compute/2/content/">OpenStack Compute API v2 and Extensions Reference</seealso>
-    [Obsolete("This will be removed in v2.0. Use OpenStack.Compute.v2_1.ComputeService or Rackspace.CloudServers.v2.CloudServerService (from the Rackspace NuGet package).")]
+    //[Obsolete("This will be removed in v2.0. Use OpenStack.Compute.v2_1.ComputeService or Rackspace.CloudServers.v2.CloudServerService (from the Rackspace NuGet package).")]
     public interface IComputeProvider
     {
         /// <summary>

src/corelib/app.config

@@ -5,6 +5,6 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
   </dependentAssembly>
 </assemblyBinding></runtime></configuration>

src/corelib/corelib.nuspec

@@ -4,8 +4,8 @@
     <id>openstack.net</id>
     <version>0.0.0</version>
     <title>openstack.net</title>
-    <authors>alanquillin, kravi, ejwebb, jasonmitschke, bretmc, sharwell, carolynvs</authors>
-    <owners>alanquillin, sharwell</owners>
+    <authors>alanquillin, kravi, ejwebb, jasonmitschke, bretmc, sharwell, carolynvs, dwalleck</authors>
+    <owners>dwalleck</owners>
     <licenseUrl>http://openstacknetsdk.org/docs/html/8b286b82-7aaf-4e45-9ffc-adbd7dbcfaa6.htm</licenseUrl>
     <projectUrl>https://github.com/openstacknetsdk/openstack.net</projectUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -16,6 +16,7 @@
     <dependencies>
       <group targetFramework="4.5">
         <dependency id="Newtonsoft.Json" version="6.0.1" />
+        <dependency id="Flurl.Signed" version="[1, 1.1)" />
         <dependency id="Flurl.Http.Signed" version="[0.7.0, 0.8)" />
         <dependency id="Marvin.JsonPatch.Signed" version="[0.7.0]" />
       </group>
@@ -26,7 +27,7 @@
     <!-- Runtime libraries -->
     <file src="bin\v4.0\$Configuration$\deploy\openstacknet.dll" target="lib\net45"/>
     <file src="bin\v4.0\$Configuration$\deploy\openstacknet.pdb" target="lib\net45"/>
-    <file src="..\..\artifacts\docs\Api\v4.0\openstacknet.xml" target="lib\net45"/>
+    <!-- <file src="..\..\artifacts\docs\Api\v4.0\openstacknet.xml" target="lib\net45"/> -->
 
   </files>
 </package>

src/testing/integration/App.config

@@ -11,6 +11,16 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.2.0.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.3.0" />
   </dependentAssembly>
 </assemblyBinding></runtime></configuration>

src/testing/integration/Compute/v2_1/Operator/ComputeServiceTests.cs

@@ -20,7 +20,9 @@ public ComputeServiceTests(ITestOutputHelper testLog)
             _compute = new ComputeService(authenticationProvider, "RegionOne");
         }
 
+#pragma warning disable xUnit1013 // Public method should be marked as test
         public void Dispose()
+#pragma warning restore xUnit1013 // Public method should be marked as test
         {
             Trace.Listeners.Clear();
             OpenStackNet.Tracing.Http.Listeners.Clear();

src/testing/integration/Compute/v2_1/ServerTests.cs

@@ -371,7 +371,7 @@ public async Task ServerVolumesTest()
 
             Trace.WriteLine("Detaching the volume...");
             await volumeRef.DetachAsync();
-            Assert.False(server.AttachedVolumes.Any(v => v.Id == volumeId));
+            Assert.DoesNotContain(server.AttachedVolumes, v => v.Id == volumeId);
             _testData.BlockStorage.StorageProvider.WaitForVolumeAvailable(volumeId);
         }
 

src/testing/integration/Networking/v2/Layer3/Layer3ExtensionTests.cs

@@ -99,7 +99,9 @@ public async Task ListSecurityGroups()
             var defaultRule = defaultGroup.SecurityGroupRules.First();
             Assert.NotNull(defaultRule.Id);
             Assert.NotNull(defaultRule.Direction);
+#pragma warning disable xUnit2002 // Do not use null check on value type
             Assert.NotNull(defaultRule.Ethertype);
+#pragma warning restore xUnit2002 // Do not use null check on value type
             Assert.NotNull(defaultRule.SecurityGroupId);
         }
     }

src/testing/integration/Networking/v2/NetworkingServiceTests.cs

@@ -95,7 +95,7 @@ public async Task ListNetworksTest()
 
             Trace.WriteLine("Verifying list of networks...");
             Assert.NotNull(results);
-            Assert.All(networks, network => Assert.True(results.Any(x => x.Id == network.Id)));
+            Assert.All(networks, network => Assert.Contains(results, x => x.Id == network.Id));
         }
 
         [Fact]
@@ -196,7 +196,7 @@ public async Task ListSubnetsTest()
 
             Trace.WriteLine("Verifying list of subnets...");
             Assert.NotNull(results);
-            Assert.All(subnets, subnet => Assert.True(results.Any(x => x.Id == subnet.Id)));
+            Assert.All(subnets, subnet => Assert.Contains(results, x => x.Id == subnet.Id));
         }
 
         [Fact]
@@ -299,7 +299,7 @@ public async Task ListPortsTest()
 
             Trace.WriteLine("Verifying list of ports...");
             Assert.NotNull(results);
-            Assert.All(ports, port => Assert.True(results.Any(x => x.Id == port.Id)));
+            Assert.All(ports, port => Assert.Contains(results, x => x.Id == port.Id));
         }
 
         [Fact]

src/testing/integration/ObjectStorage/CloudFilesProviderTests.cs

@@ -28,7 +28,9 @@ public CloudFilesTests(ITestOutputHelper testLog)
             _cloudFiles = new CloudFilesProvider(null, authenticationProvider);
         }
 
+#pragma warning disable xUnit1013 // Public method should be marked as test
         public void Dispose()
+#pragma warning restore xUnit1013 // Public method should be marked as test
         {
             Trace.Listeners.Clear();
             OpenStackNet.Tracing.Http.Listeners.Clear();
@@ -60,8 +62,8 @@ public void MoveObject()
 
             // Verify the file moved
             var files = _cloudFiles.ListObjects(container, region: region);
-            Assert.False(files.Any(f => f.Name == fileName));
-            Assert.True(files.Any(f => f.Name == backupName));
+            Assert.DoesNotContain(files, f => f.Name == fileName);
+            Assert.Contains(files, f => f.Name == backupName);
         }
 
         [Fact]
@@ -80,7 +82,7 @@ public void MoveObject_ShouldDoNothing_WhenSourceAndDestinationAreTheSame()
 
             // Verify the file wasn't removed
             var files = _cloudFiles.ListObjects(container, region: region);
-            Assert.True(files.Any(f => f.Name == filename));
+            Assert.Contains(files, f => f.Name == filename);
         }
     }
 }