Skip to content

Commit 29235d9

Browse files
author
Joel Mitchell
committed
Updated to stable Cofoundry package, set up new CI with pre-releases on myGet
1 parent 5dbd501 commit 29235d9

File tree

6 files changed

+52
-101
lines changed

6 files changed

+52
-101
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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
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
108
build_script:
119
- cmd: PowerShell -Version 2.0 .\build.ps1 -PushPackages true
1210
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.DependencyInjection.Autofac.", versionInfo.InformationalVersion);
4948

50-
Information("Building version {0} of Cofoundry.Plugins.DependencyInjection.Autofac.", 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.BackgroundTasks.Hangfire.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.BackgroundTasks.Hangfire/Cofoundry.Plugins.BackgroundTasks.Hangfire.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Cofoundry.Core, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Cofoundry.Core.0.1.0-beta0106\lib\net461\Cofoundry.Core.dll</HintPath>
48+
<HintPath>..\packages\Cofoundry.Core.0.1.0\lib\net461\Cofoundry.Core.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Cofoundry.Domain, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Cofoundry.Domain.0.1.0-beta0106\lib\net461\Cofoundry.Domain.dll</HintPath>
52+
<HintPath>..\packages\Cofoundry.Domain.0.1.0\lib\net461\Cofoundry.Domain.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Cofoundry.Web, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Cofoundry.Web.0.1.0-beta0106\lib\net461\Cofoundry.Web.dll</HintPath>
56+
<HintPath>..\packages\Cofoundry.Web.0.1.0\lib\net461\Cofoundry.Web.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Conditions, Version=2.1.0.24, Culture=neutral, processorArchitecture=MSIL">

‎src/Cofoundry.Plugins.BackgroundTasks.Hangfire/Cofoundry.Plugins.BackgroundTasks.Hangfire.nuspec

Lines changed: 12 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -14,87 +14,28 @@
1414
<copyright>Cofoundry.org</copyright>
1515
<tags>Cofoundry Hangfire Plugin BackgroundTasks</tags>
1616
<dependencies>
17-
<dependency id="Antlr" version="3.5.0.2" />
1817
<dependency id="AutoMapper" version="5.2.0" />
19-
<dependency id="Cofoundry.Core" version="0.1.0-beta0106" />
20-
<dependency id="Cofoundry.Domain" version="0.1.0-beta0106" />
21-
<dependency id="Cofoundry.Web" version="0.1.0-beta0106" />
22-
<dependency id="CommonServiceLocator" version="1.3" />
18+
<dependency id="Cofoundry.Core" version="0.1.0" />
19+
<dependency id="Cofoundry.Domain" version="0.1.0" />
2320
<dependency id="Conditions" version="2.1.0" />
2421
<dependency id="EntityFramework" version="6.1.3" />
25-
<dependency id="Hangfire" version="1.6.8" />
26-
<dependency id="Hangfire.Core" version="1.6.8" />
27-
<dependency id="Hangfire.SqlServer" version="1.6.8" />
2822
<dependency id="HtmlAgilityPack" version="1.4.9.5" />
2923
<dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
30-
<dependency id="Microsoft.AspNet.OData" version="6.0.0" />
3124
<dependency id="Microsoft.AspNet.Razor" version="3.2.3" />
32-
<dependency id="Microsoft.AspNet.Web.Optimization" version="1.1.3" />
33-
<dependency id="Microsoft.AspNet.WebApi" version="5.2.3" />
34-
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />
35-
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
36-
<dependency id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" />
3725
<dependency id="Microsoft.AspNet.WebPages" version="3.2.3" />
38-
<dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.3" />
39-
<dependency id="Microsoft.Extensions.DependencyInjection" version="1.1.0" />
40-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.0" />
41-
<dependency id="Microsoft.NETCore.Platforms" version="1.1.0" />
42-
<dependency id="Microsoft.OData.Core" version="7.0.0" />
43-
<dependency id="Microsoft.OData.Edm" version="7.0.0" />
44-
<dependency id="Microsoft.Owin" version="3.0.1" />
45-
<dependency id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" />
46-
<dependency id="Microsoft.Spatial" version="7.0.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" />
4730
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
48-
<dependency id="Microsoft.Win32.Primitives" version="4.3.0" />
49-
<dependency id="NETStandard.Library" version="1.6.1" />
5031
<dependency id="Newtonsoft.Json" version="9.0.1" />
51-
<dependency id="Owin" version="1.0" />
5232
<dependency id="RazorEngine" version="3.9.3" />
53-
<dependency id="System.AppContext" version="4.3.0" />
54-
<dependency id="System.Collections" version="4.3.0" />
55-
<dependency id="System.Collections.Concurrent" version="4.3.0" />
56-
<dependency id="System.ComponentModel" version="4.3.0" />
57-
<dependency id="System.Console" version="4.3.0" />
58-
<dependency id="System.Diagnostics.Debug" version="4.3.0" />
59-
<dependency id="System.Diagnostics.DiagnosticSource" version="4.3.0" />
60-
<dependency id="System.Diagnostics.Tools" version="4.3.0" />
61-
<dependency id="System.Diagnostics.Tracing" version="4.3.0" />
62-
<dependency id="System.Globalization" version="4.3.0" />
63-
<dependency id="System.Globalization.Calendars" version="4.3.0" />
64-
<dependency id="System.IO" version="4.3.0" />
65-
<dependency id="System.IO.Compression" version="4.3.0" />
66-
<dependency id="System.IO.Compression.ZipFile" version="4.3.0" />
67-
<dependency id="System.IO.FileSystem" version="4.3.0" />
68-
<dependency id="System.IO.FileSystem.Primitives" version="4.3.0" />
69-
<dependency id="System.Linq" version="4.3.0" />
70-
<dependency id="System.Linq.Expressions" version="4.3.0" />
71-
<dependency id="System.Net.Http" version="4.3.0" />
72-
<dependency id="System.Net.Primitives" version="4.3.0" />
73-
<dependency id="System.Net.Sockets" version="4.3.0" />
74-
<dependency id="System.ObjectModel" version="4.3.0" />
75-
<dependency id="System.Reflection" version="4.3.0" />
76-
<dependency id="System.Reflection.Extensions" version="4.3.0" />
77-
<dependency id="System.Reflection.Primitives" version="4.3.0" />
78-
<dependency id="System.Resources.ResourceManager" version="4.3.0" />
79-
<dependency id="System.Runtime" version="4.3.0" />
80-
<dependency id="System.Runtime.Extensions" version="4.3.0" />
81-
<dependency id="System.Runtime.Handles" version="4.3.0" />
82-
<dependency id="System.Runtime.InteropServices" version="4.3.0" />
83-
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
84-
<dependency id="System.Runtime.Numerics" version="4.3.0" />
85-
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.0" />
86-
<dependency id="System.Security.Cryptography.Encoding" version="4.3.0" />
87-
<dependency id="System.Security.Cryptography.Primitives" version="4.3.0" />
88-
<dependency id="System.Security.Cryptography.X509Certificates" version="4.3.0" />
89-
<dependency id="System.Text.Encoding" version="4.3.0" />
90-
<dependency id="System.Text.Encoding.Extensions" version="4.3.0" />
91-
<dependency id="System.Text.RegularExpressions" version="4.3.0" />
92-
<dependency id="System.Threading" version="4.3.0" />
93-
<dependency id="System.Threading.Tasks" version="4.3.0" />
94-
<dependency id="System.Threading.Timer" version="4.3.0" />
95-
<dependency id="System.Xml.ReaderWriter" version="4.3.0" />
96-
<dependency id="System.Xml.XDocument" version="4.3.0" />
97-
<dependency id="WebGrease" version="1.6.0" />
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" />
9839
</dependencies>
9940
</metadata>
10041
<files>

‎src/Cofoundry.Plugins.BackgroundTasks.Hangfire/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
44
<package id="AutoMapper" version="5.2.0" targetFramework="net461" />
5-
<package id="Cofoundry.Core" version="0.1.0-beta0106" targetFramework="net461" />
6-
<package id="Cofoundry.Domain" version="0.1.0-beta0106" targetFramework="net461" />
7-
<package id="Cofoundry.Web" version="0.1.0-beta0106" targetFramework="net461" />
5+
<package id="Cofoundry.Core" version="0.1.0" targetFramework="net461" />
6+
<package id="Cofoundry.Domain" version="0.1.0" targetFramework="net461" />
7+
<package id="Cofoundry.Web" version="0.1.0" targetFramework="net461" />
88
<package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
99
<package id="Conditions" version="2.1.0" targetFramework="net461" />
1010
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />

0 commit comments

Comments
 (0)