Skip to content

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

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
ryalanms 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 1 commit
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
Prev Previous commit
fixup! Import Windows Forms related props and targets into Windows De… 
…sktop
  • Loading branch information
@RussKie
RussKie committed Jul 23, 2021
commit 67fdbea2feb65c222b85a8d3469aad92532a7674
4 changes: 2 additions & 2 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
Expand Up @@ -27,7 +27,7 @@
<PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
</ItemGroup>

<!-- Windows Forms specific -->
<Import Project="$(RepositoryEngineeringDir)WindowsFormsImports.targets" />
<!-- Windows Forms validation and packaging -->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets" />

</Project>
4 changes: 2 additions & 2 deletions eng/WindowsFormsImports.targets → ...WindowsDesktop.WinForms.Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Target Name="_ValidateWindowsFormsPackagingContent">
<PropertyGroup>
<_WindowsFormsContentPath>$(_WindowsFormsNuGetPath)\sdk\dotnet-wpf\*</_WindowsFormsContentPath>
<_WindowsFormsRequiredFileName>Microsoft.NET.SDk.WindowsDesktop.WindowsForms</_WindowsFormsRequiredFileName>
<_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?"
Expand All @@ -23,7 +23,7 @@
<ItemGroup>
<!-- Enumerate all transported files -->
<_WindowsFormsContent Include="$(_WindowsFormsContentPath)" />
<!-- ...and verify Microsoft.NET.SDk.WindowsDesktop.WindowsForms.props/.targets are present -->
<!-- ...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' "/>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -166,6 +166,6 @@
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" />
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props" />

</Project>
2 changes: 1 addition & 1 deletion 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 @@ -160,6 +160,6 @@
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'"/>
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>

</Project>