Add MSI and VS Drop changes needed for multitargeting

This commit is contained in:
Peter Collins 2022-08-26 11:28:56 -04:00
Родитель 2ad32b8311
Коммит 934f677c47
2 изменённых файлов: 19 добавлений и 1 удалений

Просмотреть файл

@ -29,5 +29,10 @@
<WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.MacCatalyst.Manifest*.nupkg" Version="@MACCATALYST_WORKLOAD_VERSION@" />
<WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.macOS.Manifest*.nupkg" Version="@MACOS_WORKLOAD_VERSION@" />
<WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.tvOS.Manifest*.nupkg" Version="@TVOS_WORKLOAD_VERSION@" />
<MultiTargetPackNames Include="Microsoft.iOS.Sdk" />
<MultiTargetPackNames Include="Microsoft.iOS.Windows.Sdk" />
<MultiTargetPackNames Include="Microsoft.MacCatalyst.Sdk" />
<MultiTargetPackNames Include="Microsoft.macOS.Sdk" />
<MultiTargetPackNames Include="Microsoft.tvOS.Sdk" />
</ItemGroup>
</Project>

Просмотреть файл

@ -25,7 +25,7 @@ stages:
usePipelineArtifactTasks: true
# Check - "xamarin-macios (Prepare Release Convert NuGet to MSI)"
- template: nuget-msi-convert/job/v2.yml@templates
- template: nuget-msi-convert/job/v3.yml@templates
parameters:
yamlResourceName: templates
dependsOn: signing
@ -100,6 +100,19 @@ stages:
artifactName: vsdrop-signed
downloadPath: $(Build.SourcesDirectory)/vs-insertion
- template: templates/common/upload-vs-insertion-artifacts.yml@sdk-insertions
parameters:
githubToken: $(GitHub.Token)
githubContext: $(MultiTargetVSDropCommitStatusName)
blobName: $(MultiTargetVSDropCommitStatusName)
packagePrefix: xamarin-macios
artifactsPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
downloadSteps:
- task: DownloadPipelineArtifact@2
inputs:
artifactName: vsdrop-multitarget-signed
downloadPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
# Check - "xamarin-macios (VS Insertion Wait For Approval)"
# Check - "xamarin-macios (VS Insertion Create VS Drop and Open PR)"
- template: vs-insertion/stage/v1.yml@templates