From 5a22d4d1fba0811f73efe26cd59282cba5b6582f Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 15 Sep 2018 14:08:13 -0400 Subject: [PATCH 1/4] Update and rename .azure-pipelines.rx.yml to azure-pipelines.rx.yml --- .vsts.rx-shared.yml => azure-pipelines.rx.yml | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) rename .vsts.rx-shared.yml => azure-pipelines.rx.yml (73%) diff --git a/.vsts.rx-shared.yml b/azure-pipelines.rx.yml similarity index 73% rename from .vsts.rx-shared.yml rename to azure-pipelines.rx.yml index 495a0738e5..27e4d09264 100644 --- a/.vsts.rx-shared.yml +++ b/azure-pipelines.rx.yml @@ -1,5 +1,20 @@ -parameters: - signStep: [] +trigger: + branches: + include: + - master + - rel/* + paths: + include: + - Rx.NET/Source/* + - .editorconfig + - azure-pipelines.rx.yml + +pool: + vmImage: vs2017-win2016 + +variables: + BuildConfiguration: Release + BuildPlatform: Any CPU steps: - task: DotNetCoreCLI@2 @@ -13,10 +28,6 @@ steps: - script: nbgv cloud -a -p Rx.NET\Source displayName: Set Version condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) - -- task: DotNetCoreInstaller@0 - inputs: - version: '2.1.400-preview-009171' - task: MSBuild@1 displayName: Build System.Reactive.sln @@ -57,11 +68,19 @@ steps: arguments: -c $(BuildConfiguration) --no-build --no-restore displayName: Run Api Approvals Tests -- ${{ parameters.signStep }} +- task: PowerShell@2 + displayName: Authenticode Sign Packages + inputs: + filePath: Rx.NET/Source/build/Sign-Package.ps1 + env: + SignClientUser: $(SignClientUser) + SignClientSecret: $(SignClientSecret) + ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts + condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) - task: PublishBuildArtifacts@1 inputs: PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts ArtifactName: artifacts publishLocation: Container - condition: eq(variables['system.pullrequest.isfork'], false) \ No newline at end of file + condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) From 38b55f48d8ee6a9fcbfb0e0b162ecfaf04715ba4 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 15 Sep 2018 14:07:28 -0400 Subject: [PATCH 2/4] Update and rename .azure-pipelines.ix.yml to azure-pipelines.ix.yml --- .vsts.ix-shared.yml => azure-pipelines.ix.yml | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) rename .vsts.ix-shared.yml => azure-pipelines.ix.yml (60%) diff --git a/.vsts.ix-shared.yml b/azure-pipelines.ix.yml similarity index 60% rename from .vsts.ix-shared.yml rename to azure-pipelines.ix.yml index 93c4797305..b4ddb97d9e 100644 --- a/.vsts.ix-shared.yml +++ b/azure-pipelines.ix.yml @@ -1,6 +1,20 @@ -parameters: - signStep: [] - +trigger: + branches: + include: + - master + - rel/* + paths: + include: + - Ix.NET/Source/* + - .editorconfig + - azure-pipelines.ix.yml + +pool: + vmImage: vs2017-win2016 + +variables: + BuildConfiguration: Release + steps: - task: DotNetCoreCLI@2 inputs: @@ -13,10 +27,6 @@ steps: - script: nbgv cloud -p Ix.NET\Source displayName: Set Version condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) - -- task: DotNetCoreInstaller@0 - inputs: - version: '2.1.400-preview-009171' - task: DotNetCoreCLI@2 inputs: @@ -34,11 +44,19 @@ steps: arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Ix.NET/Source/CodeCoverage.runsettings /p:DebugType=Full displayName: Run Tests -- ${{ parameters.signStep }} +- task: PowerShell@2 + displayName: Authenticode Sign Packages + inputs: + filePath: Ix.NET/Source/build/Sign-Package.ps1 + env: + SignClientUser: $(SignClientUser) + SignClientSecret: $(SignClientSecret) + ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts + condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) - task: PublishBuildArtifacts@1 inputs: PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts ArtifactName: artifacts publishLocation: Container - condition: eq(variables['system.pullrequest.isfork'], false) \ No newline at end of file + condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) From c4030c3a0677086a384af7177c9bce8638f846bf Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Mon, 1 Oct 2018 08:17:54 -0400 Subject: [PATCH 3/4] Remove old files --- .vsts.ix-ci.yml | 29 ----------------------------- .vsts.ix-pr.yml | 9 --------- .vsts.rx-ci.yml | 31 ------------------------------- .vsts.rx-pr.yml | 10 ---------- 4 files changed, 79 deletions(-) delete mode 100644 .vsts.ix-ci.yml delete mode 100644 .vsts.ix-pr.yml delete mode 100644 .vsts.rx-ci.yml delete mode 100644 .vsts.rx-pr.yml diff --git a/.vsts.ix-ci.yml b/.vsts.ix-ci.yml deleted file mode 100644 index f49413c8e6..0000000000 --- a/.vsts.ix-ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -trigger: - branches: - include: - - master - - rel/* - paths: - include: - - Ix.NET/Source/* - - .editorconfig - - .vsts.ix-ci.yml - - NuGet.Config - -queue: Hosted VS2017 -variables: - BuildConfiguration: Release - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.ix-shared.yml - parameters: - signStep: - - task: PowerShell@2 - displayName: Authenticode Sign Packages - inputs: - filePath: Ix.NET/Source/build/Sign-Package.ps1 - env: - SignClientUser: $(SignClientUser) - SignClientSecret: $(SignClientSecret) - ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts \ No newline at end of file diff --git a/.vsts.ix-pr.yml b/.vsts.ix-pr.yml deleted file mode 100644 index 2458d78de9..0000000000 --- a/.vsts.ix-pr.yml +++ /dev/null @@ -1,9 +0,0 @@ -trigger: none - -queue: Hosted VS2017 -variables: - BuildConfiguration: Release - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.ix-shared.yml diff --git a/.vsts.rx-ci.yml b/.vsts.rx-ci.yml deleted file mode 100644 index 0ddc7f7cea..0000000000 --- a/.vsts.rx-ci.yml +++ /dev/null @@ -1,31 +0,0 @@ -trigger: - branches: - include: - - master - - rel/* - paths: - include: - - Rx.NET/Source/* - - .editorconfig - - .vsts.rx-ci.yml - - .vsts.rx-shared.yml - -queue: Hosted VS2017 - -variables: - BuildConfiguration: Release - BuildPlatform: Any CPU - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.rx-shared.yml - parameters: - signStep: - - task: PowerShell@2 - displayName: Authenticode Sign Packages - inputs: - filePath: Rx.NET/Source/build/Sign-Package.ps1 - env: - SignClientUser: $(SignClientUser) - SignClientSecret: $(SignClientSecret) - ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts \ No newline at end of file diff --git a/.vsts.rx-pr.yml b/.vsts.rx-pr.yml deleted file mode 100644 index 7fa1773568..0000000000 --- a/.vsts.rx-pr.yml +++ /dev/null @@ -1,10 +0,0 @@ -trigger: none -queue: Hosted VS2017 - -variables: - BuildConfiguration: Release - BuildPlatform: Any CPU - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - -steps: -- template: .vsts.rx-shared.yml \ No newline at end of file From 44ef4223618edaf07152e6f517a837d7dead2d98 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Mon, 1 Oct 2018 08:18:45 -0400 Subject: [PATCH 4/4] bump to 4.1.1 --- Rx.NET/Source/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rx.NET/Source/version.json b/Rx.NET/Source/version.json index cea9f0942e..611f0aa557 100644 --- a/Rx.NET/Source/version.json +++ b/Rx.NET/Source/version.json @@ -1,5 +1,5 @@ { - "version": "4.1.0", + "version": "4.1.1", "publicReleaseRefSpec": [ "^refs/heads/master$", // we release out of master "^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with rel/vN.N