Skip to content

Commit 37c8656

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/perfetto-integration
* main: (23 commits) Localized file check-in by OneLocBuild Task (#9129) [ci] Disable CodeQL on CI/PR pipelines (#9128) Refine 16k page alignment support (#9075) [build] fix `ConfigureLocalWorkload` target (#9124) Bump to NDK r27 (#9020) [ci] Use drop service for SDK insertion artifacts (#9116) Fix up all mapping paths (#9121) [ci] Fix maestro publishing for stable packages (#9118) Bump to dotnet/sdk@2f14fea98b 9.0.100-preview.7.24367.21 (#9108) Missing androidx.window.[extensions|sidecar] warnings (#9085) [ci] Use sign-artifacts template for macOS signing (#9091) [ci] Use DotNetCoreCLI to sign macOS files (#9102) [ci] Disable CodeQL on macOS, Linux, non-main jobs (#9111) [tests] re-enable `JavaAbstractMethodTest` (#9097) [Microsoft.Android.Sdk.ILLink] preserve types with `IJniNameProviderAttribute` (#9099) [Mono.Android] Data sharing and Close() overrides (#9103) [AndroidManifest] Add `Android.App.PropertyAttribute` (#9016) [Mono.Android] Add support for AndroidMessageHandler ClientCertificates (#8961) [Mono.Android] Bind and enumify API-35 (#9043) Bump to dotnet/java-interop@7a058c0e (#9066) ...
2 parents 960bc58 + 298e2c9 commit 37c8656

File tree

110 files changed

+4494
-327614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+4494
-327614
lines changed

‎.gdn/.gdnsuppress‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,69 @@
5757
],
5858
"justification": "Dummy test.keystore file used for testing.",
5959
"createdDate": "2024-02-21 20:58:02Z"
60+
},
61+
"ad733d624486984da63461d2a23f266714f76e1788c271d90d45687579f51099": {
62+
"signature": "ad733d624486984da63461d2a23f266714f76e1788c271d90d45687579f51099",
63+
"alternativeSignatures": [],
64+
"memberOf": [
65+
"default"
66+
],
67+
"justification": "release.keystore file created during test run.",
68+
"createdDate": "2024-06-14 18:52:00Z"
69+
},
70+
"e10f89d02383ffef3bdbf9c048a9e0f3bdab956a8e6e49817780b0c837a5bd6d": {
71+
"signature": "e10f89d02383ffef3bdbf9c048a9e0f3bdab956a8e6e49817780b0c837a5bd6d",
72+
"alternativeSignatures": [],
73+
"memberOf": [
74+
"default"
75+
],
76+
"justification": "False positive in linker-dependencies.xml file.",
77+
"createdDate": "2024-06-14 18:52:00Z"
78+
},
79+
"e73b15633b7cb1e9e735ce0fe78a6ce3c95c11a8888181eb3b0cb50c191da19e": {
80+
"signature": "e73b15633b7cb1e9e735ce0fe78a6ce3c95c11a8888181eb3b0cb50c191da19e",
81+
"alternativeSignatures": [],
82+
"memberOf": [
83+
"default"
84+
],
85+
"justification": "False positive in linker-dependencies.xml file.",
86+
"createdDate": "2024-06-14 18:52:00Z"
87+
},
88+
"e622e6a9a73c1856d399e753105be517d62ec1e62d13a15ab9ecef43e15590a9": {
89+
"signature": "e622e6a9a73c1856d399e753105be517d62ec1e62d13a15ab9ecef43e15590a9",
90+
"alternativeSignatures": [],
91+
"memberOf": [
92+
"default"
93+
],
94+
"justification": "False positive in linker-dependencies.xml file.",
95+
"createdDate": "2024-06-14 18:52:00Z"
96+
},
97+
"df428be5ce5ef90685e15981cf49e2af10de6d87544f437aa1722f84516d6fef": {
98+
"signature": "df428be5ce5ef90685e15981cf49e2af10de6d87544f437aa1722f84516d6fef",
99+
"alternativeSignatures": [],
100+
"memberOf": [
101+
"default"
102+
],
103+
"justification": "False positive in linker-dependencies.xml file.",
104+
"createdDate": "2024-06-14 18:52:00Z"
105+
},
106+
"247325bc1f0ff6899ae09b13e006ac35c7cae4ffee0749f139fd5100f85a162f": {
107+
"signature": "247325bc1f0ff6899ae09b13e006ac35c7cae4ffee0749f139fd5100f85a162f",
108+
"alternativeSignatures": [],
109+
"memberOf": [
110+
"default"
111+
],
112+
"justification": "False positive in linker-dependencies.xml file.",
113+
"createdDate": "2024-06-14 18:52:00Z"
114+
},
115+
"6d53f09942503c3f7eeccf23af43ae976431e8dbf2ad3d32be8af5bd37068d4d": {
116+
"signature": "6d53f09942503c3f7eeccf23af43ae976431e8dbf2ad3d32be8af5bd37068d4d",
117+
"alternativeSignatures": [],
118+
"memberOf": [
119+
"default"
120+
],
121+
"justification": "False positive in linker-dependencies.xml file.",
122+
"createdDate": "2024-06-14 18:52:00Z"
60123
}
61124
}
62125
}

