Skip to content

Update targets to adapt to ref-pack based references #588

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
merged 4 commits into from
Apr 16, 2019
Merged

Update targets to adapt to ref-pack based references #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
922982f
References will be delivered in .NET Core 3 through ref-packs instead…
vatsan-madhavan Apr 15, 2019
510ead5
Update global.json tools.dotnet and sdk.version to be identical to th…
vatsan-madhavan Apr 15, 2019
303c793
Revert back to original global.json. We need a coherent build version…
vatsan-madhavan Apr 16, 2019
3cb632f
Merge from master
vatsan-madhavan Apr 16, 2019
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
8 changes: 0 additions & 8 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
</PropertyGroup>

<!-- 
Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
usually lags behind the version that WPF gets from CoreFx packages
-->
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
</ItemGroup>

<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
<PropertyGroup>
<DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
Expand Down
8 changes: 6 additions & 2 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
usually lags behind the version that WPF gets from CoreFx packages
-->
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
<AdditionalPackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(ManagedCxx)'=='true'"/>
<PackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(IsTestProject)'!='true'"/>
<AdditionalPackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(ManagedCxx)'=='true'"/>
</ItemGroup>

<PropertyGroup>
Expand Down
173 changes: 113 additions & 60 deletions eng/WpfArcadeSdk/tools/SdkReferences.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,97 +5,150 @@
ExcludeAssets="All"
GeneratePathProperty="True"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And $(TargetFramework.StartsWith('netcoreapp3')) And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/>

<!--
When @(NetCoreReference) is non-empty, exclude all assets (ExcludeAssets = All) and re-add them in
ResolveMicrosoftNetCoreAppReferences target
-->
<PackageReference Update="Microsoft.NETCore.App"
GeneratePathProperty="true"
ExcludeAssets="All"
Condition="'@(NetCoreReference)'!='' And '$(DoNotLimitMicrosoftNetCoreReferences)'!='true' And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(DisableImplicitFrameworkReferences)' != 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />

<PackageReference Update="Microsoft.NETCore.App"
GeneratePathProperty="true"
Condition="('@(NetCoreReference)'=='' Or '$(DoNotLimitMicrosoftNetCoreReferences)' == 'true') And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(DisableImplicitFrameworkReferences)' != 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
</ItemGroup>


<Target Name="GeneratePathPropertyforMicrosoftWindowsDesktopApp"
AfterTargets="ResolveFrameworkReferences">
<ItemGroup>
<PackageReference Update="Microsoft.WindowsDesktop.App"
GeneratePathProperty="true" />
</ItemGroup>
</Target>

<PropertyGroup>
<ResolveAssemblyReferencesDependsOn>
ResolveMicrosoftNetCoreAppReferences;
ResolveMicrosoftWindowsDesktopAppReferences;
ResolveMicrosoftDotNetWpfGitHubReferences;
ResolveWinFormsReferences;
$(ResolveAssemblyReferencesDependsOn)
</ResolveAssemblyReferencesDependsOn>
</PropertyGroup>

<Target
Name="ResolveMicrosoftNetCoreAppReferences"
Returns="@(Reference)"
Condition="'$(PkgMicrosoft_NETCore_App)'!='' And '@(NetCoreReference)'!='' and $(TargetFramework.StartsWith('netcoreapp3')) and '$(DoNotLimitMicrosoftNetCoreReferences)'!='true'">
<!--
In your project, Add a references to assemblies from Microsoft.NETCore.App like this
<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="System.IO" />
</ItemGroup>

It will get translated into something like this:
<ItemGroup>
<Reference Include="C:\Users\username\.nuget\packages\microsoft.netcore.app\3.0.0-preview5-27609-17\ref\netcoreapp3.0\netstandard.dll" />
<Reference Include="C:\Users\username\.nuget\packages\microsoft.netcore.app\3.0.0-preview5-27609-17\ref\netcoreapp3.0\System.IO.dll" />
</ItemGroup>
-->
<ItemGroup>
<Reference Include="$(PkgMicrosoft_NETCore_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll"
Condition="Exists('$(PkgMicrosoft_NETCore_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll')" />
</ItemGroup>
</Target>


<Target
Name="LimitNetCoreAppReferences"
AfterTargets="ResolveAssemblyReferences"
Returns="@(ReferencePath)"
Condition="'@(NetCoreReference)'!='' and '@(ReferencePath)' != ''">


<!--
Condition="'$(PkgMicrosoft_NETCore_App)'=='' And '@(NetCoreReference)'!='' and '@(ReferencePath)' != ''">
<!--
Example
<NetCoreReference Include="Microsoft.CSharp" />
<NetCoreReference Include="Microsoft.CSharp" />
-->

