Skip to content

Commit 459a58b

Browse files
author
Joel Mitchell
committed
Updated to stable Cofoundry package, set up new CI with pre-releases on myGet
1 parent 53bf417 commit 459a58b

File tree

7 files changed

+77
-54
lines changed

7 files changed

+77
-54
lines changed

‎GitVersion.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mode: ContinuousDeployment
2+
branches: {}
3+
ignore:
4+
sha: []

‎appveyor.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
version: '{build}'
22
image: Visual Studio 2015
3-
branches:
4-
only:
5-
- master
6-
- develop
73
environment:
84
NUGET_API_KEY:
95
secure: KBgtBksw79Z4kFehSqUePYoknzeWB8Tq8eAzSFPxDysRJCjJT3iUiCzk7OweTp0K
6+
MYGET_API_KEY:
7+
secure: JNkkCPfd2fNbhiTek4Hg4lP3Gf1IvB9xFf/Gv0pJGbw4+h8inQBaKZ6XlxpgRO44
8+
109
build_script:
1110
- cmd: PowerShell -Version 2.0 .\build.ps1 -PushPackages true
1211
test: off

‎build.cake

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
#tool "nuget:?package=GitVersion.CommandLine"
2+
13
//////////////////////////////////////////////////////////////////////
24
// ARGUMENTS
35
//////////////////////////////////////////////////////////////////////
46

57
var target = Argument("target", "Default");
68
var configuration = Argument("configuration", "Release");
79
var pushPackages = Argument("PushPackages", "false") == "true";
8-
var build = Convert.ToInt32(EnvironmentVariable("APPVEYOR_BUILD_VERSION") ?? "0");
9-
var semVersion = "0.1.0";
10-
var assemblyVersion = semVersion + "." + build;
11-
var nugetVersion = semVersion + "-beta" + build.ToString("D4");
10+
bool isPrerelease = false;
11+
GitVersion versionInfo = null;
1212

1313
//////////////////////////////////////////////////////////////////////
1414
// PREPARATION
@@ -40,21 +40,20 @@ Task("Patch-Assembly-Version")
4040
.IsDependentOn("Clean")
4141
.Does(() =>
4242
{
43-
// GitVersion(new GitVersionSettings{
44-
// UpdateAssemblyInfo = false,
45-
// OutputType = GitVersionOutput.BuildServer
46-
// });
43+
versionInfo = GitVersion(new GitVersionSettings{
44+
UpdateAssemblyInfo = false
45+
});
4746

48-
// versionInfo = GitVersion(new GitVersionSettings{ OutputType = GitVersionOutput.Json });
47+
Information("Building version {0} of Cofoundry.Plugins.Azure.", versionInfo.InformationalVersion);
4948

50-
Information("Building version {0} of Cofoundry.Plugins.Azure.", nugetVersion);
49+
isPrerelease = !string.IsNullOrEmpty(versionInfo.PreReleaseNumber);
5150

5251
var file = "./src/SolutionInfo.cs";
5352
CreateAssemblyInfo(file, new AssemblyInfoSettings {
54-
Version = semVersion,
55-
FileVersion = assemblyVersion,
56-
InformationalVersion = nugetVersion,
57-
Copyright = "Copyright © Cofoundry.org 2016"
53+
Version = versionInfo.AssemblySemVer,
54+
FileVersion = versionInfo.MajorMinorPatch + ".0",
55+
InformationalVersion = versionInfo.InformationalVersion,
56+
Copyright = "Copyright © Cofoundry.org " + DateTime.Now.Year
5857
});
5958
});
6059

@@ -68,7 +67,6 @@ Task("Build")
6867
// Use MSBuild
6968
MSBuild("./src/Cofoundry.Plugins.Azure.sln", settings => settings.SetConfiguration(configuration));
7069
}
71-
// Git Link: http://www.michael-whelan.net/continuous-delivery-github-cake-gittools-appveyor/
7270
});
7371

7472
Task("Pack")
@@ -79,7 +77,7 @@ Task("Pack")
7977

8078
var nuGetPackSettings = new NuGetPackSettings
8179
{
82-
Version = nugetVersion,
80+
Version = versionInfo.NuGetVersion,
8381
OutputDirectory = nugetPackageDir,
8482
Verbosity = NuGetVerbosity.Detailed,
8583
ArgumentCustomization = args => args.Append("-Prop Configuration=" + configuration)
@@ -102,10 +100,20 @@ Task("PushNuGetPackage")
102100
{
103101
Information("Pushing packages");
104102

105-
NuGetPush(nugets, new NuGetPushSettings {
106-
Source = "https://nuget.org/",
107-
ApiKey = EnvironmentVariable("NUGET_API_KEY")
108-
});
103+
if (isPrerelease)
104+
{
105+
NuGetPush(nugets, new NuGetPushSettings {
106+
Source = "https://www.myget.org/F/cofoundry/api/v2/package",
107+
ApiKey = EnvironmentVariable("MYGET_API_KEY")
108+
});
109+
}
110+
else
111+
{
112+
NuGetPush(nugets, new NuGetPushSettings {
113+
Source = "https://nuget.org/",
114+
ApiKey = EnvironmentVariable("NUGET_API_KEY")
115+
});
116+
}
109117
}
110118
});
111119