‎Configuration.Override.props.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
kept consistent with each other, lest Bad Things Happen™
77
-->
88
<!-- The default Android API level to bind in src/Mono.Android -->
9-
<AndroidApiLevel>34</AndroidApiLevel>
9+
<AndroidApiLevel>35</AndroidApiLevel>
1010
<!-- The Xamarin.Android $(TargetFrameworkVersion) value that corresponds to $(AndroidApiLevel) -->
11-
<AndroidFrameworkVersion>v14.0</AndroidFrameworkVersion>
11+
<AndroidFrameworkVersion>v15.0</AndroidFrameworkVersion>
1212
<!-- The default Android API "id" that corresponds to $(AndroidApiLevel) -->
13-
<AndroidPlatformId>34</AndroidPlatformId>
13+
<AndroidPlatformId>35</AndroidPlatformId>
1414

1515
<!--
1616
Colon-separated list of ABIs to build the mono JIT for.

‎Configuration.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<!-- The min API level supported by Microsoft.Android.Sdk -->
2626
<AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
2727
<!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
28-
<AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">34</AndroidLatestStableApiLevel>
28+
<AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">35</AndroidLatestStableApiLevel>
2929
<AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
30-
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v14.0</AndroidLatestStableFrameworkVersion>
30+
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v15.0</AndroidLatestStableFrameworkVersion>
3131
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
32-
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">35</AndroidLatestUnstableApiLevel>
33-
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">VanillaIceCream</AndroidLatestUnstablePlatformId>
34-
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v14.0.99</AndroidLatestUnstableFrameworkVersion>
32+
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestUnstableApiLevel>
33+
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">$(AndroidLatestStablePlatformId)</AndroidLatestUnstablePlatformId>
34+
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">$(AndroidLatestStableFrameworkVersion)</AndroidLatestUnstableFrameworkVersion>
3535
<!-- The default API level used for $(TargetPlatformVersion) -->
3636
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
3737
<!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
@@ -125,7 +125,7 @@
125125
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">35.0.0</XABuildToolsFolder>
126126
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
127127
<XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
128-
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
128+
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.17.0</XABundleToolVersion>
129129
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</XAPackagesDir>
130130
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>
131131
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' != 'Windows'">$(HOME)/.nuget/packages</XAPackagesDir>

‎Directory.Build.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
* Major/Minor match Android stable API level, such as 30.0 for API 30.
3636
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3737
-->
38-
<AndroidPackVersion>34.99.0</AndroidPackVersion>
38+
<AndroidPackVersion>35.0.0</AndroidPackVersion>
3939
<AndroidPackVersionSuffix>preview.7</AndroidPackVersionSuffix>
40+
<IsStableBuild>false</IsStableBuild>
41+
<IsStableBuild Condition=" '$(AndroidPackVersionSuffix)' == 'rtm' ">true</IsStableBuild>
4042
</PropertyGroup>
4143

4244
<!-- Common <PackageReference/> versions -->
@@ -50,7 +52,7 @@
5052
<MonoOptionsVersion>6.12.0.148</MonoOptionsVersion>
5153
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
5254
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
53-
<ELFSharpVersion>2.13.1</ELFSharpVersion>
55+
<ELFSharpVersion>2.17.3</ELFSharpVersion>
5456
<HumanizerVersion>2.14.1</HumanizerVersion>
5557
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.9.2.4</MdocPackageVersion>
5658
</PropertyGroup>

