From 135eeaf90d3eee7efcea8c09886dee33347a681e Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 09:30:42 -0400 Subject: [PATCH 01/16] WIP --- build.cake | 121 +---------------------------------------------------- 1 file changed, 2 insertions(+), 119 deletions(-) diff --git a/build.cake b/build.cake index 924d045cc1..c35c8a29c8 100644 --- a/build.cake +++ b/build.cake @@ -42,20 +42,11 @@ var treatWarningsAsErrors = false; // Build configuration var local = BuildSystem.IsLocalBuild; -var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest; +var isPullRequest = !string.IsNullOrWhiteSpace(TFBuild.Environment.GetEnvironmentString("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER")); var isRepository = StringComparer.OrdinalIgnoreCase.Equals("reactiveui/reactiveui", AppVeyor.Environment.Repository.Name); -var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", AppVeyor.Environment.Repository.Branch); -var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", AppVeyor.Environment.Repository.Branch); -var isTagged = AppVeyor.Environment.Repository.Tag.IsTag; - -var githubOwner = "reactiveui"; -var githubRepository = "reactiveui"; -var githubUrl = string.Format("https://github.com/{0}/{1}", githubOwner, githubRepository); - var msBuildPath = VSWhereLatest().CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe"); - // Version var gitVersion = GitVersion(); @@ -310,121 +301,13 @@ Task("PinNuGetDependencies") }); -Task("PublishPackages") - .IsDependentOn("RunUnitTests") - .IsDependentOn("Package") - .IsDependentOn("SignPackages") - .WithCriteria(() => !local) - .WithCriteria(() => !isPullRequest) - .WithCriteria(() => isRepository) - .WithCriteria(() => isDevelopBranch || isReleaseBranch) - .Does (() => -{ - - if (isReleaseBranch && !isTagged) - { - Information("Packages will not be published as this release has not been tagged."); - return; - } - - // Resolve the API key. - var apiKey = EnvironmentVariable("NUGET_APIKEY"); - if (string.IsNullOrEmpty(apiKey)) - { - throw new Exception("The NUGET_APIKEY environment variable is not defined."); - } - - var source = EnvironmentVariable("NUGET_SOURCE"); - if (string.IsNullOrEmpty(source)) - { - throw new Exception("The NUGET_SOURCE environment variable is not defined."); - } - - // only push whitelisted packages. - foreach(var package in packageWhitelist) - { - // only push the package which was created during this build run. - var packagePath = artifactDirectory + File(string.Concat(package, ".", nugetVersion, ".nupkg")); - - // Push the package. - NuGetPush(packagePath, new NuGetPushSettings { - Source = source, - ApiKey = apiKey - }); - } -}); - -Task("CreateRelease") - .IsDependentOn("Package") - .WithCriteria(() => !local) - .WithCriteria(() => !isPullRequest) - .WithCriteria(() => isRepository) - .WithCriteria(() => isReleaseBranch) - .WithCriteria(() => !isTagged) - .Does (() => -{ - var username = EnvironmentVariable("GITHUB_USERNAME"); - if (string.IsNullOrEmpty(username)) - { - throw new Exception("The GITHUB_USERNAME environment variable is not defined."); - } - - var token = EnvironmentVariable("GITHUB_TOKEN"); - if (string.IsNullOrEmpty(token)) - { - throw new Exception("The GITHUB_TOKEN environment variable is not defined."); - } - - GitReleaseManagerCreate(username, token, githubOwner, githubRepository, new GitReleaseManagerCreateSettings { - Milestone = majorMinorPatch, - Name = majorMinorPatch, - Prerelease = true, - TargetCommitish = "master" - }); -}); - -Task("PublishRelease") - .IsDependentOn("RunUnitTests") - .IsDependentOn("Package") - .WithCriteria(() => !local) - .WithCriteria(() => !isPullRequest) - .WithCriteria(() => isRepository) - .WithCriteria(() => isReleaseBranch) - .WithCriteria(() => isTagged) - .Does (() => -{ - var username = EnvironmentVariable("GITHUB_USERNAME"); - if (string.IsNullOrEmpty(username)) - { - throw new Exception("The GITHUB_USERNAME environment variable is not defined."); - } - - var token = EnvironmentVariable("GITHUB_TOKEN"); - if (string.IsNullOrEmpty(token)) - { - throw new Exception("The GITHUB_TOKEN environment variable is not defined."); - } - - // only push whitelisted packages. - foreach(var package in packageWhitelist) - { - // only push the package which was created during this build run. - var packagePath = artifactDirectory + File(string.Concat(package, ".", nugetVersion, ".nupkg")); - - GitReleaseManagerAddAssets(username, token, githubOwner, githubRepository, majorMinorPatch, packagePath); - } - - GitReleaseManagerClose(username, token, githubOwner, githubRepository, majorMinorPatch); -}); ////////////////////////////////////////////////////////////////////// // TASK TARGETS ////////////////////////////////////////////////////////////////////// Task("Default") - .IsDependentOn("CreateRelease") - .IsDependentOn("PublishPackages") - .IsDependentOn("PublishRelease") + .IsDependentOn("Package") .Does (() => { }); From 62480aab29be42ff3dae15ae2614b6ab5ad262be Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 09:58:31 -0400 Subject: [PATCH 02/16] updates --- .vsts-ci.yml | 16 ++++++++-------- build.cake | 2 +- build.cmd | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3078d5b0fd..7cb916f3bc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -27,7 +27,7 @@ steps: Contents: 'artifacts/*.nupkg' TargetFolder: '$(build.artifactstagingdirectory)\packages' flattenFolders: true - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: PublishBuildArtifacts@1 displayName: Publish Package Artifacts @@ -35,14 +35,14 @@ steps: pathToPublish: '$(build.artifactstagingdirectory)\packages' artifactType: container artifactName: Packages - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: CopyFiles@2 inputs: Contents: '**/*.binlog' TargetFolder: '$(build.artifactstagingdirectory)\binlogs' flattenFolders: true - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: PublishBuildArtifacts@1 displayName: Publish Logs @@ -50,13 +50,13 @@ steps: pathToPublish: '$(build.artifactstagingdirectory)\binlogs' artifactType: container artifactName: Logs - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: CopyFiles@2 inputs: Contents: '**/bin/*' TargetFolder: '$(build.artifactstagingdirectory)\binaries' - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: PublishBuildArtifacts@1 displayName: Publish Binaries @@ -64,13 +64,13 @@ steps: pathToPublish: '$(build.artifactstagingdirectory)\binaries' artifactType: container artifactName: Binaries - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: CopyFiles@2 inputs: Contents: 'src/ReactiveUI.**/Events_*.cs' TargetFolder: '$(build.artifactstagingdirectory)\Events' - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) - task: PublishBuildArtifacts@1 displayName: Publish Generated Events @@ -78,4 +78,4 @@ steps: pathToPublish: '$(build.artifactstagingdirectory)\Events' artifactType: container artifactName: Events - condition: always() \ No newline at end of file + condition: eq(variables['system.pullrequest.isfork'], false) \ No newline at end of file diff --git a/build.cake b/build.cake index c35c8a29c8..30e24b8d9e 100644 --- a/build.cake +++ b/build.cake @@ -43,7 +43,7 @@ var treatWarningsAsErrors = false; // Build configuration var local = BuildSystem.IsLocalBuild; var isPullRequest = !string.IsNullOrWhiteSpace(TFBuild.Environment.GetEnvironmentString("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER")); -var isRepository = StringComparer.OrdinalIgnoreCase.Equals("reactiveui/reactiveui", AppVeyor.Environment.Repository.Name); +var isRepository = StringComparer.OrdinalIgnoreCase.Equals("reactiveui/reactiveui", TFBuild.Environment.Repository.RepoName); var msBuildPath = VSWhereLatest().CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe"); diff --git a/build.cmd b/build.cmd index 9e027e59d0..0a810856a3 100644 --- a/build.cmd +++ b/build.cmd @@ -2,6 +2,6 @@ tools\nuget\nuget.exe update -self tools\nuget\nuget.exe install Cake -OutputDirectory tools -ExcludeVersion -Version 0.22.1 -tools\Cake\Cake.exe build.cake --target=%1 --verbosity=diagnostic +tools\Cake\Cake.exe build.cake --target=%1 exit /b %errorlevel% From 0c90139fc55dc4cda516fe81c9e8176d7fc3e005 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 09:59:44 -0400 Subject: [PATCH 03/16] add trigger --- .vsts-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7cb916f3bc..191e22f576 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,4 +1,8 @@ -queue: "Hosted VS2017" +trigger: +- master +- develop + +queue: Hosted VS2017 steps: - task: BatchScript@1 From bda7394c312b6bfd17944216f35a9bab51cc2263 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 10:09:43 -0400 Subject: [PATCH 04/16] remove isTagged --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 30e24b8d9e..e6c97fa95c 100644 --- a/build.cake +++ b/build.cake @@ -82,7 +82,7 @@ Setup(context => throw new NotImplementedException("ReactiveUI will only build on Windows (w/Xamarin installed) because it's not possible to target UWP, WPF and Windows Forms from UNIX."); } - Information("Building version {0} of ReactiveUI. (isTagged: {1})", informationalVersion, isTagged); + Information("Building version {0} of ReactiveUI.", informationalVersion); CreateDirectory(artifactDirectory); }); From 78c6c364fde294908c4022de38deebffabf0571c Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 10:56:16 -0400 Subject: [PATCH 05/16] update --- build.cake | 2 +- build.cmd | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.cake b/build.cake index e6c97fa95c..f227f586bd 100644 --- a/build.cake +++ b/build.cake @@ -42,7 +42,7 @@ var treatWarningsAsErrors = false; // Build configuration var local = BuildSystem.IsLocalBuild; -var isPullRequest = !string.IsNullOrWhiteSpace(TFBuild.Environment.GetEnvironmentString("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER")); +var isPullRequest = !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER")); var isRepository = StringComparer.OrdinalIgnoreCase.Equals("reactiveui/reactiveui", TFBuild.Environment.Repository.RepoName); var msBuildPath = VSWhereLatest().CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe"); diff --git a/build.cmd b/build.cmd index 0a810856a3..ec3dc97bda 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,4 @@ @echo off -tools\nuget\nuget.exe update -self tools\nuget\nuget.exe install Cake -OutputDirectory tools -ExcludeVersion -Version 0.22.1 tools\Cake\Cake.exe build.cake --target=%1 From 072eb8e6afe2d8e0e21aa1e5984cf49068ee12d0 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 11:18:38 -0400 Subject: [PATCH 06/16] pass in token --- .vsts-ci.yml | 1 + build.cake | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 191e22f576..ed82d57b26 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -25,6 +25,7 @@ steps: SIGNCLIENT_SECRET: $(SignClientSecret) SIGNCLIENT_USER: $(SignClientUser) VSTS_ACCESS_TOKEN: $(System.AccessToken) + COVERALLS_TOKEN: $(COVERALLS_TOKEN) - task: CopyFiles@2 inputs: diff --git a/build.cake b/build.cake index f227f586bd..aa4c0ef854 100644 --- a/build.cake +++ b/build.cake @@ -255,15 +255,13 @@ Task("UploadTestCoverage") { // Resolve the API key. var token = EnvironmentVariable("COVERALLS_TOKEN"); - if (string.IsNullOrEmpty(token)) + if (!string.IsNullOrEmpty(token)) { - throw new Exception("The COVERALLS_TOKEN environment variable is not defined."); + CoverallsIo(testCoverageOutputFile, new CoverallsIoSettings() + { + RepoToken = token + }); } - - CoverallsIo(testCoverageOutputFile, new CoverallsIoSettings() - { - RepoToken = token - }); }); Task("SignPackages") From 68789c58be0c53f1c2c419f677c2318b87995765 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 11:33:27 -0400 Subject: [PATCH 07/16] update script --- SignPackages.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignPackages.ps1 b/SignPackages.ps1 index 20d6e5eead..5552153822 100644 --- a/SignPackages.ps1 +++ b/SignPackages.ps1 @@ -1,7 +1,7 @@ $currentDirectory = split-path $MyInvocation.MyCommand.Definition # See if we have the ClientSecret available -if([string]::IsNullOrEmpty($env:SIGNCLIENT_SECRET)){ +if([string]::IsNullOrWhitespace($env:SIGNCLIENT_SECRET)){ Write-Error "Client Secret not found, not signing packages"; [System.Environment]::Exit(1); } From d5564063c96dda28ac0dbf0a4b5451dac3959333 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 16:42:29 -0400 Subject: [PATCH 08/16] use NB.GV --- .vsts-ci.yml | 8 ++++++++ GitVersion.yml | 16 ---------------- build.cake | 30 ++++++++++-------------------- src/Directory.build.props | 4 ++++ src/SetVersion/setversion.csproj | 7 +++++++ src/SetVersion/version.json | 8 ++++++++ version.json | 16 ++++++++++++++++ 7 files changed, 53 insertions(+), 36 deletions(-) delete mode 100644 GitVersion.yml create mode 100644 src/SetVersion/setversion.csproj create mode 100644 src/SetVersion/version.json create mode 100644 version.json diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ed82d57b26..52486bd296 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -17,6 +17,14 @@ steps: inputs: versionSpec: 4.6.2 +- task: DotNetCoreCLI@2 + inputs: + command: build + projects: src/setversion/setversion.csproj + arguments: -c $(BuildConfiguration) + displayName: Set Version + condition: eq(variables['system.pullrequest.isfork'], false) + - powershell: | nuget install SignClient -Version 0.9.1 -SolutionDir $(Build.SourcesDirectory) -Verbosity quiet -ExcludeVersion .\build.cmd diff --git a/GitVersion.yml b/GitVersion.yml deleted file mode 100644 index 02ef9a4bdf..0000000000 --- a/GitVersion.yml +++ /dev/null @@ -1,16 +0,0 @@ -next-version: 8.0.0 -assembly-versioning-scheme: None -assembly-informational-format: '{NuGetVersion}-{sha}' -branches: - master: - mode: ContinuousDelivery - tag: - increment: Patch - prevent-increment-of-merged-branch-version: true - track-merge-target: false - develop: - mode: ContinuousDeployment - tag: alpha - increment: Minor - prevent-increment-of-merged-branch-version: false - track-merge-target: true diff --git a/build.cake b/build.cake index aa4c0ef854..64121919c5 100644 --- a/build.cake +++ b/build.cake @@ -16,7 +16,6 @@ ////////////////////////////////////////////////////////////////////// #tool "nuget:?package=GitReleaseManager&version=0.7.0" -#tool "nuget:?package=GitVersion.CommandLine&version=3.6.5" #tool "nuget:?package=coveralls.io&version=1.4.2" #tool "nuget:?package=OpenCover&version=4.6.519" #tool "nuget:?package=ReportGenerator&version=3.1.2" @@ -47,13 +46,7 @@ var isRepository = StringComparer.OrdinalIgnoreCase.Equals("reactiveui/reactiveu var msBuildPath = VSWhereLatest().CombineWithFilePath("./MSBuild/15.0/Bin/MSBuild.exe"); -// Version -var gitVersion = GitVersion(); - -var majorMinorPatch = gitVersion.MajorMinorPatch; -var informationalVersion = gitVersion.InformationalVersion; -var nugetVersion = gitVersion.NuGetVersionV2; -var buildVersion = gitVersion.FullBuildMetaData; +var informationalVersion = EnvironmentVariable("GitAssemblyInformationalVersion"); // Artifacts var artifactDirectory = "./artifacts/"; @@ -191,11 +184,7 @@ Task("BuildReactiveUI") .WithTarget("build;pack") .WithProperty("PackageOutputPath", MakeAbsolute(Directory(artifactDirectory)).ToString().Quote()) .WithProperty("TreatWarningsAsErrors", treatWarningsAsErrors.ToString()) - .SetConfiguration("Release") - // Due to https://github.com/NuGet/Home/issues/4790 and https://github.com/NuGet/Home/issues/4337 we - // have to pass a version explicitly - .WithProperty("Version", nugetVersion.ToString()) - .WithProperty("InformationalVersion", informationalVersion) + .SetConfiguration("Release") .SetVerbosity(Verbosity.Minimal) .SetNodeReuse(false)); }; @@ -287,14 +276,15 @@ Task("Package") Task("PinNuGetDependencies") .Does (() => { - // only pin whitelisted packages. - foreach(var package in packageWhitelist) + var packages = GetFiles(artifactDirectory + "/*.nupkg"); + foreach(var package in packages) { - // only pin the package which was created during this build run. - var packagePath = artifactDirectory + File(string.Concat(package, ".", nugetVersion, ".nupkg")); - - // see https://github.com/cake-contrib/Cake.PinNuGetDependency - PinNuGetDependency(packagePath, "ReactiveUI"); + // only pin whitelisted packages. + if(packageWhitelist.Any(p => package.StartsWith(p, StringComparison.OrdinalIgnoreCase))) + { + // see https://github.com/cake-contrib/Cake.PinNuGetDependency + PinNuGetDependency(packagePath, "ReactiveUI"); + } } }); diff --git a/src/Directory.build.props b/src/Directory.build.props index cfcb7faff7..a2790b24af 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -30,6 +30,10 @@ + + + + diff --git a/src/SetVersion/setversion.csproj b/src/SetVersion/setversion.csproj new file mode 100644 index 0000000000..9f5c4f4abb --- /dev/null +++ b/src/SetVersion/setversion.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/SetVersion/version.json b/src/SetVersion/version.json new file mode 100644 index 0000000000..f1b52a7dcf --- /dev/null +++ b/src/SetVersion/version.json @@ -0,0 +1,8 @@ +{ + "inherit": true, + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} diff --git a/version.json b/version.json new file mode 100644 index 0000000000..90432d1767 --- /dev/null +++ b/version.json @@ -0,0 +1,16 @@ +{ + "version": "8.1", + "publicReleaseRefSpec": [ + "^refs/heads/master$", // we release out of master + "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N + ], + "nugetPackageVersion":{ + "semVer": 2 + }, + "cloudBuild": { + "setVersionVariables": true, + "buildNumber": { + "enabled": false + } + } +} From ee5f873779f3104414600f497fb2b0dee6feb39a Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 16:58:04 -0400 Subject: [PATCH 09/16] fix pinning --- build.cake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.cake b/build.cake index 64121919c5..6b6e064d0b 100644 --- a/build.cake +++ b/build.cake @@ -276,14 +276,14 @@ Task("Package") Task("PinNuGetDependencies") .Does (() => { - var packages = GetFiles(artifactDirectory + "/*.nupkg"); + var packages = GetFiles(artifactDirectory + "*.nupkg"); foreach(var package in packages) { // only pin whitelisted packages. - if(packageWhitelist.Any(p => package.StartsWith(p, StringComparison.OrdinalIgnoreCase))) + if(packageWhitelist.Any(p => package.GetFilename().ToString().StartsWith(p, StringComparison.OrdinalIgnoreCase))) { // see https://github.com/cake-contrib/Cake.PinNuGetDependency - PinNuGetDependency(packagePath, "ReactiveUI"); + PinNuGetDependency(package, "ReactiveUI"); } } }); From 158228acc3b7d931ad9e2d4d42865df360f97c86 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 17:02:24 -0400 Subject: [PATCH 10/16] set release --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 52486bd296..cbffc7f3b5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -21,7 +21,7 @@ steps: inputs: command: build projects: src/setversion/setversion.csproj - arguments: -c $(BuildConfiguration) + arguments: -c Release displayName: Set Version condition: eq(variables['system.pullrequest.isfork'], false) From ce864434c0f63fff2309c73b09bd5c6293e43464 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 17:06:18 -0400 Subject: [PATCH 11/16] inherit --- src/version.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/version.json diff --git a/src/version.json b/src/version.json new file mode 100644 index 0000000000..4e8cfe556c --- /dev/null +++ b/src/version.json @@ -0,0 +1,3 @@ +{ + "inherit": true +} From 5d109999281128b71f04fd035bf148e32e9754f4 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 17:42:32 -0400 Subject: [PATCH 12/16] get the version working --- .vsts-ci.yml | 2 +- {src/SetVersion => script}/setversion.csproj | 0 {src/SetVersion => script}/version.json | 0 src/version.json | 3 --- 4 files changed, 1 insertion(+), 4 deletions(-) rename {src/SetVersion => script}/setversion.csproj (100%) rename {src/SetVersion => script}/version.json (100%) delete mode 100644 src/version.json diff --git a/.vsts-ci.yml b/.vsts-ci.yml index cbffc7f3b5..2c7e10abc7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -20,7 +20,7 @@ steps: - task: DotNetCoreCLI@2 inputs: command: build - projects: src/setversion/setversion.csproj + projects: script/setversion.csproj arguments: -c Release displayName: Set Version condition: eq(variables['system.pullrequest.isfork'], false) diff --git a/src/SetVersion/setversion.csproj b/script/setversion.csproj similarity index 100% rename from src/SetVersion/setversion.csproj rename to script/setversion.csproj diff --git a/src/SetVersion/version.json b/script/version.json similarity index 100% rename from src/SetVersion/version.json rename to script/version.json diff --git a/src/version.json b/src/version.json deleted file mode 100644 index 4e8cfe556c..0000000000 --- a/src/version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "inherit": true -} From 6007d3a5c8171316290831823d29a0d7536b0434 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 17:48:20 -0400 Subject: [PATCH 13/16] this time --- script/setversion.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/setversion.csproj b/script/setversion.csproj index 9f5c4f4abb..1f2887636d 100644 --- a/script/setversion.csproj +++ b/script/setversion.csproj @@ -4,4 +4,7 @@ netstandard2.0 + + + From ab8f8b49510f1702720d0ec102fbdceb93d9ed53 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 4 May 2018 21:07:58 -0400 Subject: [PATCH 14/16] publish release config --- .vsts-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2c7e10abc7..feffd3bac5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -91,4 +91,12 @@ steps: pathToPublish: '$(build.artifactstagingdirectory)\Events' artifactType: container artifactName: Events - condition: eq(variables['system.pullrequest.isfork'], false) \ No newline at end of file + condition: eq(variables['system.pullrequest.isfork'], false) + +- task: PublishBuildArtifacts@1 + displayName: Publish Generated Events + inputs: + pathToPublish: '$(build.SourcesDirectory)\GitReleaseManager.yaml' + artifactType: container + artifactName: ReleaseConfig + condition: eq(variables['system.pullrequest.isfork'], false) \ No newline at end of file From 7b356919edcd38d5e3c96ddb10e41ab525b90852 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 11 May 2018 10:53:32 -0700 Subject: [PATCH 15/16] add build badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4db3544f4..b8f4ef120d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![NuGet Stats](https://img.shields.io/nuget/v/reactiveui.svg)](https://www.nuget.org/packages/reactiveui) [![NuGet Stats](https://img.shields.io/nuget/vpre/reactiveui.svg)](https://www.nuget.org/packages/reactiveui) [![Build status](https://ci.appveyor.com/api/projects/status/jqfgxoaock7n23xm?svg=true)](https://ci.appveyor.com/project/dotnetfoundation/reactiveui) +[![NuGet Stats](https://img.shields.io/nuget/v/reactiveui.svg)](https://www.nuget.org/packages/reactiveui) [![NuGet Stats](https://img.shields.io/nuget/vpre/reactiveui.svg)](https://www.nuget.org/packages/reactiveui) [![Build status](https://dotnetfoundation.visualstudio.com/_apis/public/build/definitions/a5852744-a77d-4d76-a9d2-81ac1fdd5744/11/badge)](https://dotnetfoundation.visualstudio.com/ReactiveUI/ReactiveUI%20Team/_build/index?definitionId=11) [![Coverage Status](https://coveralls.io/repos/github/reactiveui/ReactiveUI/badge.svg?branch=develop)](https://coveralls.io/github/reactiveui/ReactiveUI?branch=develop) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://reactiveui.net/contribute) [![Pull Request Stats](http://www.issuestats.com/github/reactiveui/reactiveui/badge/pr?style=flat)](http://www.issuestats.com/github/reactiveui/reactiveui) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Freactiveui%2FReactiveUI.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Freactiveui%2FReactiveUI?ref=badge_shield) From b823277b5c495705faad177d4b81010658f09671 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Fri, 11 May 2018 10:53:47 -0700 Subject: [PATCH 16/16] remove appveyor yaml --- appveyor.yml | 76 ---------------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 3e977adada..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,76 +0,0 @@ -# configuration for "master" branch -- - image: Visual Studio 2017 - branches: - only: - - master - version: 1.0.{build} - environment: - ANDROID_HOME: "C:\\android-sdk-windows" - COVERALLS_TOKEN: jLYKFVgST432LzbZeyLnLpoteXwQLveBw - GITHUB_USERNAME: - secure: 4l81stjUdh712ndqnwBryw== - GITHUB_TOKEN: - secure: TukU0LPvpoN1xkqjNNI8Ij7OxMnCmJxRnj6CsCDcAu+euK3eRTPRFJZl94na2+68 - NUGET_SOURCE: https://www.nuget.org/api/v2/package - NUGET_APIKEY: - secure: cANUegIQhgeZ7Yg4sosXNGmFF33i77nTriEjaeniQ4S26btcwYsopOO3qXKlbrvf - SIGNCLIENT_SECRET: - secure: TGMBTw6fMix/D/hPuoS6J6XQdY5L1hlL6JPpzgKBbDg= - SIGNCLIENT_USER: - secure: wwm115V/GOIkqGLbOom1aGBqkMQy6REFKPaG8P0b4//f0r01dc9pTWruOxLyi4X8 - init: - - cd "C:\projects\reactiveui" - install: - - nuget install SignClient -Version 0.9.0 -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion - build_script: - - ./build.cmd - cache: - - tools -> build.* - - src\packages -> **\packages.config - - '%USERPROFILE%\.nuget\packages -> **\project.json' - artifacts: - - path: artifacts/*.nupkg - - path: '**/bin/*' - - path: '**/*.binlog' - - path: src/ReactiveUI.**/Events_*.cs - test: off - on_failure: - - ps: Get-ChildItem *.binlog -recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - -# configuration for "develop" branch -- - image: Visual Studio 2017 - branches: - except: - - master - skip_branch_with_pr: true - version: 1.0.{build} - environment: - ANDROID_HOME: "C:\\android-sdk-windows" - COVERALLS_TOKEN: jLYKFVgST432LzbZeyLnLpoteXwQLveBw - NUGET_SOURCE: https://www.myget.org/F/reactiveui/api/v2/package - NUGET_APIKEY: - secure: KTszzEEs33kbeqkpGGMvM58elvNLeTJhytpv7s9fPHoY4ZZmk5fMwofKDtK2lhno - SIGNCLIENT_SECRET: - secure: TGMBTw6fMix/D/hPuoS6J6XQdY5L1hlL6JPpzgKBbDg= - SIGNCLIENT_USER: - secure: wwm115V/GOIkqGLbOom1aGBqkMQy6REFKPaG8P0b4//f0r01dc9pTWruOxLyi4X8 - init: - - cd "C:\projects\reactiveui" - install: - - nuget install SignClient -Version 0.9.0 -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion - build_script: - - ./build.cmd - cache: - - tools -> build.* - - src\packages -> **\packages.config - - '%USERPROFILE%\.nuget\packages -> **\project.json' - artifacts: - - path: artifacts/*.nupkg - - path: '**/bin/*' - - path: '**/*.binlog' - - path: src/ReactiveUI.**/Events_*.cs - test: off - on_failure: - - ps: Get-ChildItem *.binlog -recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } \ No newline at end of file