Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue.

build.cake

@@ -80,7 +80,7 @@ Task("Version")
 		if (AppVeyor.IsRunningOnAppVeyor)
 		{
 			Information("Persisting version number...");
-			PersistVersion(nugetVersion);
+			PersistVersion(committedVersion, nugetVersion);
 			buildVersion = nugetVersion;
 		}
 		else
@@ -158,7 +158,7 @@ Task("CreatePackages")
 	{
 		EnsureDirectoryExists(packagesDir);
         
-		GenerateReleaseNotes();
+		GenerateReleaseNotes(releaseNotesFile);
 
 		var settings = new DotNetCorePackSettings
 			{
@@ -189,7 +189,7 @@ Task("ReleasePackagesToUnstableFeed")
 	.IsDependentOn("CreatePackages")
 	.Does(() =>
 	{
-		PublishPackages(nugetFeedUnstableKey, nugetFeedUnstableUploadUrl, nugetFeedUnstableSymbolsUploadUrl);
+		PublishPackages(packagesDir, artifactsFile, nugetFeedUnstableKey, nugetFeedUnstableUploadUrl, nugetFeedUnstableSymbolsUploadUrl);
 	});
 
 Task("EnsureStableReleaseRequirements")
@@ -241,7 +241,7 @@ Task("ReleasePackagesToStableFeed")
     .IsDependentOn("DownloadGitHubReleaseArtifacts")
     .Does(() =>
     {
-		PublishPackages(nugetFeedStableKey, nugetFeedStableUploadUrl, nugetFeedStableSymbolsUploadUrl);
+		PublishPackages(packagesDir, artifactsFile, nugetFeedStableKey, nugetFeedStableUploadUrl, nugetFeedStableSymbolsUploadUrl);
     });
 
 Task("Release")
@@ -262,9 +262,9 @@ private string GetNuGetVersionForCommit()
 }
 
 /// Updates project version in all of our projects
-private void PersistVersion(string version)
+private void PersistVersion(string committedVersion, string newVersion)
 {
-	Information(string.Format("We'll search all project.json files for {0} and replace with {1}...", committedVersion, version));
+	Information(string.Format("We'll search all project.json files for {0} and replace with {1}...", committedVersion, newVersion));
 
 	var projectJsonFiles = GetFiles("./**/project.json");
 
@@ -275,24 +275,30 @@ private void PersistVersion(string version)
 		Information(string.Format("Updating {0}...", file));
 
 		var updatedProjectJson = System.IO.File.ReadAllText(file)
-			.Replace(committedVersion, version);
+			.Replace(committedVersion, newVersion);
 
 		System.IO.File.WriteAllText(file, updatedProjectJson);
 	}
 }
 
 /// generates release notes based on issues closed in GitHub since the last release
-private void GenerateReleaseNotes()
+private void GenerateReleaseNotes(string file)
 {
-	Information("Generating release notes at " + releaseNotesFile);
+	if (!IsRunningOnWindows())
+	{
+		Warning("We can't generate release notes as we're not running on Windows.");
+		return;
+	}
+
+	Information("Generating release notes at " + file);
 
     var releaseNotesExitCode = StartProcess(
         @"tools/GitReleaseNotes/tools/gitreleasenotes.exe", 
-        new ProcessSettings { Arguments = ". /o " + releaseNotesFile });
+        new ProcessSettings { Arguments = ". /o " + file });
 
-    if (string.IsNullOrEmpty(System.IO.File.ReadAllText(releaseNotesFile)))
+    if (string.IsNullOrEmpty(System.IO.File.ReadAllText(file)))
 	{
-        System.IO.File.WriteAllText(releaseNotesFile, "No issues closed since last release");
+        System.IO.File.WriteAllText(file, "No issues closed since last release");
 	}
 
     if (releaseNotesExitCode != 0) 
@@ -302,7 +308,7 @@ private void GenerateReleaseNotes()
 }
 
 /// Publishes code and symbols packages to nuget feed, based on contents of artifacts file
-private void PublishPackages(string feedApiKey, string codeFeedUrl, string symbolFeedUrl)
+private void PublishPackages(string packagesDir, string artifactsFile, string feedApiKey, string codeFeedUrl, string symbolFeedUrl)
 {
         var artifacts = System.IO.File
             .ReadAllLines(artifactsFile)

test/Ocelot.AcceptanceTests/project.json

@@ -38,9 +38,10 @@
     "xunit": "2.2.0-rc1-build3507"
   },
   "runtimes": {
-    "win10-x64": {},
+    "osx.10.11-x64":{},
-    "osx.10.11-x64": {},
+    "osx.10.12-x64":{},
-    "win7-x64": {}
+    "win7-x64": {},
+    "win10-x64": {}
   },
   "frameworks": {
     "netcoreapp1.1": {

test/Ocelot.Benchmarks/project.json

@@ -9,9 +9,10 @@
     "BenchmarkDotNet": "0.10.2"
   },
   "runtimes": {
-    "win10-x64": {},
     "osx.10.11-x64":{},
-    "win7-x64": {}
+    "osx.10.12-x64":{},
+    "win7-x64": {},
+    "win10-x64": {}
   },
   "frameworks": {
     "netcoreapp1.1": {

test/Ocelot.ManualTest/project.json

@@ -19,9 +19,10 @@
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
   },
   "runtimes": {
-    "win10-x64": {},
     "osx.10.11-x64":{},
-    "win7-x64": {}
+    "osx.10.12-x64":{},
+    "win7-x64": {},
+    "win10-x64": {}
   },
   "frameworks": {
     "netcoreapp1.1": {

test/Ocelot.UnitTests/project.json

@@ -27,9 +27,10 @@
     "xunit": "2.2.0-rc1-build3507"
   },
   "runtimes": {
-    "win10-x64": {},
     "osx.10.11-x64":{},
-    "win7-x64": {}
+    "osx.10.12-x64":{},
+    "win7-x64": {},
+    "win10-x64": {}
   },
   "frameworks": {
     "netcoreapp1.1": {