‎src/Cofoundry.Plugins.Azure/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
1717
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
1818
</dependentAssembly>
19+
<dependentAssembly>
20+
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
21+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
22+
</dependentAssembly>
1923
</assemblyBinding>
2024
</runtime>
2125
</configuration>

‎src/Cofoundry.Plugins.Azure/Cofoundry.Plugins.Azure.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="Cofoundry.Core, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Cofoundry.Core.0.1.0-beta0106\lib\net461\Cofoundry.Core.dll</HintPath>
41+
<HintPath>..\packages\Cofoundry.Core.0.1.0\lib\net461\Cofoundry.Core.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Cofoundry.Domain, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Cofoundry.Domain.0.1.0-beta0106\lib\net461\Cofoundry.Domain.dll</HintPath>
45+
<HintPath>..\packages\Cofoundry.Domain.0.1.0\lib\net461\Cofoundry.Domain.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="Conditions, Version=2.1.0.24, Culture=neutral, processorArchitecture=MSIL">
@@ -61,28 +61,28 @@
6161
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
64+
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
68+
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
72-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
72+
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73+
<HintPath>..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76-
<Reference Include="Microsoft.Data.Services.Client, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
76+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8181
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
84-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\packages\WindowsAzure.Storage.8.0.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
84+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<HintPath>..\packages\WindowsAzure.Storage.8.1.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -96,8 +96,8 @@
9696
<Reference Include="System" />
9797
<Reference Include="System.ComponentModel.DataAnnotations" />
9898
<Reference Include="System.Core" />
99-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
99+
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Cofoundry.Plugins.Azure/Uber.Core.Azure.nuspec

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,27 @@
1515
<tags>Cofoundry Azure</tags>
1616
<dependencies>
1717
<dependency id="AutoMapper" version="5.2.0" />
18-
<dependency id="Cofoundry.Core" version="0.1.0-beta0106" />
19-
<dependency id="Cofoundry.Domain" version="0.1.0-beta0106" />
18+
<dependency id="Cofoundry.Core" version="0.1.0" />
19+
<dependency id="Cofoundry.Domain" version="0.1.0" />
2020
<dependency id="Conditions" version="2.1.0" />
2121
<dependency id="EntityFramework" version="6.1.3" />
2222
<dependency id="HtmlAgilityPack" version="1.4.9.5" />
2323
<dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
2424
<dependency id="Microsoft.AspNet.Razor" version="3.2.3" />
2525
<dependency id="Microsoft.AspNet.WebPages" version="3.2.3" />
26-
<dependency id="Microsoft.Azure.KeyVault.Core" version="1.0.0" />
27-
<dependency id="Microsoft.Data.Edm" version="5.7.0" />
28-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
29-
<dependency id="Microsoft.Data.Services.Client" version="5.7.0" />
26+
<dependency id="Microsoft.Azure.KeyVault.Core" version="2.0.4" />
27+
<dependency id="Microsoft.Data.Edm" version="5.8.2" />
28+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
29+
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
3030
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
3131
<dependency id="Newtonsoft.Json" version="9.0.1" />
3232
<dependency id="RazorEngine" version="3.9.3" />
33-
<dependency id="System.Spatial" version="5.7.0" />
34-
<dependency id="WindowsAzure.Storage" version="8.0.1" />
33+
<dependency id="System.ComponentModel.EventBasedAsync" version="4.3.0" />
34+
<dependency id="System.Dynamic.Runtime" version="4.3.0" />
35+
<dependency id="System.Linq.Queryable" version="4.3.0" />
36+
<dependency id="System.Net.Requests" version="4.3.0" />
37+
<dependency id="System.Spatial" version="5.8.2" />
38+
<dependency id="WindowsAzure.Storage" version="8.1.0" />
3539
</dependencies>
3640
</metadata>
3741
<files>

‎src/Cofoundry.Plugins.Azure/packages.config

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AutoMapper" version="5.2.0" targetFramework="net461" />
4-
<package id="Cofoundry.Core" version="0.1.0-beta0106" targetFramework="net461" />
5-
<package id="Cofoundry.Domain" version="0.1.0-beta0106" targetFramework="net461" />
4+
<package id="Cofoundry.Core" version="0.1.0" targetFramework="net461" />
5+
<package id="Cofoundry.Domain" version="0.1.0" targetFramework="net461" />
66
<package id="Conditions" version="2.1.0" targetFramework="net461" />
77
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />
88
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
99
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
1010
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
1111
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
12-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net461" />
13-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net461" />
14-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net461" />
15-
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net461" />
12+
<package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net461" />
13+
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net461" />
14+
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net461" />
15+
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net461" />
1616
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
1717
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
1818
<package id="RazorEngine" version="3.9.3" targetFramework="net461" />
19-
<package id="System.Spatial" version="5.7.0" targetFramework="net461" />
20-
<package id="WindowsAzure.Storage" version="8.0.1" targetFramework="net461" />
19+
<package id="System.ComponentModel.EventBasedAsync" version="4.3.0" targetFramework="net461" />
20+
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
21+
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
22+
<package id="System.Net.Requests" version="4.3.0" targetFramework="net461" />
23+
<package id="System.Spatial" version="5.8.2" targetFramework="net461" />
24+
<package id="WindowsAzure.Storage" version="8.1.0" targetFramework="net461" />
2125
</packages>

0 commit comments

Comments
 (0)