From d26190046d278525dbc29703fbab2a06147722df Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Sat, 31 Dec 2022 01:35:55 +1000 Subject: [PATCH] pipeline file changes --- .../azure-pipelines-discordplugin-build.yml | 6 +++--- .../azure-pipelines-discordplugin-deploy.yml | 6 +++--- .../azure-pipelines-discordplugin.yml | 19 +++++++------------ .../azure-pipelines-servermanagers-build.yml | 6 +++--- .../azure-pipelines-servermanagers-deploy.yml | 6 +++--- .../azure-pipelines-servermanagers.yml | 10 ++++++---- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.azure/pipelines/azure-pipelines-discordplugin-build.yml b/.azure/pipelines/azure-pipelines-discordplugin-build.yml index dfa476c6..c4ac284d 100644 --- a/.azure/pipelines/azure-pipelines-discordplugin-build.yml +++ b/.azure/pipelines/azure-pipelines-discordplugin-build.yml @@ -39,7 +39,7 @@ stages: Write-Host "BuildPlatform: ${{parameters.BuildPlatform}}" pwsh: true - - template: create-agent-capabilities-variables.yml@self + - template: create-agent-capabilities-variables.yml - task: PowerShell@2 displayName: Write Environment Variables @@ -81,7 +81,7 @@ stages: inputs: restoreSolution: '${{parameters.SolutionFile}}' - - template: update-semantic-versioning-in-assembyinfo-files.yml@self + - template: update-semantic-versioning-in-assembyinfo-files.yml parameters: ApplicationName: ${{parameters.ApplicationName}} PathToSearch: '$(Build.SourcesDirectory)/src' @@ -167,7 +167,7 @@ stages: PathtoPublish: '$(Build.ArtifactStagingDirectory)' ArtifactName: '${{parameters.PublishFolder}}' - - template: clean-agent-folders.yml@self + - template: clean-agent-folders.yml parameters: CleanArtifactsFolder: true CleanBinariesFolder: true diff --git a/.azure/pipelines/azure-pipelines-discordplugin-deploy.yml b/.azure/pipelines/azure-pipelines-discordplugin-deploy.yml index 4c76a8b1..be21216f 100644 --- a/.azure/pipelines/azure-pipelines-discordplugin-deploy.yml +++ b/.azure/pipelines/azure-pipelines-discordplugin-deploy.yml @@ -185,17 +185,17 @@ stages: Write-Host "##vso[task.setvariable variable=NewVersionRevision;]$newValue" displayName: Set New Pipeline Version Variable Values - - template: update-pipeline-variable.yml@self + - template: update-pipeline-variable.yml parameters: VariableName: 'VersionBuild' VariableValue: $(NewVersionBuild) - - template: update-pipeline-variable.yml@self + - template: update-pipeline-variable.yml parameters: VariableName: 'VersionRevision' VariableValue: $(NewVersionRevision) - - template: clean-agent-folders.yml@self + - template: clean-agent-folders.yml parameters: CleanArtifactsFolder: true CleanBinariesFolder: true diff --git a/.azure/pipelines/azure-pipelines-discordplugin.yml b/.azure/pipelines/azure-pipelines-discordplugin.yml index 64b787ab..5d660b8b 100644 --- a/.azure/pipelines/azure-pipelines-discordplugin.yml +++ b/.azure/pipelines/azure-pipelines-discordplugin.yml @@ -1,16 +1,11 @@ name: $(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision) -#trigger: -# branches: -# include: -# - source -# paths: -# include: -# - src +trigger: none +pr: none -#pool: +pool: + name: Default # vmImage: windows-latest -# demands: InnoSetup resources: repositories: @@ -28,7 +23,7 @@ variables: value: 'src/$(ApplicationName)/$(ApplicationName).csproj' stages: -- template: azure-pipelines-discordplugin-build.yml@self +- template: azure-pipelines-discordplugin-build.yml parameters: ApplicationName: $(ApplicationName) SolutionFile: $(SolutionFile) @@ -37,7 +32,7 @@ stages: BuildPlatform: $(BuildPlatform) PublishFolder: $(PublishFolder) -- template: azure-pipelines-discordplugin-deploy.yml@self +- template: azure-pipelines-discordplugin-deploy.yml parameters: DeploymentType: Beta DependsOn: build @@ -47,7 +42,7 @@ stages: GitEmail: $(GitEmail) GitUsername: $(GitUsername) -- template: azure-pipelines-discordplugin-deploy.yml@self +- template: azure-pipelines-discordplugin-deploy.yml parameters: DeploymentType: Production DependsOn: Beta diff --git a/.azure/pipelines/azure-pipelines-servermanagers-build.yml b/.azure/pipelines/azure-pipelines-servermanagers-build.yml index 1fbd682c..8f5419a9 100644 --- a/.azure/pipelines/azure-pipelines-servermanagers-build.yml +++ b/.azure/pipelines/azure-pipelines-servermanagers-build.yml @@ -39,7 +39,7 @@ stages: Write-Host "BuildPlatform: ${{parameters.BuildPlatform}}" pwsh: true - - template: create-agent-capabilities-variables.yml@self + - template: create-agent-capabilities-variables.yml - task: PowerShell@2 displayName: Write Environment Variables @@ -81,7 +81,7 @@ stages: inputs: restoreSolution: '${{parameters.SolutionFile}}' - - template: update-semantic-versioning-in-assembyinfo-files.yml@self + - template: update-semantic-versioning-in-assembyinfo-files.yml parameters: ApplicationName: ${{parameters.ApplicationName}} PathToSearch: '$(Build.SourcesDirectory)/src' @@ -256,7 +256,7 @@ stages: PathtoPublish: '$(Build.ArtifactStagingDirectory)' ArtifactName: '${{parameters.PublishFolder}}' - - template: clean-agent-folders.yml@self + - template: clean-agent-folders.yml parameters: CleanArtifactsFolder: true CleanBinariesFolder: true diff --git a/.azure/pipelines/azure-pipelines-servermanagers-deploy.yml b/.azure/pipelines/azure-pipelines-servermanagers-deploy.yml index bfc1cf6f..4e25f6c1 100644 --- a/.azure/pipelines/azure-pipelines-servermanagers-deploy.yml +++ b/.azure/pipelines/azure-pipelines-servermanagers-deploy.yml @@ -187,17 +187,17 @@ stages: Write-Host "##vso[task.setvariable variable=NewVersionRevision;]$newValue" displayName: Set New Pipeline Version Variable Values - - template: update-pipeline-variable.yml@self + - template: update-pipeline-variable.yml parameters: VariableName: 'VersionBuild' VariableValue: $(NewVersionBuild) - - template: update-pipeline-variable.yml@self + - template: update-pipeline-variable.yml parameters: VariableName: 'VersionRevision' VariableValue: $(NewVersionRevision) - - template: clean-agent-folders.yml@self + - template: clean-agent-folders.yml parameters: CleanArtifactsFolder: true CleanBinariesFolder: true diff --git a/.azure/pipelines/azure-pipelines-servermanagers.yml b/.azure/pipelines/azure-pipelines-servermanagers.yml index 91a49a31..745558d2 100644 --- a/.azure/pipelines/azure-pipelines-servermanagers.yml +++ b/.azure/pipelines/azure-pipelines-servermanagers.yml @@ -7,10 +7,12 @@ trigger: paths: include: - src +pr: none pool: -# vmImage: windows-latest + name: Default demands: InnoSetup +# vmImage: windows-latest resources: repositories: @@ -28,7 +30,7 @@ variables: value: 'src/$(ApplicationName)/$(ApplicationName).csproj' stages: -- template: azure-pipelines-servermanagers-build.yml@self +- template: azure-pipelines-servermanagers-build.yml parameters: ApplicationName: $(ApplicationName) SolutionFile: $(SolutionFile) @@ -37,7 +39,7 @@ stages: BuildPlatform: $(BuildPlatform) PublishFolder: $(PublishFolder) -- template: azure-pipelines-servermanagers-deploy.yml@self +- template: azure-pipelines-servermanagers-deploy.yml parameters: DeploymentType: Beta DependsOn: build @@ -47,7 +49,7 @@ stages: GitEmail: $(GitEmail) GitUsername: $(GitUsername) -- template: azure-pipelines-servermanagers-deploy.yml@self +- template: azure-pipelines-servermanagers-deploy.yml parameters: DeploymentType: Production DependsOn: Beta