Browse Source
Merge branch 'master' into publish-test-results-on-failure
pull/2055/head
danwalmsley
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
build/SharedVersion.props
-
parameters.cake
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|
|
|
<PropertyGroup> |
|
|
|
<Product>Avalonia</Product> |
|
|
|
<Version>0.7.0</Version> |
|
|
|
<Version>0.7.1</Version> |
|
|
|
<Copyright>Copyright 2018 © The AvaloniaUI Project</Copyright> |
|
|
|
<PackageLicenseUrl>https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md</PackageLicenseUrl> |
|
|
|
<PackageProjectUrl>https://github.com/AvaloniaUI/Avalonia/</PackageProjectUrl> |
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ public class Parameters |
|
|
|
// CONFIGURATION |
|
|
|
MainRepo = "https://github.com/AvaloniaUI/Avalonia"; |
|
|
|
MasterBranch = "master"; |
|
|
|
ReleaseBranchPrefix = "release/"; |
|
|
|
ReleaseBranchPrefix = "refs/heads/release/"; |
|
|
|
ReleaseConfiguration = "Release"; |
|
|
|
MSBuildSolution = "./dirs.proj"; |
|
|
|
|
|
|
|
@ -64,7 +64,7 @@ public class Parameters |
|
|
|
IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest; |
|
|
|
IsMainRepo = StringComparer.OrdinalIgnoreCase.Equals(MainRepo, context.EnvironmentVariable("BUILD_REPOSITORY_URI")); |
|
|
|
IsMasterBranch = StringComparer.OrdinalIgnoreCase.Equals(MasterBranch, context.EnvironmentVariable("BUILD_SOURCEBRANCHNAME")); |
|
|
|
IsReleaseBranch = context.EnvironmentVariable("BUILD_SOURCEBRANCHNAME").ToLower().StartsWith(ReleaseBranchPrefix.ToLower()); |
|
|
|
IsReleaseBranch = context.EnvironmentVariable("BUILD_SOURCEBRANCH").ToLower().StartsWith(ReleaseBranchPrefix.ToLower()); |
|
|
|
IsTagged = buildSystem.AppVeyor.Environment.Repository.Tag.IsTag |
|
|
|
&& !string.IsNullOrWhiteSpace(buildSystem.AppVeyor.Environment.Repository.Tag.Name); |
|
|
|
IsReleasable = StringComparer.OrdinalIgnoreCase.Equals(ReleaseConfiguration, Configuration); |
|
|
|
|