[release/7.0] Enable in-build signing and do some clean-up (#7016)

* Enable in-build signing and do some clean-up - Remove some unused variables - Enable in-build signing on release branches * Download build artifacts task version not valid * Update pipeline.yml * Remove DRT running step Co-authored-by: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM>
dotnet · Sep 9, 2022 · 3ae98db · 3ae98db
1 parent 41d4401
commit 3ae98db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 43 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,12 +9,12 @@ variables:
     # clean the local repo on the build agents
   - name: Build.Repository.Clean
     value: true
-  - name: _DotNetArtifactsCategory
-    value: WINDOWSDESKTOP
-  - name: _DotNetValidationArtifactsCategory
-    value: WINDOWSDESKTOP
-  - name: PostBuildSign
-    value: true
+  - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
+    - name: PostBuildSign
+      value: false
+  - ${{ else }}:
+    - name: PostBuildSign
+      value: true
 
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-Wpf-SDLValidation-Params

diff --git a/azure-pipelines1.yml b/azure-pipelines1.yml
@@ -11,10 +11,6 @@ variables:
     value: true
   - name: _PublishUsingPipelines
     value: true
-  - name: _DotNetArtifactsCategory
-    value: WINDOWSDESKTOP
-  - name: _DotNetValidationArtifactsCategory
-    value: WINDOWSDESKTOP
   - name: PostBuildSign
     value: true
 

diff --git a/eng/pipeline.yml b/eng/pipeline.yml
@@ -200,36 +200,4 @@ jobs:
         #
         #   (_HelixPipeline && _PublicBuildPipeline && _ContinuousIntegrationTestsEnabled && _BuildConfig == Release)
         #
-        condition: and(succeeded(), eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))
-
-      - task: PowerShell@2
-        displayName: Replace WPF binaries
-        inputs:
-          targetType: 'inline'
-          script: '.\eng\copy-wpf.ps1 -testhost -destination .dotnet -$(_BuildConfig) -arch $(_Platform)'
-
-      - task: DownloadPipelineArtifact@2
-        displayName: Fetch Test Binaries
-        inputs:
-          buildType: 'specific'
-          project: 'cbb18261-c48f-4abb-8651-8cdcb5474649'
-          pipeline: '81'
-          buildVersionToDownload: 'specific'
-          buildId: '6988'
-          downloadPath: '$(System.ArtifactsDirectory)\testbinzip\'
-          checkDownloadedFiles: true
-
-      - task: ExtractFiles@1
-        displayName: Extract Test Bins
-        inputs:
-          archiveFilePatterns: '$(System.ArtifactsDirectory)\testbinzip\*.zip\*.zip'
-          destinationFolder: '$(System.ArtifactsDirectory)\testbins'
-          cleanDestinationFolder: true
-          overwriteExistingFiles: true
-
-      - task: PowerShell@2
-        displayName: Run Tests
-        inputs:
-          targetType: 'inline'
-          script: '.\CIRunDrts.cmd'
-          workingDirectory: '$(System.ArtifactsDirectory)\testbins'
+        condition: and(succeeded(), eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))