Skip to content

Commit a0d63c4

Browse files
committed
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)
2 parents eac51f2 + 4fffbf6 commit a0d63c4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
* Major/Minor match Android stable API level, such as 30.0 for API 30.
3535
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3636
-->
37-
<AndroidPackVersion>34.0.0</AndroidPackVersion>
38-
<AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
37+
<AndroidPackVersion>34.99.0</AndroidPackVersion>
38+
<AndroidPackVersionSuffix>preview.1</AndroidPackVersionSuffix>
3939
</PropertyGroup>
4040

4141
<!-- Common <PackageReference/> versions -->

build-tools/automation/yaml-templates/install-microbuild-tooling.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ steps:
99
forceReinstallCredentialProvider: true
1010
condition: ${{ parameters.condition }}
1111

12+
- task: UsePythonVersion@0
13+
inputs:
14+
versionSpec: 3.x
15+
1216
# ESRP signing requires minimum azure client version 2.8.0
1317
- template: azure-tools/az-client-update.yml@yaml-templates
1418
parameters:

0 commit comments

Comments
 (0)