Skip to content

Commit a576ddb

Browse files
committed
Workarounds to get build/release process working again
1 parent 4d653c3 commit a576ddb

35 files changed

+8435
-747
lines changed

build/build.proj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
<PropertyGroup>
55
<Configuration>Debug</Configuration>
6-
<Version>0.0.0-dev</Version>
6+
<Version>1.7.8</Version>
77
<PaketVersion>2.66.9</PaketVersion>
8+
<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
89
<PaketBootstrapper>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe</PaketBootstrapper>
910
<Paket>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe</Paket>
1011
<PackagesFolder>$(MSBuildThisFileDirectory.Replace('build\','packages'))</PackagesFolder>
@@ -92,7 +93,7 @@
9293
<Exec Command="$(MSBuild) $(MigrationSln) /nologo /clp:ErrorsOnly" />
9394
</Target>
9495

95-
<Target Name="Package" DependsOnTargets="Build;Documentation">
96+
<Target Name="Package" DependsOnTargets="Build">
9697
<MakeDir Directories="..\src\corelib\bin\v4.0\$(Configuration)\deploy" />
9798
<Exec Command="$(ILMerge) /t:library /v4 /out:deploy/openstacknet.dll openstacknet.dll SimpleRESTServices.dll"
9899
WorkingDirectory="..\src\corelib\bin\v4.0\$(Configuration)" />

paket.dependencies

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
source https://www.myget.org/F/openstacknetsdk/api/v2
21
source https://www.nuget.org/api/v2
32
redirects: on
43

5-
nuget EWSoftware.SHFB = 2014.11.22-beta
64
nuget Flurl.Http.Signed ~> 0.7.0
7-
nuget Flurl.Signed ~> 1.0
5+
nuget Flurl.Signed ~> 1.0.10
86
nuget ILMerge
97
nuget Marvin.JsonPatch.Signed ~> 0.7.0
108
nuget Moq
11-
nuget Newtonsoft.Json ~> 6.0
9+
nuget Newtonsoft.Json >= 6.0
1210
nuget NuGet.CommandLine = 3.4.4-rtm-final
1311
nuget SharpZipLib
14-
nuget SimpleRESTServices = 1.3.0.1-json002
15-
nuget xunit
12+
nuget SimpleRESTServices = 1.3.0.2
13+
nuget xunit ~> 2.0
1614
nuget xunit.abstractions
1715
nuget xunit.assert
1816
nuget xunit.core
1917
nuget xunit.extensibility.core
2018
nuget xunit.runner.console
2119
nuget xunit.runner.visualstudio
20+
21+
source https://www.myget.org/F/openstacknetsdk/api/v2
22+
nuget EWSoftware.SHFB = 2014.11.22-beta
23+
2224

2325
group History-1.5
2426
redirects: on

paket.lock

Lines changed: 841 additions & 190 deletions
Large diffs are not rendered by default.

src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj

Lines changed: 1441 additions & 9 deletions
Large diffs are not rendered by default.

src/Samples/FSharpCodeSamples/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<dependentAssembly>
66
<Paket>True</Paket>
77
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
8+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
99
</dependentAssembly>
1010
</assemblyBinding></runtime></configuration>

src/corelib/Core/Providers/IComputeProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace net.openstack.Core.Providers
1313
/// <para>Represents a provider for the OpenStack Compute service.</para>
1414
/// </summary>
1515
/// <seealso href="http://docs.openstack.org/api/openstack-compute/2/content/">OpenStack Compute API v2 and Extensions Reference</seealso>
16-
[Obsolete("This will be removed in v2.0. Use OpenStack.Compute.v2_1.ComputeService or Rackspace.CloudServers.v2.CloudServerService (from the Rackspace NuGet package).")]
16+
//[Obsolete("This will be removed in v2.0. Use OpenStack.Compute.v2_1.ComputeService or Rackspace.CloudServers.v2.CloudServerService (from the Rackspace NuGet package).")]
1717
public interface IComputeProvider
1818
{
1919
/// <summary>

src/corelib/OpenStack.csproj

Lines changed: 1577 additions & 69 deletions
Large diffs are not rendered by default.

src/corelib/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<dependentAssembly>
66
<Paket>True</Paket>
77
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
8+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
99
</dependentAssembly>
1010
</assemblyBinding></runtime></configuration>

src/corelib/corelib.nuspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<id>openstack.net</id>
55
<version>0.0.0</version>
66
<title>openstack.net</title>
7-
<authors>alanquillin, kravi, ejwebb, jasonmitschke, bretmc, sharwell, carolynvs</authors>
8-
<owners>alanquillin, sharwell</owners>
7+
<authors>alanquillin, kravi, ejwebb, jasonmitschke, bretmc, sharwell, carolynvs, dwalleck</authors>
8+
<owners>dwalleck</owners>
99
<licenseUrl>http://openstacknetsdk.org/docs/html/8b286b82-7aaf-4e45-9ffc-adbd7dbcfaa6.htm</licenseUrl>
1010
<projectUrl>https://github.com/openstacknetsdk/openstack.net</projectUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -16,6 +16,7 @@
1616
<dependencies>
1717
<group targetFramework="4.5">
1818
<dependency id="Newtonsoft.Json" version="6.0.1" />
19+
<dependency id="Flurl.Signed" version="[1, 1.1)" />
1920
<dependency id="Flurl.Http.Signed" version="[0.7.0, 0.8)" />
2021
<dependency id="Marvin.JsonPatch.Signed" version="[0.7.0]" />
2122
</group>
@@ -26,7 +27,7 @@
2627
<!-- Runtime libraries -->
2728
<file src="bin\v4.0\$Configuration$\deploy\openstacknet.dll" target="lib\net45"/>
2829
<file src="bin\v4.0\$Configuration$\deploy\openstacknet.pdb" target="lib\net45"/>
29-
<file src="..\..\artifacts\docs\Api\v4.0\openstacknet.xml" target="lib\net45"/>
30+
<!-- <file src="..\..\artifacts\docs\Api\v4.0\openstacknet.xml" target="lib\net45"/> -->
3031

3132
</files>
3233
</package>

src/testing/integration/App.config

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
<dependentAssembly>
1212
<Paket>True</Paket>
1313
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<Paket>True</Paket>
18+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.2.0.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<Paket>True</Paket>
23+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.3.0" />
1525
</dependentAssembly>
1626
</assemblyBinding></runtime></configuration>

0 commit comments

Comments
 (0)