Merge pull request #3390 from dsplaisted/automatic-link-for-resource-and-page

Support automatic Link metadata for Page and Resource items

Author: dsplaisted

src/Assets/TestProjects/LinkTest/LinkTest/LinkTest.csproj

@@ -10,6 +10,8 @@
     <None Include="..\Linked\**\*.None.txt" LinkBase="Linked\Files" />
     <Content Include="..\Linked\**\*.Content.txt" LinkBase="Linked\Files" />
     <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" LinkBase="Linked\Files" />
+    <Page Include="..\Linked\**\*.page.xaml" LinkBase="Linked\Files" />
+    <Resource Include="..\Linked\**\*.resource.xaml" LinkBase="Linked\Files" />
     <CustomItem Include="..\Linked\**\*.Custom.txt" LinkBase="Linked\Files" />
   </ItemGroup>
 
@@ -19,6 +21,8 @@
     <None Include="..\Linked\**\*.None.txt" />
     <Content Include="..\Linked\**\*.Content.txt" />
     <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" />
+    <Page Include="..\Linked\**\*.page.xaml" />
+    <Resource Include="..\Linked\**\*.resource.xaml" />
     <CustomItem Include="..\Linked\**\*.Custom.txt" />
   </ItemGroup>
 
@@ -28,6 +32,8 @@
     <None Include="..\Linked\Linked.None.txt" LinkBase="Linked\Files"/>
     <Content Include="..\Linked\Linked.Content.txt" LinkBase="Linked\Files"/>
     <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" LinkBase="Linked\Files"/>
+    <Page Include="..\Linked\Linked.page.xaml" LinkBase="Linked\Files"/>
+    <Resource Include="..\Linked\Linked.resource.xaml" LinkBase="Linked\Files"/>
     <CustomItem Include="..\Linked\*Linked.Custom.txt" LinkBase="Linked\Files"/>
   </ItemGroup>
 
@@ -37,6 +43,8 @@
     <None Include="..\Linked\Linked.None.txt" />
     <Content Include="..\Linked\Linked.Content.txt" />
     <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" />
+    <Page Include="..\Linked\Linked.page.xaml" />
+    <Resource Include="..\Linked\Linked.resource.xaml" />
     <CustomItem Include="..\Linked\*Linked.Custom.txt" />
   </ItemGroup>
 
@@ -48,6 +56,8 @@
       <LinesToWrite Include="None%09%(None.FullPath)%09%(None.Link)" />
       <LinesToWrite Include="Content%09%(Content.FullPath)%09%(Content.Link)" />
       <LinesToWrite Include="EmbeddedResource%09%(EmbeddedResource.FullPath)%09%(EmbeddedResource.Link)" />
+      <LinesToWrite Include="Page%09%(Page.FullPath)%09%(Page.Link)" />
+      <LinesToWrite Include="Resource%09%(Resource.FullPath)%09%(Resource.Link)" />
       <LinesToWrite Include="CustomItem%09%(CustomItem.FullPath)%09%(CustomItem.Link)" />
     </ItemGroup>
 

src/Assets/TestProjects/LinkTest/Linked/A/B C/Linked.page.xaml

@@ -237,6 +237,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       <LinkBase Condition="'%(LinkBase)' != ''">$([MSBuild]::EnsureTrailingSlash(%(LinkBase)))</LinkBase>
       <Link Condition="'%(Link)' == '' And '%(DefiningProjectExtension)' != '.projitems' And !$([MSBuild]::ValueOrDefault('%(FullPath)', '').StartsWith($([MSBuild]::EnsureTrailingSlash($(MSBuildProjectDirectory)))))">%(LinkBase)%(RecursiveDir)%(Filename)%(Extension)</Link>
     </EmbeddedResource>
+
+    <Page Update="@(Page)">
+      <LinkBase Condition="'%(LinkBase)' != ''">$([MSBuild]::EnsureTrailingSlash(%(LinkBase)))</LinkBase>
+      <Link Condition="'%(Link)' == '' And '%(DefiningProjectExtension)' != '.projitems' And !$([MSBuild]::ValueOrDefault('%(FullPath)', '').StartsWith($([MSBuild]::EnsureTrailingSlash($(MSBuildProjectDirectory)))))">%(LinkBase)%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Page>
+
+    <Resource Update="@(Resource)">
+      <LinkBase Condition="'%(LinkBase)' != ''">$([MSBuild]::EnsureTrailingSlash(%(LinkBase)))</LinkBase>
+      <Link Condition="'%(Link)' == '' And '%(DefiningProjectExtension)' != '.projitems' And !$([MSBuild]::ValueOrDefault('%(FullPath)', '').StartsWith($([MSBuild]::EnsureTrailingSlash($(MSBuildProjectDirectory)))))">%(LinkBase)%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Resource>
   </ItemGroup>
 
   <UsingTask TaskName="CheckForImplicitPackageReferenceOverrides" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />

src/Assets/TestProjects/LinkTest/Linked/A/B C/Linked.resource.xaml

@@ -75,6 +75,8 @@ public void Link_metadata_is_added_to_items_outside_the_project_folder(bool incl
                 ["None"] = new List<string>() { @"..\Linked\Linked.None.txt" },
                 ["Content"] = new List<string>() { @"..\Linked\Linked.Content.txt" },
                 ["EmbeddedResource"] = new List<string>() { @"..\Linked\Linked.Embedded.txt" },
+                ["Page"] = new List<string>() { @"..\Linked\Linked.page.xaml" },
+                ["Resource"] = new List<string>() { @"..\Linked\Linked.resource.xaml" },
                 ["CustomItem"] = new List<string>() { @"..\Linked\Linked.Custom.txt" },
             };
 
@@ -85,6 +87,8 @@ public void Link_metadata_is_added_to_items_outside_the_project_folder(bool incl
                 expectedItems["None"].Add(@"..\Linked\A\B C\Linked.None.txt");
                 expectedItems["Content"].Add(@"..\Linked\A\B C\Linked.Content.txt");
                 expectedItems["EmbeddedResource"].Add(@"..\Linked\A\B C\Linked.Embedded.txt");
+                expectedItems["Page"].Add(@"..\Linked\A\B C\Linked.page.xaml");
+                expectedItems["Resource"].Add(@"..\Linked\A\B C\Linked.resource.xaml");
                 expectedItems["CustomItem"].Add(@"..\Linked\A\B C\Linked.Custom.txt");
             }