[release/9.0.1xx] Fix tsa file not found (#25255)

* [housekeeping] Remove debug.keystore (#25240) * [housekeeping] Fix ps1 script warnings (#25241) * [housekeeping] Fix ps1 script warnings * Fix upload tsa * Try tsaoptions from artifact # Conflicts: # eng/scripts/appium-install.ps1
dotnet · Oct 15, 2024 · 227b1b7 · 227b1b7
1 parent d3784a4
commit 227b1b7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/eng/debug.keystore b/eng/debug.keystore
diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
@@ -165,6 +165,7 @@ steps:
         ${{ parameters.checkoutDirectory }}/artifacts/**/vs-workload.props
         ${{ parameters.checkoutDirectory }}/eng/automation/SignList.xml
         ${{ parameters.checkoutDirectory }}/eng/automation/SignVerifyIgnore.txt
+        ${{ parameters.checkoutDirectory }}/eng/automation/guardian/**
         !${{ parameters.checkoutDirectory}}/artifacts/docs-packs/**
         !${{ parameters.checkoutDirectory}}/artifacts/binaries/**
         !${{ parameters.checkoutDirectory}}/artifacts/**/res.zip

diff --git a/eng/pipelines/common/sign.yml b/eng/pipelines/common/sign.yml
@@ -21,6 +21,7 @@ stages:
           condition: eq(variables.signingCondition, true)
           use1ESTemplate: true
           usePipelineArtifactTasks: true
+          checkoutType : 'self'
 
       - template: nuget-msi-convert/job/v4.yml@yaml-templates
         parameters:
@@ -37,6 +38,14 @@ stages:
               patterns: |
                 **/SignVerifyIgnore.txt
 
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              artifactName: nuget
+              downloadPath: $(Build.SourcesDirectory)\eng\automation\guardian
+              patterns: |
+                **/tsaoptions-v2.json
+                **/source.gdnsuppress
+
           - task: MicroBuildCodesignVerify@3
             displayName: verify signed msi content
             inputs:

diff --git a/eng/scripts/update-version-props.ps1 b/eng/scripts/update-version-props.ps1
@@ -1,4 +1,4 @@
-<#
+<#
 .SYNOPSIS
 
 Updates the Versions.props variables.
@@ -93,4 +93,4 @@ Write-Output("tvOS version: " + $xmlDoc.Project.PropertyGroup.MicrosofttvOSSdkPa
 Write-Output("MacCatalyst version: " + $xmlDoc.Project.PropertyGroup.MicrosoftMacCatalystSdkPackageVersion)
 Write-Output("Mac version: " + $xmlDoc.Project.PropertyGroup.MicrosoftmacOSSdkPackageVersion)
 
-$xmlDoc.Save($xmlFileName)
+$xmlDoc.Save($xmlFileName)
diff --git a/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj b/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
@@ -23,11 +23,6 @@
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>$(DefineConstants);ENABLE_TEST_CLOUD</DefineConstants>
-    <AndroidKeyStore>True</AndroidKeyStore>
-    <AndroidSigningKeyStore>$(MSBuildThisFileDirectory)../../../../../eng/debug.keystore</AndroidSigningKeyStore>
-    <AndroidSigningStorePass>android</AndroidSigningStorePass>
-    <AndroidSigningKeyAlias>androiddebugkey</AndroidSigningKeyAlias>
-    <AndroidSigningKeyPass>android</AndroidSigningKeyPass>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">