‎Documentation/docs-mobile/messages/index.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ Please file an issue with the exact error message using the 'Help->Send Feedback
102102
or 'Help->Report a Problem' in Visual Studio for Mac.
103103
+ [XA0138](xa0138.md): %(AndroidAsset.AssetPack) and %(AndroidAsset.AssetPack) item metadata are only supported when `$(AndroidApplication)` is `true`.
104104
+ [XA0139](xa0139.md): `@(AndroidAsset)` `{0}` has invalid `DeliveryType` metadata of `{1}`. Supported values are `installtime`, `ondemand` or `fastfollow`
105-
+ [XA0140](xa0140.md):
105+
+ [XA0140](xa0140.md):
106+
+ [XA0141](xa0141.md): NuGet package '{0}' version '{1}' contains a shared library '{2}' which is not correctly aligned. See https://developer.android.com/guide/practices/page-sizes for more details
106107

107108
## XA1xxx: Project related
108109

‎Documentation/docs-mobile/messages/xa0141.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: .NET for Android warning XA0141
3+
description: XA0141 warning code
4+
ms.date: 22/07/2024
5+
---
6+
# .NET for Android warning XA0141
7+
8+
## Issue
9+
10+
NuGet package '{0}' version '{1}' contains a shared library '{2}' which is not correctly aligned. See https://developer.android.com/guide/practices/page-sizes for more details
11+
12+
## Solution
13+
14+
The indicated native shared library must be recompiled and relinked with the 16k alignment, as per URL indicated in the message.

‎build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public sealed class CheckApiCompatibility : Task
3232
{ "v12.1", "v12.0" },
3333
{ "v13.0", "v12.1" },
3434
{ "v14.0", "v13.0" },
35-
{ "v14.0.99", "v14.0" },
35+
{ "v15.0", "v14.0" },
3636
};
3737

3838
static readonly string assemblyToValidate = "Mono.Android.dll";
@@ -70,7 +70,6 @@ public sealed class CheckApiCompatibility : Task
7070
public override bool Execute ()
7171
{
7272
Log.LogMessage (MessageImportance.High, $"CheckApiCompatibility for ApiLevel: {ApiLevel}");
73-
Log.LogWarning ($"# jonp: TargetFramework={TargetFramework}");
7473

7574
// Check to see if Api has a previous Api defined.
7675
if (!api_versions.TryGetValue (ApiLevel, out string previousApiLevel)) {

‎build-tools/api-merge/merge-configuration.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<File Path="api-32.xml.in" Level="32" />
2424
<File Path="api-33.xml.in" Level="33" />
2525
<File Path="api-34.xml.in" Level="34" />
26-
<File Path="api-VanillaIceCream.xml.in" Level="35" />
26+
<File Path="api-35.xml.in" Level="35" />
2727
</Inputs>
2828
<Outputs>
29-
<File Path="api-VanillaIceCream.xml" LastLevel="35" />
29+
<File Path="api-35.xml" LastLevel="35" />
3030
</Outputs>
3131
</Configuration>

‎build-tools/automation/azure-pipelines.yaml‎

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ extends:
7474
binskim:
7575
scanOutputDirectoryOnly: true
7676
codeql:
77-
runSourceLanguagesInSourceAnalysis: true
77+
compiled:
78+
enabled: false
79+
justificationForDisabling: CodeQL runs against the nightly build
7880
policheck:
7981
enabled: false
8082
justification: Built in task does not support multi-language scanning
@@ -465,7 +467,7 @@ extends:
465467
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['MicroBuildSignType'], 'Real'))
466468
jobs:
467469
# Check - "Xamarin.Android (Prepare .NET Release Sign Archives)"
468-
- template: sign-artifacts/jobs/v2.yml@yaml-templates
470+
- template: sign-artifacts/jobs/v3.yml@yaml-templates
469471
parameters:
470472
name: sign_net_mac_win
471473
poolName: $(VSEngMicroBuildPool)
@@ -474,9 +476,12 @@ extends:
474476
signedArtifactName: nuget-signed
475477
usePipelineArtifactTasks: true
476478
use1ESTemplate: true
479+
uploadPrefix: sign-mac-win
480+
handleUnmappedFiles: fail
481+
timeoutInMinutes: 240
477482