<!-- Save Microsoft.NETCore.App assemblies, and remove those from @(ReferencePath) -->
<!--
Save Microsoft.NETCore.App.Ref assemblies, and remove those from @(ReferencePath)
-->
<ItemGroup>
<_netCoreAppSdkReference Remove="@(_netCoreAppSdkReference)" />
<_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App'"/>

<_netCoreAppSdkReference Include="@(ReferencePath)"
Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App.Ref'" />

<ReferencePath Remove="@(_netCoreAppSdkReference)" />
</ItemGroup>

<!-- Transform _netCoreAppSdkReference's Identity to its FileName. This will help us do a Remove against @(NetCoreReference) directly -->

<ItemGroup>
<_netCoreAppSdkUnwantedRefNormalized Remove="@(_netCoreAppSdkUnwantedRefNormalized)" />
<_netCoreAppSdkUnwantedRefNormalized Include="@(_netCoreAppSdkReference->'%(FileName)')" />
<_netCoreAppSdkUnwantedRefNormalized Remove="@(NetCoreReference)" />
<_netCoreAppReferences Remove="@(_netCoreAppReferences)" />
</ItemGroup>
<FilterItem1ByItem2 Item1="@(_netCoreAppSdkReference->'%(FileName)')"
Item2="@(NetCoreReference)"
Metadata2="Identity"
PreserveItem1Metadata="true">
<Output ItemName="_netCoreAppReferences" TaskParameter="Result" />
</FilterItem1ByItem2>

<!-- Convert the Identity metadata of _netCoreAppSdkUnwantedRefNormalized back to it's Original value -->
<ItemGroup>
<_netCoreAppSdkUnwantedRef Remove="@(_netCoreAppSdkUnwantedRef)" />
<_netCoreAppSdkUnwantedRef Include="@(_netCoreAppSdkUnwantedRefNormalized->'%(OriginalItemSpec)')" />
<ReferencePath Include="@(_netCoreAppReferences->'%(OriginalItemSpec)')" />
</ItemGroup>

<!-- Reconstruct ReferencePath, but this time exclude the unwanted references out -->
</Target>

<Target Name="ResolveMicrosoftWindowsDesktopAppReferences"
Returns="@(Reference)"
Condition="'$(PkgMicrosoft_WindowsDesktop_App)'!='' And '@(WindowsDesktopAppeference)'!='' and $(TargetFramework.StartsWith('netcoreapp3')) and '$(DoNotLimitWindowsDesktopAppReferences)'!='true'">
<!--
In your project, Add a references to assemblies from Microsoft.NETCore.App like this
<ItemGroup>
<WindowsDesktopAppeference Include="PresentationCore" />
<WindowsDesktopAppeference Include="System.Xaml" />
</ItemGroup>
-->
<ItemGroup>
<ReferencePath
Include="@(_netCoreAppSdkReference)"
Exclude="@(_netCoreAppSdkUnwantedRef)"/>
<Reference Include="$(PkgMicrosoft_WindowsDesktop_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll"
Condition="Exists('$(PkgMicrosoft_WindowsDesktop_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll')" />
</ItemGroup>
</Target>

<Target
Name="LimitWindowsDekstopAppReferences"
AfterTargets="ResolveAssemblyReferences"
Returns="@(ReferencePath)"
Condition="'@(WindowsDesktopReference)'!='' and '@(ReferencePath)' != ''">
<!--

<Target Name="LimitWindowsDesktopAppReferences"
AfterTargets="ResolveAssemblyReferences"
Returns="@(ReferencePath)"
Condition="'$(PkgMicrosoft_WindowsDesktop_App)'=='' And '@(WindowsDesktopReference)'!='' and '@(ReferencePath)' != ''">
<!--
Example
<WindowsDesktopReference Include="PresentationCore" />
<WindowsDesktopReference Include="PresentationCore" />
-->

<!-- Save Microsoft.WindowsDesktop.App assemblies, and remove those from @(ReferencePath) -->
<!--
Save Microsoft.WindowsDesktop.App.Ref assemblies, and remove those from @(ReferencePath)
-->
<ItemGroup>
<_windowsDesktopAppSdkReference Remove="@(_windowsDesktopAppSdkReference)" />
<_windowsDesktopAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.WindowsDesktop.App'"/>
<_windowsDesktopAppSdkReference Include="@(ReferencePath)"
Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.WindowsDesktop.App.Ref'" />

<ReferencePath Remove="@(_windowsDesktopAppSdkReference)" />
</ItemGroup>

<!-- Transform _windowsDesktopAppSdkReference's Identity to its FileName. This will help us do a Remove against @(NetCoreReference) directly -->
<ItemGroup>
<_windowsDesktopAppSdkUnwantedRefNormalized Remove="@(_windowsDesktopAppSdkUnwantedRefNormalized)" />
<_windowsDesktopAppSdkUnwantedRefNormalized Include="@(_windowsDesktopAppSdkReference->'%(FileName)')" />
<_windowsDesktopAppSdkUnwantedRefNormalized Remove="@(WindowsDesktopReference)" />
<_windowsDesktopAppReferences Remove="@(_windowsDesktopAppReferences)" />
</ItemGroup>
<FilterItem1ByItem2 Item1="@(_windowsDesktopAppSdkReference->'%(FileName)')"
Item2="@(WindowsDesktopReference)"
Metadata2="Identity"
PreserveItem1Metadata="true">
<Output ItemName="_windowsDesktopAppReferences" TaskParameter="Result" />
</FilterItem1ByItem2>

<!-- Convert the Identity metadata of _windowsDesktopAppSdkUnwantedRefNormalized back to it's Original value -->
<ItemGroup>
<_windowsDesktopAppSdkUnwantedRef Remove="@(_windowsDesktopAppSdkUnwantedRef)" />
<_windowsDesktopAppSdkUnwantedRef Include="@(_windowsDesktopAppSdkUnwantedRefNormalized->'%(OriginalItemSpec)')" />
</ItemGroup>

<!-- Reconstruct ReferencePath, but this time exclude the unwanted references out -->
<ItemGroup>
<ReferencePath
Include="@(_windowsDesktopAppSdkReference)"
Exclude="@(_windowsDesktopAppSdkUnwantedRef)"/>
<ReferencePath Include="@(_windowsDesktopAppReferences->'%(OriginalItemSpec)')" />
</ItemGroup>
</Target>


<PropertyGroup>
<ResolveAssemblyReferencesDependsOn>
ResolveMicrosoftDotNetWpfGitHubReferences;
ResolveWinFormsReferences;
$(ResolveAssemblyReferencesDependsOn)
</ResolveAssemblyReferencesDependsOn>
</PropertyGroup>

<Target
Name="ResolveMicrosoftDotNetWpfGitHubReferences"
Returns="@(ReferencePath)"
Expand All @@ -106,13 +159,13 @@
<MicrosoftDotNetWpfGitHubReference Include="System.Xaml" />
</ItemGroup>

It will get translated into something like this:
It will get translated into something like this:
<ItemGroup>
<Reference Include="C:\Users\username\.nuget\packages\microsoft.dotnet.wpf.github\4.8.0-preview4.19174.2\ref\netcoreapp3.0\System.Xaml.dll" />
</ItemGroup>
-->
-->
<ItemGroup>
<Reference Include="$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll"
<Reference Include="$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll"
Condition="Exists('$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll')"/>
</ItemGroup>
</Target>
Expand All @@ -128,11 +181,11 @@
<ItemGroup>
<Reference Include="C:\Users\username\.nuget\packages\microsoft.private.winforms\4.8.0-preview4.19170.4\lib\netcoreapp3.0\Accessibility.dll" />
</ItemGroup>
-->
-->
<Target Name="ResolveWinFormsReferences"
Condition="'@(MicrosoftPrivateWinFormsReference)'!='' And $(TargetFramework.StartsWith('netcoreapp3'))">
<ItemGroup>
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')"/>
</ItemGroup>
</Target>
Expand Down
23 changes: 14 additions & 9 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
<Link>Common\WPF\MS\Utility\FrugalList.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<Compile Include="$(WpfCommonDir)src\System\SR.cs">
<Link>Common\System\SR.cs</Link>
<Link>Common\System\SR.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<Compile Remove="System\Xaml\XamlProperty.cs" />
<Compile Remove="System\Windows\Markup\ValueSerializerAttribute.cs" />
Expand All @@ -83,32 +83,37 @@
<Compile Remove="System\Xaml\Context\HashSet.cs" />
<Compile Remove="System\Xaml\MS\Impl\ConcurrentDictionary.cs" />
<Compile Remove="System\Xaml\MS\Impl\XamlPropertyInfoKey.cs" />
</ItemGroup>

</ItemGroup>

<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Collections" />
<NetCoreReference Include="System.Collections.Concurrent" />
<NetCoreReference Include="System.Collections.NonGeneric" />
<NetCoreReference Include="System.Collections.Specialized" />
<NetCoreReference Include="System.Collections.Specialized" />
<NetCoreReference Include="System.ComponentModel" />
<NetCoreReference Include="System.ComponentModel.Primitives" />
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
<NetCoreReference Include="System.Diagnostics.Debug" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Globalization" />
<NetCoreReference Include="System.IO" />
<NetCoreReference Include="System.ObjectModel" />
<NetCoreReference Include="System.Reflection.Emit.ILGeneration" />
<NetCoreReference Include="System.Reflection.Emit.Lightweight" />
<NetCoreReference Include="System.Reflection.Primitives" />
<NetCoreReference Include="System.Reflection.Primitives" />
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Reflection" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Xml" />
Expand Down