Skip to content

Commit

Permalink
(GH-3616) Support .NET Core 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
punker76 committed Sep 25, 2019
1 parent 9c721a4 commit efceff2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
10 changes: 7 additions & 3 deletions appveyor.yml
Expand Up @@ -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
Expand All @@ -35,4 +35,8 @@ artifacts:
- path: \Publish\*.*

nuget:
disable_publish_on_pr: true
disable_publish_on_pr: true

skip_commits:
files:
- '**/*.md'
20 changes: 8 additions & 12 deletions build.cake
Expand Up @@ -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");
Expand All @@ -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";
Expand All @@ -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.");
Expand All @@ -81,7 +79,6 @@ Setup(ctx =>

Teardown(ctx =>
{
// Executed AFTER the last task.
});

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview"
"version": "3.0.100"
}
}

0 comments on commit efceff2

Please sign in to comment.