Skip to content

Remove support of pkgproj in TargetFramework.Sdk #7712

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

Merged
ViktorHofer merged 1 commit into from
Aug 5, 2021
Merged

Remove support of pkgproj in TargetFramework.Sdk #7712

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
37 changes: 1 addition & 36 deletions ...ks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

<UsingTask TaskName="ChooseBestP2PTargetFrameworkTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
<UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
<UsingTask TaskName="AddTargetFrameworksToProjectTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
Expand Down Expand Up @@ -92,40 +93,4 @@
</ItemGroup>
</Target>

<Target Name="ExpandAllPackageTargetFrameworks"
BeforeTargets="ExpandProjectReferences"
Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
<MSBuild Targets="GetPackageTargetFrameworksList"
Projects="@(_NonPkgProjProjectReference)">
<Output TaskParameter="TargetOutputs"
ItemName="_NonPkgProjProjectReferenceTargetFramework" />
</MSBuild>

<ItemGroup>
<!-- assign TargetFramework as a separate step to prevent batching during the transform which can reorder the list.
order or projects matters here since this applies to traversal projects which build projects serially. -->
<_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties Include="@(_NonPkgProjProjectReferenceTargetFramework->'%(OriginalItemSpec)')">
<AdditionalProperties>TargetFramework=%(_NonPkgProjProjectReferenceTargetFramework.Identity);%(_NonPkgProjProjectReferenceTargetFramework.AdditionalProperties)</AdditionalProperties>
</_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties>

</ItemGroup>

<ItemGroup>
<_NonPkgProjProjectReference Remove="@(_NonPkgProjProjectReference)" />
<_NonPkgProjProjectReference Include="@(_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties)" />
</ItemGroup>
</Target>

<Target Name="GetPackageTargetFrameworksList"
Returns="$(PackageTargetFrameworks)">
<ItemGroup>
<PackageTargetFrameworksList Include="$(TargetFrameworks)" />
<PackageTargetFrameworksList Remove="@(PackageTargetFrameworksList)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('_'))" />
</ItemGroup>

<PropertyGroup>
<PackageTargetFrameworks>@(PackageTargetFrameworksList)</PackageTargetFrameworks>
</PropertyGroup>
</Target>

</Project>