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

Jump to bottom

Import Windows Forms related props and targets into Windows Desktop #4779

Merged
merged 2 commits into from
Jul 23, 2021
Merged

Import Windows Forms related props and targets into Windows Desktop #4779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49e8c5
Import Windows Forms related props and targets into Windows Desktop
RussKie Jul 1, 2021
67fdbea
fixup! Import Windows Forms related props and targets into Windows De…
RussKie Jul 23, 2021
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
5 changes: 5 additions & 0 deletions ...ging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -25,4 +26,8 @@
<PackagingContent Include="targets\*" SubFolder="root\targets" />
<PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
</ItemGroup>

<!-- Windows Forms validation and packaging -->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets" />

</Project>
51 changes: 51 additions & 0 deletions ...rosoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Project>

<PropertyGroup>
<_WindowsFormsNuGetPath>$(PkgMicrosoft_Private_Winforms)</_WindowsFormsNuGetPath>
</PropertyGroup>

<!--
============================================================
_ValidateWindowsFormsPackagingContent
Validates the content of Microsoft.Private.Winforms NuGet package
to ensure we correctly import and reference props and targets.
============================================================
-->
<Target Name="_ValidateWindowsFormsPackagingContent">
<PropertyGroup>
<_WindowsFormsContentPath>$(_WindowsFormsNuGetPath)\sdk\dotnet-wpf\*</_WindowsFormsContentPath>
<_WindowsFormsRequiredFileName>Microsoft.NET.Sdk.WindowsDesktop.WindowsForms</_WindowsFormsRequiredFileName>
</PropertyGroup>

<Error Text="Unable to resolve path to Microsoft.Private.Winforms NuGet package. Is %24(PkgMicrosoft_Private_Winforms) defined?"
Condition="'$(_WindowsFormsNuGetPath)' == ''"/>

<ItemGroup>
<!-- Enumerate all transported files -->
<_WindowsFormsContent Include="$(_WindowsFormsContentPath)" />
<!-- ...and verify Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props/.targets are present -->
<_WindowsFormsContentFiles Include="@(_WindowsFormsContent->'%(FileName)%(Extension)')"
Condition=" '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).props'
or '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).targets' "/>
</ItemGroup>

<!-- Fail if the required files are missing -->
<Error Text="Microsoft.Private.Winforms NuGet package does not contain $(_WindowsFormsRequiredFileName).props or $(_WindowsFormsRequiredFileName).targets"
Condition="@(_WindowsFormsContentFiles->Count()) != 2"/>
</Target>


<!--
============================================================
_IdentifyWindowsFormsPackageAssets
Add props/targets shipped by Windows Forms to the collection of files that get packaged
in to Microsoft.NET.Sdk.WindowsDesktop.<configuration>.<version>.nupkg.
============================================================
-->
<Target Name="_IdentifyWindowsFormsPackageAssets" BeforeTargets="IdentifyPackageAssets" DependsOnTargets="_ValidateWindowsFormsPackagingContent">
<ItemGroup>
<PackagingContent Include="$(_WindowsFormsContentPath)" SubFolder="root\targets" />
</ItemGroup>
</Target>

</Project>
7 changes: 7 additions & 0 deletions packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,11 @@
<SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
</ItemGroup>

<!--
Import Windows Forms props.
These come via the Windows Forms transport package, that can be found under
https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
-->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props" />

</Project>
7 changes: 7 additions & 0 deletions packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,11 @@
<!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
<Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
RussKie marked this conversation as resolved.
Show resolved Hide resolved

<!--
Import Windows Forms targets.
These come via the Windows Forms transport package, that can be found under
https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
-->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>

</Project>