Skip to content

Commit

Permalink
appveyor again....
Browse files Browse the repository at this point in the history
  • Loading branch information
punker76 committed Nov 28, 2018
1 parent 9a5a660 commit ea07ae3
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 29 deletions.
54 changes: 26 additions & 28 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
# http://www.appveyor.com/docs/appveyor-yml

# configuration for develop/CI and master/Release branch
-
branches:
only:
- develop
- master

skip_tags: true
image: Visual Studio 2017 Preview
configuration: Release
platform: Any CPU
test: off

# Install dotnet core 3.0 latest (alpha!!), as this is not provided on AppVeyor yet
install:
- ps: Start-FileDownload 'https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe'
- ps: Start-Process .\dotnet-sdk-latest-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait

pull_requests:
do_not_increment_build_number: false

build_script:
- ps: .\build.ps1 -target appveyor

artifacts:
- path: \Publish\*.*

nuget:
disable_publish_on_pr: true

branches:
only:
- develop
- master

skip_tags: true
image: Visual Studio 2017 Preview
test: off

# Install dotnet core 3.0 latest (alpha!!), as this is not provided on AppVeyor yet
install:
- ps: Start-FileDownload 'https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe'
- ps: Start-Process .\dotnet-sdk-latest-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait

pull_requests:
do_not_increment_build_number: false

build_script:
- ps: .\build.ps1 -target appveyor

artifacts:
- path: \Publish\*.*

nuget:
disable_publish_on_pr: true
9 changes: 8 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#tool GitVersion.CommandLine
#tool gitreleasemanager
#tool xunit.runner.console
#tool vswhere
#addin Cake.Figlet
#addin Cake.Paket

Expand Down Expand Up @@ -45,6 +46,9 @@ if (local == false
}
GitVersion gitVersion = GitVersion(new GitVersionSettings { OutputType = GitVersionOutput.Json });

var latestInstallationPath = VSWhereProducts("*", new VSWhereProductSettings { Version = "[\"15.0\",\"16.0\"]" }).FirstOrDefault();
var msBuildPath = latestInstallationPath.CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe");

var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
var branchName = gitVersion.BranchName;
var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName);
Expand Down Expand Up @@ -78,6 +82,7 @@ Setup(ctx =>
Information("IsLocalBuild : {0}", local);
Information("Branch : {0}", branchName);
Information("Configuration : {0}", configuration);
Information("MSBuildPath : {0}", msBuildPath);
});

Teardown(ctx =>
Expand All @@ -102,6 +107,7 @@ Task("Restore")
{
var msBuildSettings = new MSBuildSettings {
Verbosity = Verbosity.Minimal,
ToolPath = msBuildPath,
ToolVersion = MSBuildToolVersion.Default,
Configuration = configuration,
// Restore = true, // only with cake 0.28.x
Expand All @@ -116,6 +122,7 @@ Task("Build")
{
var msBuildSettings = new MSBuildSettings {
Verbosity = Verbosity.Normal,
ToolPath = msBuildPath,
ToolVersion = MSBuildToolVersion.Default,
Configuration = configuration,
// Restore = true, // only with cake 0.28.x
Expand All @@ -139,9 +146,9 @@ Task("Pack")

var msBuildSettings = new MSBuildSettings {
Verbosity = Verbosity.Normal,
ToolPath = msBuildPath,
ToolVersion = MSBuildToolVersion.Default,
Configuration = configuration
// PlatformTarget = PlatformTarget.MSIL
};
var project = "./src/MahApps.Metro/MahApps.Metro.csproj";

Expand Down

0 comments on commit ea07ae3

Please sign in to comment.