From 6eea7ca378d9e90ab156c987a0f3cea8abe9fca5 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Tue, 2 Mar 2021 15:26:41 -0800 Subject: [PATCH 01/40] initial attempt of vsix creation yml --- .../ProjectReunion-Create-VSIX.yml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml diff --git a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml new file mode 100644 index 0000000000..6ff6d8d7e6 --- /dev/null +++ b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml @@ -0,0 +1,69 @@ +parameters: + ReunionVersion: '0.1.0-prerelease.20210301.5.CI' + ReunionFoundationVersion: '0.1.0-prerelease.20210301.5.CI' + ReunionDWriteVersion: '0.1.5-prerelease.20210301.5.CI' + ReunionWinUIVersion: '3.0.0-prerelease.20210301.5.CI' + artifactBuildConfiguration: 'Release' + buildConfiguration: 'Release' + signOutput: false + +steps: + +- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: 'NuGet restore ProjectReunion.Extension.sln' + env: + NUGET_RESTORE_MSBUILD_ARGS: /p:WinUIVersion=${{ parameters.winUIVersion }} /p:VSIXVersion=${{ parameters.vsixVersion }} # Should the 4 packages to include go here? + inputs: + command: 'custom' + arguments: 'restore dev\VSIX\ProjectReunion.Extension.sln' + continueOnError: true + +- task: VSBuild@1 + displayName: 'Build ProjectReunion.Extension.sln' + inputs: + solution: dev\VSIX\ProjectReunion.Extension.sln + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' + msBuildArgs: '/restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" + +- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Governance Detection' + inputs: + scanType: 'Register' + failOnAlert: true + +- ${{ if eq( parameters.signOutput, true) }}: + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + displayName: 'CodeSign (vsix)' + inputs: + ConnectedServiceName: ProjectReunionSigning # Pretty sure this is not correct. + FolderPath: '$(Build.BinariesDirectory)' + Pattern: ProjectReunion.Extension.vsix # Might also be wrong? + signConfigType: inlineSignParams + inlineOperation: | + [ + { + "KeyCode" : "CP-233016", + "OperationCode" : "OpcSign", + "Parameters" : { + "FileDigest" : "/fd SHA256" + }, + "ToolName" : "sign", + "ToolVersion" : "1.0" + }, + { + "KeyCode" : "CP-233016", + "OperationCode" : "OpcVerify", + "Parameters" : {}, + "ToolName" : "sign", + "ToolVersion" : "1.0" + } + ] + + +# Should this be done in the internal pipeline? +- task: PublishBuildArtifacts@1 + displayName: 'Publish built binaries' + inputs: + PathtoPublish: '$(Build.BinariesDirectory)' + artifactName: 'VSIX' From 8a00456e75ed93f7d1d3e9652fea0dc6ec717216 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Tue, 2 Mar 2021 17:22:21 -0800 Subject: [PATCH 02/40] remove hardcoded versions of packages --- .../ProjectReunion-Create-VSIX.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml index 6ff6d8d7e6..2dd2745175 100644 --- a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml +++ b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml @@ -1,10 +1,9 @@ parameters: - ReunionVersion: '0.1.0-prerelease.20210301.5.CI' - ReunionFoundationVersion: '0.1.0-prerelease.20210301.5.CI' - ReunionDWriteVersion: '0.1.5-prerelease.20210301.5.CI' - ReunionWinUIVersion: '3.0.0-prerelease.20210301.5.CI' - artifactBuildConfiguration: 'Release' - buildConfiguration: 'Release' + ReunionVersion: '' + ReunionFoundationVersion: '' + ReunionDWriteVersion: '' + ReunionWinUIVersion: '' + releaseBuild: true signOutput: false steps: From 1b5d16a5db64c870fb7df2c654d987d521a0a963 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 3 Mar 2021 10:39:29 -0800 Subject: [PATCH 03/40] update and fix yml file --- .../ProjectReunion-Create-VSIX.yml | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml index 2dd2745175..9341c824c2 100644 --- a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml +++ b/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml @@ -4,26 +4,27 @@ parameters: ReunionDWriteVersion: '' ReunionWinUIVersion: '' releaseBuild: true - signOutput: false + +variables: + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} steps: -- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 - displayName: 'NuGet restore ProjectReunion.Extension.sln' - env: - NUGET_RESTORE_MSBUILD_ARGS: /p:WinUIVersion=${{ parameters.winUIVersion }} /p:VSIXVersion=${{ parameters.vsixVersion }} # Should the 4 packages to include go here? +- task: VSBuild@1 + displayName: 'Restore ProjectReunion.Extension.sln' inputs: - command: 'custom' - arguments: 'restore dev\VSIX\ProjectReunion.Extension.sln' - continueOnError: true + solution: dev\VSIX\ProjectReunion.Extension.sln + platform: 'Any CPU' + configuration: '$(buildConfiguration)' + msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' inputs: solution: dev\VSIX\ProjectReunion.Extension.sln - platform: '$(buildPlatform)' + platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" + msBuildArgs: '/p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' @@ -31,13 +32,13 @@ steps: scanType: 'Register' failOnAlert: true -- ${{ if eq( parameters.signOutput, true) }}: +- ${{ if eq( parameters.releaseBuild, true) }}: - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: 'CodeSign (vsix)' inputs: - ConnectedServiceName: ProjectReunionSigning # Pretty sure this is not correct. - FolderPath: '$(Build.BinariesDirectory)' - Pattern: ProjectReunion.Extension.vsix # Might also be wrong? + ConnectedServiceName: 'Project Reunion ESRP Code Signing Connection' + FolderPath: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)' + Pattern: ProjectReunion.Extension.vsix signConfigType: inlineSignParams inlineOperation: | [ @@ -59,10 +60,8 @@ steps: } ] - -# Should this be done in the internal pipeline? - task: PublishBuildArtifacts@1 - displayName: 'Publish built binaries' + displayName: 'Publish ProjectReunion.Extension.VSIX' inputs: - PathtoPublish: '$(Build.BinariesDirectory)' + PathtoPublish: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\ProjectReunion.Extension.vsix' artifactName: 'VSIX' From 9df9463d351aaf6d78cbe0ef914234a82b575446 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 3 Mar 2021 14:31:43 -0800 Subject: [PATCH 04/40] move yml file into build folder --- .../{AzurePipelinesTemplates => }/ProjectReunion-Create-VSIX.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/{AzurePipelinesTemplates => }/ProjectReunion-Create-VSIX.yml (100%) diff --git a/build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml similarity index 100% rename from build/AzurePipelinesTemplates/ProjectReunion-Create-VSIX.yml rename to build/ProjectReunion-Create-VSIX.yml From caa5fb9e06b9b19c720d904f233faeea2fc68989 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 3 Mar 2021 15:45:13 -0800 Subject: [PATCH 05/40] change steps to jobs --- build/ProjectReunion-Create-VSIX.yml | 112 ++++++++++++++------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 9341c824c2..f127b9939f 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -5,63 +5,69 @@ parameters: ReunionWinUIVersion: '' releaseBuild: true -variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} +jobs: -steps: +- job: CreatingVsix + pool: + vmImage: 'windows-2019' -- task: VSBuild@1 - displayName: 'Restore ProjectReunion.Extension.sln' - inputs: - solution: dev\VSIX\ProjectReunion.Extension.sln - platform: 'Any CPU' - configuration: '$(buildConfiguration)' - msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + variables: + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} -- task: VSBuild@1 - displayName: 'Build ProjectReunion.Extension.sln' - inputs: - solution: dev\VSIX\ProjectReunion.Extension.sln - platform: 'Any CPU' - configuration: '$(buildConfiguration)' - msBuildArgs: '/p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + steps: -- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Governance Detection' - inputs: - scanType: 'Register' - failOnAlert: true + - task: VSBuild@1 + displayName: 'Restore ProjectReunion.Extension.sln' + inputs: + solution: dev\VSIX\ProjectReunion.Extension.sln + platform: 'Any CPU' + configuration: '$(buildConfiguration)' + msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + + - task: VSBuild@1 + displayName: 'Build ProjectReunion.Extension.sln' + inputs: + solution: dev\VSIX\ProjectReunion.Extension.sln + platform: 'Any CPU' + configuration: '$(buildConfiguration)' + msBuildArgs: '/p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' -- ${{ if eq( parameters.releaseBuild, true) }}: - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 - displayName: 'CodeSign (vsix)' + - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: 'Component Governance Detection' inputs: - ConnectedServiceName: 'Project Reunion ESRP Code Signing Connection' - FolderPath: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)' - Pattern: ProjectReunion.Extension.vsix - signConfigType: inlineSignParams - inlineOperation: | - [ - { - "KeyCode" : "CP-233016", - "OperationCode" : "OpcSign", - "Parameters" : { - "FileDigest" : "/fd SHA256" - }, - "ToolName" : "sign", - "ToolVersion" : "1.0" - }, - { - "KeyCode" : "CP-233016", - "OperationCode" : "OpcVerify", - "Parameters" : {}, - "ToolName" : "sign", - "ToolVersion" : "1.0" - } - ] + scanType: 'Register' + failOnAlert: true -- task: PublishBuildArtifacts@1 - displayName: 'Publish ProjectReunion.Extension.VSIX' - inputs: - PathtoPublish: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\ProjectReunion.Extension.vsix' - artifactName: 'VSIX' + - ${{ if eq( parameters.releaseBuild, true) }}: + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + displayName: 'CodeSign (vsix)' + inputs: + ConnectedServiceName: 'Project Reunion ESRP Code Signing Connection' + FolderPath: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)' + Pattern: ProjectReunion.Extension.vsix + signConfigType: inlineSignParams + inlineOperation: | + [ + { + "KeyCode" : "CP-233016", + "OperationCode" : "OpcSign", + "Parameters" : { + "FileDigest" : "/fd SHA256" + }, + "ToolName" : "sign", + "ToolVersion" : "1.0" + }, + { + "KeyCode" : "CP-233016", + "OperationCode" : "OpcVerify", + "Parameters" : {}, + "ToolName" : "sign", + "ToolVersion" : "1.0" + } + ] + + - task: PublishBuildArtifacts@1 + displayName: 'Publish ProjectReunion.Extension.VSIX' + inputs: + PathtoPublish: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\ProjectReunion.Extension.vsix' + artifactName: 'VSIX' From f6fe8c71e1aa035f52b7c77191f3620f70316dfb Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 3 Mar 2021 16:15:46 -0800 Subject: [PATCH 06/40] add variables to pipeline --- build/ProjectReunion-Create-VSIX.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index f127b9939f..6e3483acb3 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -1,9 +1,19 @@ parameters: - ReunionVersion: '' - ReunionFoundationVersion: '' - ReunionDWriteVersion: '' - ReunionWinUIVersion: '' - releaseBuild: true + - name: "ReunionVersion" + type: string + default: '' + - name: "ReunionFoundationVersion" + type: string + default: '' + - name: "ReunionDWriteVersion" + type: string + default: '' + - name: "ReunionWinUIVersion" + type: string + default: '' + -name: "releaseBuild" + type: boolean + default: True jobs: From 0807e4a31452d2c41dfa937e853b161379415af9 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 3 Mar 2021 16:16:26 -0800 Subject: [PATCH 07/40] fix typo on variable --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 6e3483acb3..ec1a02c812 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -11,7 +11,7 @@ parameters: - name: "ReunionWinUIVersion" type: string default: '' - -name: "releaseBuild" + - name: "releaseBuild" type: boolean default: True From 8e56e82416327a178d0d135b4fd0c1feaa617458 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 08:38:31 -0800 Subject: [PATCH 08/40] remove nuget feed --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index ec1a02c812..c9180ddcad 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -22,7 +22,7 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} steps: From 18842e8607f5e275fbc8cb00f6558fd146339ca0 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 08:41:41 -0800 Subject: [PATCH 09/40] make same nuget feed --- build/ProjectReunion-Create-VSIX.yml | 2 +- dev/VSIX/Directory.Build.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index c9180ddcad..c84eb1b6c0 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -22,7 +22,7 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json', '') }} steps: diff --git a/dev/VSIX/Directory.Build.props b/dev/VSIX/Directory.Build.props index f06b81da1f..f0acb44f3c 100644 --- a/dev/VSIX/Directory.Build.props +++ b/dev/VSIX/Directory.Build.props @@ -4,6 +4,7 @@ + https://api.nuget.org/v3/index.json; https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json 2.0.210211.2 From a0eca4d1103cef53a4f8fe229fc2a9768d6ce1bf Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 08:44:48 -0800 Subject: [PATCH 10/40] remove nuget again --- build/ProjectReunion-Create-VSIX.yml | 2 +- dev/VSIX/Directory.Build.props | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index c84eb1b6c0..24941d16db 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -22,7 +22,7 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json', '') }} + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json', '') }} steps: diff --git a/dev/VSIX/Directory.Build.props b/dev/VSIX/Directory.Build.props index f0acb44f3c..f06b81da1f 100644 --- a/dev/VSIX/Directory.Build.props +++ b/dev/VSIX/Directory.Build.props @@ -4,7 +4,6 @@ - https://api.nuget.org/v3/index.json; https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json 2.0.210211.2 From e9b8ecf74750133320675c9d83c815233782cee9 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 09:20:11 -0800 Subject: [PATCH 11/40] remove nuget --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 24941d16db..c9180ddcad 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -22,7 +22,7 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json', '') }} + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} steps: From 5b423efdbfeda593c9f3a972274f8bbe9b592ad0 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 09:57:41 -0800 Subject: [PATCH 12/40] remove nuget security analysis --- build/ProjectReunion-Create-VSIX.yml | 4 +++- dev/VSIX/Directory.Build.props | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index c9180ddcad..da340c128e 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -1,4 +1,6 @@ parameters: + - name: "NugetSecurityAnalysisWarningLevel" + default: none - name: "ReunionVersion" type: string default: '' @@ -22,7 +24,7 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} + VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} steps: diff --git a/dev/VSIX/Directory.Build.props b/dev/VSIX/Directory.Build.props index f06b81da1f..f0acb44f3c 100644 --- a/dev/VSIX/Directory.Build.props +++ b/dev/VSIX/Directory.Build.props @@ -4,6 +4,7 @@ + https://api.nuget.org/v3/index.json; https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json 2.0.210211.2 From a1336d1c99a706c113908bab6b5688545e94f469 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 10:03:00 -0800 Subject: [PATCH 13/40] remove nuget --- build/ProjectReunion-Create-VSIX.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index da340c128e..a145bc5382 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -1,6 +1,6 @@ parameters: - - name: "NugetSecurityAnalysisWarningLevel" - default: none + - name: NugetSecurityAnalysisWarningLevel + value: none - name: "ReunionVersion" type: string default: '' From 27a2035f0cba398e170c71f11a863653d500573b Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 10:03:43 -0800 Subject: [PATCH 14/40] make same nuget feed --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index a145bc5382..3099864213 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -1,6 +1,6 @@ parameters: - name: NugetSecurityAnalysisWarningLevel - value: none + default: none - name: "ReunionVersion" type: string default: '' From 45d2ac24b1694a7a45b9799d4f58c123b01b67b3 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 10:06:02 -0800 Subject: [PATCH 15/40] remove variable --- build/ProjectReunion-Create-VSIX.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 3099864213..ec1a02c812 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -1,6 +1,4 @@ parameters: - - name: NugetSecurityAnalysisWarningLevel - default: none - name: "ReunionVersion" type: string default: '' From bff7fd2ccd6528bd07e039fa32f03db785dd1a3a Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 10:42:56 -0800 Subject: [PATCH 16/40] change type of variable --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index ec1a02c812..f3c474491e 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -32,7 +32,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" $(VSIXBuildArgs)' - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From ef191364bfbd17867422acb318a133a046b23886 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 11:10:04 -0800 Subject: [PATCH 17/40] explicitly call project on restore --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index f3c474491e..d7dca0dcf3 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -32,7 +32,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" $(VSIXBuildArgs)' + msBuildArgs: '/t:restore dev\VSIX\ProjectReunion.Extension.sln /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From e2b92556fd78613fd3d8759bad5ab033fd11e073 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 11:35:03 -0800 Subject: [PATCH 18/40] fix pipeline --- build/ProjectReunion-Create-VSIX.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index d7dca0dcf3..825d17549f 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -31,8 +31,8 @@ jobs: inputs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' - configuration: '$(buildConfiguration)' - msBuildArgs: '/t:restore dev\VSIX\ProjectReunion.Extension.sln /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + configuration: $(buildConfiguration) + msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From 189a485cb624ca07eb4fc407e0ed46e0b69ab82b Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 11:45:39 -0800 Subject: [PATCH 19/40] change condition format --- build/ProjectReunion-Create-VSIX.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 825d17549f..aef19aa239 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -22,8 +22,10 @@ jobs: vmImage: 'windows-2019' variables: - VSIXBuildArgs: ${{ coalesce(parameters.releaseBuild, '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json', '') }} - + ${{if eq(parameters.releaseBuild, True) }}: + VSIXBuildArgs: '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json' + ${{if eq(parameters.releaseBuild, False) }}: + VSIXBuildArgs: '' steps: - task: VSBuild@1 @@ -31,7 +33,7 @@ jobs: inputs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' - configuration: $(buildConfiguration) + configuration: '$(buildConfiguration)' msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: VSBuild@1 From 7e5c6ef912a135e458b9b633b29f8f76899627c4 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 11:57:03 -0800 Subject: [PATCH 20/40] fix pipeline --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index aef19aa239..7a040191eb 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -23,7 +23,7 @@ jobs: variables: ${{if eq(parameters.releaseBuild, True) }}: - VSIXBuildArgs: '/p:RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json' + VSIXBuildArgs: '/p:"RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json"' ${{if eq(parameters.releaseBuild, False) }}: VSIXBuildArgs: '' steps: From 3d3723a84925b4cd1045f75a3096aa8d09da2ee4 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 12:12:22 -0800 Subject: [PATCH 21/40] fix publishing artifact --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 7a040191eb..267316d314 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -81,5 +81,5 @@ jobs: - task: PublishBuildArtifacts@1 displayName: 'Publish ProjectReunion.Extension.VSIX' inputs: - PathtoPublish: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\ProjectReunion.Extension.vsix' + PathtoPublish: 'dev\VSIX\Extension\ProjectReunion.Extension.vsix' artifactName: 'VSIX' From f3a30a99b8b01ae2d6afcbc7890849c9585f7ec4 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 12:40:39 -0800 Subject: [PATCH 22/40] fix path --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 267316d314..7a040191eb 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -81,5 +81,5 @@ jobs: - task: PublishBuildArtifacts@1 displayName: 'Publish ProjectReunion.Extension.VSIX' inputs: - PathtoPublish: 'dev\VSIX\Extension\ProjectReunion.Extension.vsix' + PathtoPublish: 'dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\ProjectReunion.Extension.vsix' artifactName: 'VSIX' From b4026d1a385e6831cb01b0df0108eacd8c48f703 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 13:34:53 -0800 Subject: [PATCH 23/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 7a040191eb..1ca43f8a8a 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -42,7 +42,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath=$(NugetPackageRoot)microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From 5dd44b564cb23ab10091a2ed28bec2ecf6ed48e7 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 14:09:39 -0800 Subject: [PATCH 24/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 1ca43f8a8a..0f09cb321b 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -42,7 +42,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath=$(NugetPackageRoot)microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath=$(NugetPackageRoot)\microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From 0c7e4a7899dee8380b617cc0482aad9d99fcfba8 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 15:24:08 -0800 Subject: [PATCH 25/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 0f09cb321b..332779daf8 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -42,7 +42,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath=$(NugetPackageRoot)\microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath=%USERPROFILE%\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From beadc773807f13861466907f1bbef6e20192f1f3 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 15:37:13 -0800 Subject: [PATCH 26/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 332779daf8..273afb201d 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -42,7 +42,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath=%USERPROFILE%\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath="%USERPROFILE%\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From 4e4e3a02e40c5ae645ec4b3ddf7ff78d797ced70 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 18:09:01 -0800 Subject: [PATCH 27/40] nuget auth --- build/ProjectReunion-Create-VSIX.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 273afb201d..3bb81dcba4 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -27,6 +27,9 @@ jobs: ${{if eq(parameters.releaseBuild, False) }}: VSIXBuildArgs: '' steps: + - task: NuGetAuthenticate@0 + inputs: + nuGetServiceConnections: Internal-ReleaseSigned - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' From ac0eeb76f2fc4e500aa0bfca4d326c4657134862 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 19:41:30 -0800 Subject: [PATCH 28/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 3bb81dcba4..c1a4d652bc 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -45,7 +45,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath="%USERPROFILE%\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath="$(UserProfile)\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From 5a46024605f08e377b251a5b2a3a60ae18c68fbe Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 20:20:48 -0800 Subject: [PATCH 29/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index c1a4d652bc..37a03499e5 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -39,6 +39,9 @@ jobs: configuration: '$(buildConfiguration)' msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + - script: | + dir $(UserProfile)\.nuget\packages + - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' inputs: From 907b1bf3ec1a430e5d019865bc114d57c9c1efc2 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 20:35:08 -0800 Subject: [PATCH 30/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 37a03499e5..fbc39e8540 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -31,6 +31,12 @@ jobs: inputs: nuGetServiceConnections: Internal-ReleaseSigned + - task: NuGetToolInstaller@1 + inputs: + + - script: | + dir $(UserProfile)\.nuget\packages + - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' inputs: @@ -39,8 +45,6 @@ jobs: configuration: '$(buildConfiguration)' msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - - script: | - dir $(UserProfile)\.nuget\packages - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From 45ec1a4c2acd54034f5153f6fffaef6687e563dc Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 20:38:27 -0800 Subject: [PATCH 31/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index fbc39e8540..87b69ab5ad 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -33,10 +33,11 @@ jobs: - task: NuGetToolInstaller@1 inputs: - + checkLatest: false + - script: | dir $(UserProfile)\.nuget\packages - + - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' inputs: From 5aa861c750e7e33ca28cf4d5188a40fab4152772 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 20:46:05 -0800 Subject: [PATCH 32/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 87b69ab5ad..d93500598d 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -31,11 +31,8 @@ jobs: inputs: nuGetServiceConnections: Internal-ReleaseSigned - - task: NuGetToolInstaller@1 - inputs: - checkLatest: false - - script: | + dotnet add package Microsoft.VSSDK.BuildTools --version 16.9.1050 dir $(UserProfile)\.nuget\packages - task: VSBuild@1 From e41b5d2efcc84b1c3616fb27cc22a7aa2a4684f9 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 21:30:23 -0800 Subject: [PATCH 33/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index d93500598d..c22ddd8375 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -26,13 +26,14 @@ jobs: VSIXBuildArgs: '/p:"RestoreSources=https://api.nuget.org/v3/index.json;https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.Internal.ReleaseSigned/nuget/v3/index.json"' ${{if eq(parameters.releaseBuild, False) }}: VSIXBuildArgs: '' + steps: - task: NuGetAuthenticate@0 inputs: nuGetServiceConnections: Internal-ReleaseSigned - script: | - dotnet add package Microsoft.VSSDK.BuildTools --version 16.9.1050 + dotnet add dev\VSIX\ProjectReunion.Extension.sln package Microsoft.VSSDK.BuildTools --version 16.9.1050 dir $(UserProfile)\.nuget\packages - task: VSBuild@1 From 7c1673d5c31e60ac4d571aaabd6b1fe4593a1e62 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Thu, 4 Mar 2021 21:33:51 -0800 Subject: [PATCH 34/40] add vssdktools --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index c22ddd8375..ac171a2e69 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -33,7 +33,7 @@ jobs: nuGetServiceConnections: Internal-ReleaseSigned - script: | - dotnet add dev\VSIX\ProjectReunion.Extension.sln package Microsoft.VSSDK.BuildTools --version 16.9.1050 + dotnet add dev\VSIX\Extension\ProjectReunion.Extension.csproj package Microsoft.VSSDK.BuildTools --version 16.9.1050 dir $(UserProfile)\.nuget\packages - task: VSBuild@1 From 6d80d6e4aebb183f6bbc726e415eec232631c395 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 09:20:34 -0800 Subject: [PATCH 35/40] fix vssdktools --- build/ProjectReunion-Create-VSIX.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index ac171a2e69..259fe14bf2 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -32,9 +32,6 @@ jobs: inputs: nuGetServiceConnections: Internal-ReleaseSigned - - script: | - dotnet add dev\VSIX\Extension\ProjectReunion.Extension.csproj package Microsoft.VSSDK.BuildTools --version 16.9.1050 - dir $(UserProfile)\.nuget\packages - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' @@ -44,6 +41,8 @@ jobs: configuration: '$(buildConfiguration)' msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + - script: | + dir $(UserProfile)\.nuget\packages - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From da501ececb0bd0ab6fb8f7473244cf1aa35cf011 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 09:58:26 -0800 Subject: [PATCH 36/40] fix vssdk --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 259fe14bf2..480aecb240 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -42,7 +42,7 @@ jobs: msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - script: | - dir $(UserProfile)\.nuget\packages + dir $(UserProfile)\.nuget - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' From bda51f40a05782ef0f1507b792ae00f61a43c755 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 10:56:02 -0800 Subject: [PATCH 37/40] fix vssdk --- build/ProjectReunion-Create-VSIX.yml | 8 +++++++- dev/VSIX/packages.config | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 dev/VSIX/packages.config diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 480aecb240..e7c2d919a7 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -32,6 +32,12 @@ jobs: inputs: nuGetServiceConnections: Internal-ReleaseSigned + # NuGetCommand@2 + - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 + displayName: 'NuGet restore' + inputs: + command: 'custom' + arguments: 'restore dev\packages.config -PackagesDirectory $(UserProfile)\.nuget\packages' - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' @@ -42,7 +48,7 @@ jobs: msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - script: | - dir $(UserProfile)\.nuget + dir $(UserProfile)\.nuget\packages - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' diff --git a/dev/VSIX/packages.config b/dev/VSIX/packages.config new file mode 100644 index 0000000000..9ffd0f1cb0 --- /dev/null +++ b/dev/VSIX/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 03745d18667fe30e6137af0a81d652599bfbaf61 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 10:57:23 -0800 Subject: [PATCH 38/40] fix vssdk --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index e7c2d919a7..35a09e97a4 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -37,7 +37,7 @@ jobs: displayName: 'NuGet restore' inputs: command: 'custom' - arguments: 'restore dev\packages.config -PackagesDirectory $(UserProfile)\.nuget\packages' + arguments: 'restore dev\VSIX\packages.config -PackagesDirectory $(UserProfile)\.nuget\packages' - task: VSBuild@1 displayName: 'Restore ProjectReunion.Extension.sln' From 697da65b9363a5b3508d837a671585f7650741b3 Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 11:02:30 -0800 Subject: [PATCH 39/40] fix vssdk --- build/ProjectReunion-Create-VSIX.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 35a09e97a4..96a49791f1 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -56,7 +56,7 @@ jobs: solution: dev\VSIX\ProjectReunion.Extension.sln platform: 'Any CPU' configuration: '$(buildConfiguration)' - msBuildArgs: '/p:VSToolsPath="$(UserProfile)\.nuget\packages\microsoft.vssdk.buildtools\16.8.1017\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' + msBuildArgs: '/p:VSToolsPath="$(UserProfile)\.nuget\packages\microsoft.vssdk.buildtools\16.9.1050\tools" /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Governance Detection' From a5e7a20158b9a6779d3f3194f3b4a726bcaccd6f Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Fri, 5 Mar 2021 11:25:18 -0800 Subject: [PATCH 40/40] fix vssdk --- build/ProjectReunion-Create-VSIX.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/ProjectReunion-Create-VSIX.yml b/build/ProjectReunion-Create-VSIX.yml index 96a49791f1..75087534f4 100644 --- a/build/ProjectReunion-Create-VSIX.yml +++ b/build/ProjectReunion-Create-VSIX.yml @@ -47,9 +47,6 @@ jobs: configuration: '$(buildConfiguration)' msBuildArgs: '/t:restore /p:ReunionVersion="${{ parameters.ReunionVersion }}" /p:ReunionFoundationVersion="${{ parameters.ReunionFoundationVersion }}" /p:ReunionDWriteVersion="${{ parameters.ReunionDWriteVersion }}" /p:ReunionWinUIVersion="${{ parameters.ReunionWinUIVersion }}" ${{ variables.VSIXBuildArgs }}' - - script: | - dir $(UserProfile)\.nuget\packages - - task: VSBuild@1 displayName: 'Build ProjectReunion.Extension.sln' inputs: