Skip to content

Build orchestration fixups #2507

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
5 commits merged into from
Feb 6, 2020
Merged

Build orchestration fixups #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc49a5a
Include Microsoft.DotNet.Wpf.DncEng only when running CppHelper in Re…
vatsan-madhavan Feb 6, 2020
06a0650
Document FilterItem1ByItem2 task
vatsan-madhavan Feb 6, 2020
c46ef72
Use /Z7 (i.e., oldStyle) when building dotnet-wpf-int repo. This is n…
vatsan-madhavan Feb 6, 2020
68fed80
Add missing '\'; improve a condition
vatsan-madhavan Feb 6, 2020
b49ad59
Add `<UndefineProperties>TargetFramework;TargetFrameworks</UndefinePr…
vatsan-madhavan Feb 6, 2020
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
21 changes: 21 additions & 0 deletions eng/WpfArcadeSdk/tools/InlineTasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@
<TaskFactoryAssemblyToUse Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll</TaskFactoryAssemblyToUse>
</PropertyGroup>

<!--
Summary:
Selects @(Item2) items that are present in @(Item1). In effect, calculates
set subtraction:

Result = Item2 - Item1

Parameters:
@(Item1) ITaskItem[] Required
PreserveItem1Metadata Bool Optional Preserves item-metadata from @(Item1) in @(Result)

@(Item2) ITaskItem[] Required
Metadata2 String Required
PreserveItem2Metadata Bool Optional Preserves item-metadata from @(Item2) in @(Result)

TreatItemsAsPaths Bool Optional

Outputs:
@(Result) ITaskItem[]
@(UnmatchedReferences) ITaskItem[]
-->
<UsingTask TaskName="FilterItem1ByItem2"
TaskFactory="$(TaskFactoryToUse)"
AssemblyFile="$(TaskFactoryAssemblyToUse)">
Expand Down
8 changes: 8 additions & 0 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@

<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

<!--
Workaround for https://github.com/dotnet/arcade/issues/4763
Embed PDB's into the .lib files directly using /Z7 when building out of
dotnet-wpf-int repo
-->
<DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and
'$(RepoLocation)' == 'Internal'">oldStyle</DebugInformationFormat>

<!--
Disambiguate the PDB produced by the compiler with a -compile suffix, so that the PDB
produced by the linker is not accidentally clobbered by this one.
Expand Down
16 changes: 11 additions & 5 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,15 @@ using namespace System::Runtime::Versioning;
The main purpose of this target is to restore the package with PathProperty=true. As a side-effect,
we will also generate an Item @(NuGetReferencesForCpp) from IdentifyNuGetReferences target, which
will be used by ResolveMicrosoftDotNetWpfDncEngReferencesForCpp

Note:
Test for "$(RepoLocation) != Internal" rather than "$(RepoLocation) == External"
The former form is more reliable.

-->
<Target Name="CppHelper"
Returns="@(NuGetReferencesForCpp)"
Condition="'$(ManagedCxx)' != 'true' and '$(RepoLocation)' == 'External'">
Condition="'$(ManagedCxx)' != 'true' and '$(RepoLocation)' != 'Internal'">

<PropertyGroup>
<CppHelperProject>$(IntermediateOutputPath)CppSupport\CppSupport_$(MSBuildProjectName).csproj</CppHelperProject>
Expand Down Expand Up @@ -499,8 +504,9 @@ using namespace System::Runtime::Versioning;
<![CDATA[
<ItemGroup>
<PackageReference Include="runtime.$(WpfRuntimeIdentifier).Microsoft.DotNet.Wpf.DncEng"
Version="$(MicrosoftDotNetWpfDncEngVersion)"
GeneratePathProperty="true" />
Condition="'$(MicrosoftDotNetWpfDncEngVersion)' != ''"
Version="$(MicrosoftDotNetWpfDncEngVersion)"
GeneratePathProperty="true" />
</ItemGroup>
]]>
</Text>
Expand All @@ -521,7 +527,7 @@ using namespace System::Runtime::Versioning;

<PropertyGroup>
<WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x86' Or '%24(WpfRuntimeIdentifier)'=='win-x86'">%24(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
<WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
<WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
</PropertyGroup>
<!-- Save Microsoft.NETCore.App assemblies and return them -->
<ItemGroup>
Expand Down Expand Up @@ -564,7 +570,7 @@ using namespace System::Runtime::Versioning;
<MSBuild Projects="@(ProjectToBuild)"
Targets="IdentifyNuGetReferences"
Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
<Output TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
<Output TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
</MSBuild>

<!-- Update with file path -->
Expand Down
4 changes: 4 additions & 0 deletions eng/WpfArcadeSdk/tools/WpfProjectReference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,26 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
</WpfProjectPath>
<WpfProjectPath Include="WpfGfx_cor3" ProjectPath="$(WpfSourceDir)WpfGfx\core\dll\WpfGfx.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
</WpfProjectPath>
<WpfProjectPath Include="PenImc_cor3" ProjectPath="$(WpfSourceDir)PenImc\dll\PenImc.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
</WpfProjectPath>

<WpfProjectPath Include="bilinearspan" ProjectPath="$(WpfSourceDir)WpfGfx\core\sw\bilinearspan\bilinearspan.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
</WpfProjectPath>

</ItemGroup>
Expand Down