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

Fix couple build issues related to authoring scenarios #1643

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Fix couple build issues related to authoring scenarios #1643

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
18 changes: 7 additions & 11 deletions nuget/Microsoft.Windows.CsWinRT.Authoring.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,20 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</ItemGroup>

<!-- Any managed dependencies of the WinRT component won't automatically be brought
in by a referencing C++ app, so we manually set them to be copied here -->
in by a referencing C++ app, so we manually set them to be copied here.
We depend on ResolveAssemblyReferences to make sure any duplicate references of
different versions are resolved to the latest version.
-->
<Target Name="CsWinRTAuthoring_AddManagedDependencies"
BeforeTargets="GetCopyToOutputDirectoryItems"
DependsOnTargets="ResolveAssemblyReferences"
Returns="@(AllItemsFullPathWithTargetPath)">

<ItemGroup>

<!-- Make sure all managed binaries/projections are shared across project references made by native apps -->
<AllItemsFullPathWithTargetPath Include="@(ReferenceCopyLocalPaths)"
Condition="'%(ReferenceCopyLocalPaths.AssetType)' == 'runtime'">
Condition="'%(ReferenceCopyLocalPaths.AssetType)' == 'runtime' or '%(ReferenceCopyLocalPaths.CopyLocal)' == 'true'">
<TargetPath>%(ReferenceCopyLocalPaths.DestinationSubDirectory)%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AllItemsFullPathWithTargetPath>
Expand Down Expand Up @@ -137,13 +141,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.

<!-- Update the project to only output the assembly's .winmd -->
<Target Name="GetTargetPath" DependsOnTargets="CsWinRTAuthoring_OutputManagedDll" Returns="@(TargetPathWithTargetPlatformMoniker)">
<ItemGroup>
<CsWinRTComponent_ManagedImplementation Include="@(TargetPathWithTargetPlatformMoniker)">
<TargetPath>%(FullPath)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</CsWinRTComponent_ManagedImplementation>
</ItemGroup>

<ItemGroup>
<!-- Clear the .dll -->
<TargetPathWithTargetPlatformMoniker Remove="@(TargetPathWithTargetPlatformMoniker)" />
Expand All @@ -154,13 +151,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<!-- show to c++ compiler (native case) and dotnet sdk (managed case) -->
<ResolveableAssembly>true</ResolveableAssembly>
<!-- Used by the dotnet sdk -->
<ManagedImplementation>%(CsWinRTComponent_ManagedImplementation.TargetPath)</ManagedImplementation>
<ManagedImplementation>$(TargetDir)$(AssemblyName).dll</ManagedImplementation>
<FileType>winmd</FileType>
<WinMDFile>true</WinMDFile>
<BuildReference>true</BuildReference>
<Primary>true</Primary>
</TargetPathWithTargetPlatformMoniker>

</ItemGroup>

</Target>
Expand Down