From efceff2f6d4755e9150cfae989b1070d7091ec38 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Thu, 26 Sep 2019 00:09:16 +0200
Subject: [PATCH] (GH-3616) Support .NET Core 3.0

---
 appveyor.yml    | 10 +++++++---
 build.cake      | 20 ++++++++------------
 src/global.json |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index edf8c38b45..7669021cb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,11 +18,11 @@ environment:
     secure: BSPdW2TgnQtoQXXbeDECug==
 
 skip_tags: true
-image: Visual Studio 2019 Preview
+image: Visual Studio 2019
 test: off
 
 install:
-  - cinst dotnetcore-sdk --pre
+  - cinst dotnetcore-sdk
 
 pull_requests:
   do_not_increment_build_number: false
@@ -35,4 +35,8 @@ artifacts:
   - path: \Publish\*.*
 
 nuget:
-  disable_publish_on_pr: true
\ No newline at end of file
+  disable_publish_on_pr: true
+
+skip_commits:
+  files:
+    - '**/*.md'
\ No newline at end of file
diff --git a/build.cake b/build.cake
index 51cd895a9c..615e05be90 100644
--- a/build.cake
+++ b/build.cake
@@ -34,6 +34,12 @@ if (isLocal == false || verbosity == Verbosity.Verbose)
 }
 GitVersion gitVersion = GitVersion(new GitVersionSettings { OutputType = GitVersionOutput.Json });
 
+var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
+var branchName = gitVersion.BranchName;
+var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName);
+var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", branchName);
+var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;
+
 var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true });
 var msBuildPath = latestInstallationPath.Combine("./MSBuild/Current/Bin");
 var msBuildPathExe = msBuildPath.CombineWithFilePath("./MSBuild.exe");
@@ -43,12 +49,6 @@ if (FileExists(msBuildPathExe) == false)
     throw new NotImplementedException("You need at least Visual Studio 2019 to build this project.");
 }
 
-var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
-var branchName = gitVersion.BranchName;
-var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName);
-var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", branchName);
-var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;
-
 // Directories and Paths
 var solution = "./src/MahApps.Metro.sln";
 var publishDir = "./Publish";
@@ -59,8 +59,6 @@ var publishDir = "./Publish";
 
 Setup(ctx =>
 {
-    // Executed BEFORE the first task.
-
     if (!IsRunningOnWindows())
     {
         throw new NotImplementedException($"{repoName} will only build on Windows because it's not possible to target WPF and Windows Forms from UNIX.");
@@ -81,7 +79,6 @@ Setup(ctx =>
 
 Teardown(ctx =>
 {
-   // Executed AFTER the last task.
 });
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -111,10 +108,9 @@ Task("Build")
         Verbosity = verbosity
         , ToolPath = msBuildPathExe
         , Configuration = configuration
-        , ArgumentCustomization = args => args.Append("/m")
+        , ArgumentCustomization = args => args.Append("/m").Append("/nr:false") // The /nr switch tells msbuild to quite once it’s done
         , BinaryLogger = new MSBuildBinaryLogSettings() { Enabled = isLocal }
-        };
-
+    };
     MSBuild(solution, msBuildSettings
             .SetMaxCpuCount(0)
             .WithProperty("Description", "MahApps.Metro, a toolkit for creating Metro / Modern UI styled WPF applications.")
diff --git a/src/global.json b/src/global.json
index d79ad951a4..4eec759f93 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.0.100-preview"
+        "version": "3.0.100"
     }
 }
\ No newline at end of file