478483
# Check - "Xamarin.Android (Prepare .NET Release Sign Linux Archive)"
479-
- template: sign-artifacts/jobs/v2.yml@yaml-templates
484+
- template: sign-artifacts/jobs/v3.yml@yaml-templates
480485
parameters:
481486
name: sign_net_linux
482487
displayName: Sign Linux Archive
@@ -486,9 +491,12 @@ extends:
486491
signedArtifactName: nuget-linux-signed
487492
usePipelineArtifactTasks: true
488493
use1ESTemplate: true
494+
uploadPrefix: sign-linux
495+
handleUnmappedFiles: fail
496+
timeoutInMinutes: 120
489497

490498
# Check - "Xamarin.Android (Prepare .NET Release Convert NuGet to MSI)"
491-
- template: nuget-msi-convert/job/v3.yml@yaml-templates
499+
- template: nuget-msi-convert/job/v4.yml@yaml-templates
492500
parameters:
493501
yamlResourceName: yaml-templates
494502
dependsOn: sign_net_mac_win
@@ -497,32 +505,42 @@ extends:
497505
!*Darwin*
498506
propsArtifactName: $(NuGetArtifactName)
499507
signType: $(MicroBuildSignType)
500-
use1ESTemplate: true
508+
preConvertSteps:
509+
- task: DownloadPipelineArtifact@2
510+
inputs:
511+
artifactName: nuget-signed
512+
artifactPatterns: |
513+
*Darwin*
514+
downloadPath: $(Build.StagingDirectory)\drop\nugets
515+
- task: DownloadPipelineArtifact@2
516+
inputs:
517+
artifactName: nuget-linux-signed
518+
downloadPath: $(Build.StagingDirectory)\drop\nugets
501519
postConvertSteps:
502520
- task: DownloadPipelineArtifact@2
503521
inputs:
504522
artifactName: $(NuGetArtifactName)
505523
downloadPath: $(Build.StagingDirectory)\sign-verify
506524
patterns: |
507525
**/SignVerifyIgnore.txt
508-
509526
- task: MicroBuildCodesignVerify@3
510527
displayName: verify signed msi content
511528
inputs:
512529
TargetFolders: |
513530
$(Build.ArtifactStagingDirectory)\bin\manifests
514-
$(Build.ArtifactStagingDirectory)\bin\manifests-multitarget
531+
$(Build.ArtifactStagingDirectory)\bin\manifests-packs
532+
$(Build.ArtifactStagingDirectory)\bin\msi-nupkgs
515533
ExcludeSNVerify: true
516534
ApprovalListPathForCerts: $(Build.StagingDirectory)\sign-verify\SignVerifyIgnore.txt
517535

518-
# Check - "Xamarin.Android (Prepare .NET Release Push Internal)"
536+
# Check - "Xamarin.Android (Prepare .NET Release Publish symbols and Push to Maestro)"
519537
- job: push_signed_nugets
520-
displayName: Push Internal
538+
displayName: Publish symbols and Push to Maestro
521539
dependsOn:
522540
- nuget_convert
523541
- sign_net_linux
524542
condition: and(eq(dependencies.nuget_convert.result, 'Succeeded'), eq(dependencies.sign_net_linux.result, 'Succeeded'))
525-
timeoutInMinutes: 60
543+
timeoutInMinutes: 90
526544
pool:
527545
name: AzurePipelines-EO
528546
image: $(WindowsPoolImage1ESPT)
@@ -532,67 +550,45 @@ extends:
532550
variables:
533551
- ${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
534552
- group: Publish-Build-Assets
553+
templateContext:
554+
outputs:
555+
- output: artifactsDrop
556+
dropServiceURI: https://devdiv.artifacts.visualstudio.com/DefaultCollection
557+
buildNumber: $(ReleaseDropPrefix)/symbols
558+
dropMetadataContainerName: DropMetadata-$(Build.BuildId)-symbols-$(System.JobAttempt)
559+
sourcePath: $(Build.StagingDirectory)\symbols
560+
retentionDays: 120
561+
toLowerCase: false
535562
steps:
536563
- checkout: self
537564
clean: true
538565
submodules: recursive
539566

567+
# Download symbols to be published to the symbols artifact drop declared above
540568
- task: DownloadPipelineArtifact@2
541569
inputs:
542-
artifactName: nuget-signed
543-
downloadPath: $(Build.StagingDirectory)\nuget-signed
544-
545-
- task: DownloadPipelineArtifact@2
546-
inputs:
547-
artifactName: nuget-linux-signed
548-
downloadPath: $(Build.StagingDirectory)\nuget-signed
570+
artifactName: $(WindowsToolchainPdbArtifactName)
571+
downloadPath: $(Build.StagingDirectory)\symbols
549572

550573
- task: DownloadPipelineArtifact@2
551574
inputs:
552-
artifactName: vs-msi-nugets
553-
downloadPath: $(Build.StagingDirectory)\nuget-signed
575+
artifactName: DropMetadata-$(Build.BuildId)-nugets-$(System.JobAttempt)
576+
downloadPath: $(Build.StagingDirectory)\metadata
577+
displayName: Download nugets drop metadata
554578

555-
- task: DownloadPipelineArtifact@2
579+
- powershell: |
580+
$jsonContent = Get-Content -Path "$(Build.StagingDirectory)\metadata\VSTSDrop.json" -Raw | ConvertFrom-Json
581+
$dropPrefix = $jsonContent.VstsDropBuildArtifact.VstsDropUrl -replace 'https://devdiv.artifacts.visualstudio.com/DefaultCollection/_apis/drop/drops/' -replace '/nugets'
582+
Write-Host "##vso[task.setvariable variable=ReleaseDropPrefix]$dropPrefix"
583+
displayName: Set variable ReleaseDropPrefix
584+
585+
# Download nugets drop created by nuget-msi-convert/job/v4.yml and publish to maestro
586+
- task: ms-vscs-artifact.build-tasks.artifactDropDownloadTask-1.artifactDropDownloadTask@1
587+
displayName: Download $(ReleaseDropPrefix)/nugets
556588
inputs:
557-
artifactName: $(WindowsToolchainPdbArtifactName)
558-
downloadPath: $(Build.StagingDirectory)\nuget-signed
559-
560-
- template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
561-
parameters:
562-
githubToken: $(GitHub.Token)
563-
githubContext: $(NupkgCommitStatusName)
564-
blobName: $(NupkgCommitStatusName)
565-
packagePrefix: xamarin-android
566-
artifactsPath: $(Build.StagingDirectory)\nuget-signed
567-
yamlResourceName: yaml-templates
568-
569-
- template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
570-
parameters:
571-
githubToken: $(GitHub.Token)
572-
githubContext: $(VSDropCommitStatusName)
573-
blobName: $(VSDropCommitStatusName)
574-
packagePrefix: xamarin-android
575-
artifactsPath: $(Build.StagingDirectory)\$(VSDropCommitStatusName)
576-
yamlResourceName: yaml-templates
577-
downloadSteps:
578-
- task: DownloadPipelineArtifact@2
579-
inputs:
580-
artifactName: vsdrop-signed
581-
downloadPath: $(Build.StagingDirectory)\$(VSDropCommitStatusName)
582-
583-
- template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
584-
parameters:
585-
githubToken: $(GitHub.Token)
586-
githubContext: $(MultiTargetVSDropCommitStatusName)
587-
blobName: $(MultiTargetVSDropCommitStatusName)
588-
packagePrefix: xamarin-android
589-
artifactsPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
590-
yamlResourceName: yaml-templates
591-
downloadSteps:
592-
- task: DownloadPipelineArtifact@2
593-
inputs:
594-
artifactName: vsdrop-multitarget-signed
595-
downloadPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
589+
dropServiceURI: https://devdiv.artifacts.visualstudio.com/DefaultCollection
590+
buildNumber: $(ReleaseDropPrefix)/nugets
591+
destinationPath: $(Build.StagingDirectory)\nuget-signed
596592

597593
- task: DotNetCoreCLI@2
598594
displayName: build Xamarin.Android.Tools.BootstrapTasks.sln

0 commit comments

Comments
 (0)