Merge branch 'main' into all-assemblies-per-rid

* main: [ci] Use Python 3 for signing tasks (dotnet#8367) $(AndroidPackVersionSuffix)=preview.1; net9 is 34.99.0.preview.1 (dotnet#8362)
grendello · Sep 25, 2023 · a0d63c4 · a0d63c4
2 parents eac51f2 + 4fffbf6
commit a0d63c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -34,8 +34,8 @@
          * Major/Minor match Android stable API level, such as 30.0 for API 30.
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
-    <AndroidPackVersion>34.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
+    <AndroidPackVersion>34.99.0</AndroidPackVersion>
+    <AndroidPackVersionSuffix>preview.1</AndroidPackVersionSuffix>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->

diff --git a/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml b/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml
@@ -9,6 +9,10 @@ steps:
     forceReinstallCredentialProvider: true
   condition: ${{ parameters.condition }}
 
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: 3.x
+
 # ESRP signing requires minimum azure client version 2.8.0
 - template: azure-tools/az-client-update.yml@yaml-templates
   parameters: