Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] Add support to net6.0 for multi-targeting in VS #15776

Merged
merged 1 commit into from
Aug 26, 2022
Merged

[ci] Add support to net6.0 for multi-targeting in VS #15776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotnet/Workloads/Microsoft.NET.Sdk.MacCatalyst/WorkloadManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />
<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="maccatalyst" DisplayName="Mac Catalyst" />
Expand Down
4 changes: 2 additions & 2 deletions dotnet/Workloads/Microsoft.NET.Sdk.iOS/WorkloadManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'iOS'" />
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Windows.Sdk.Aliased" Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::IsOSPlatform('windows'))" />
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'iOS'" />
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Windows.Sdk.Aliased.net6" Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::IsOSPlatform('windows'))" />

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="ios" DisplayName="iOS" />
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Workloads/Microsoft.NET.Sdk.macOS/WorkloadManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="macos" DisplayName="macOS" />
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Workloads/Microsoft.NET.Sdk.tvOS/WorkloadManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.tvOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'tvOS'" />
<Import Project="Sdk.props" Sdk="Microsoft.tvOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'tvOS'" />

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="tvos" DisplayName="tvOS" />
Expand Down
5 changes: 5 additions & 0 deletions dotnet/Workloads/vs-workload.template.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
9 changes: 6 additions & 3 deletions dotnet/targets/WorkloadManifest.MacCatalyst.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building macOS applications with @PLATFORM@.",
"packs": [
"Microsoft.@[email protected]",
"Microsoft.@[email protected].net6",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
Expand All @@ -16,9 +16,12 @@
}
},
"packs": {
"Microsoft.@[email protected]": {
"Microsoft.@[email protected].net6": {
"kind": "sdk",
"version": "@VERSION@"
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@[email protected]"
}
},
"Microsoft.@[email protected]": {
"kind": "framework",
Expand Down
11 changes: 7 additions & 4 deletions dotnet/targets/WorkloadManifest.iOS.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected].net6",
"Microsoft.@[email protected].net6",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
Expand All @@ -20,9 +20,12 @@
}
},
"packs": {
"Microsoft.@[email protected]": {
"Microsoft.@[email protected].net6": {
"kind": "sdk",
"version": "@VERSION@"
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@[email protected]"
}
},
"Microsoft.@[email protected]": {
"kind": "sdk",
Expand Down
9 changes: 6 additions & 3 deletions dotnet/targets/WorkloadManifest.macOS.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@[email protected]",
"Microsoft.@[email protected].net6",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
Expand All @@ -16,9 +16,12 @@
}
},
"packs": {
"Microsoft.@[email protected]": {
"Microsoft.@[email protected].net6": {
"kind": "sdk",
"version": "@VERSION@"
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@[email protected]"
}
},
"Microsoft.@[email protected]": {
"kind": "framework",
Expand Down
9 changes: 6 additions & 3 deletions dotnet/targets/WorkloadManifest.tvOS.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@[email protected]",
"Microsoft.@[email protected].net6",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
Expand All @@ -17,9 +17,12 @@
}
},
"packs": {
"Microsoft.@[email protected]": {
"Microsoft.@[email protected].net6": {
"kind": "sdk",
"version": "@VERSION@"
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@[email protected]"
}
},
"Microsoft.@[email protected]": {
"kind": "framework",
Expand Down
15 changes: 14 additions & 1 deletion tools/devops/automation/templates/release/vs-insertion-prep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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
Expand Down Expand Up @@ -97,6 +97,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
Expand Down