Adjust single sample to pull in sample assets using relative paths

Author: Arlodotexe

common/CommunityToolkit.Labs.Shared/Renderers/ToolkitSampleRenderer.xaml.cs

@@ -197,10 +197,19 @@ private async Task LoadData()
 
         /// <summary>
         /// Compute path to a code file bundled in the app using type information.
-        /// Assumes file path in project matches namespace.
+        /// Assumes path to file within the included assembly folder matches the namespace.
         /// </summary>
         private static string GetRelativePathToFileWithoutExtension(Type type)
         {
+            // MSBuild uses wildcard to find the files, and the wildcards decide where they end up
+            // Single experiments use relative paths, the allExperiment head uses absolute paths that grab from all experiments
+            // The discrepency is accounted for manually.
+            // Logic here is the exact same that MSBuild uses to find and include the files we need.
+            var assemblyName = typeof(ToolkitSampleRenderer).Assembly.GetName().Name;
+            var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.Labs.", StringComparison.OrdinalIgnoreCase);
+            var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
+            var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
+
             var simpleAssemblyName = type.Assembly.GetName().Name;
             var typeNamespace = type.Namespace;
 
@@ -213,13 +222,16 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
             var sampleName = simpleAssemblyName.Replace(".Sample", "");
 
             var folderPath = typeNamespace.Replace(simpleAssemblyName, "").Trim('.').Replace('.', '/');
-
             if (folderPath.Length != 0)
-            {
                 folderPath += "/";
-            }
 
-            return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";
+            if (isSingleExperimentHead || isProjectTemplateHead)
+                return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}";
+            
+            if (isAllExperimentHead)
+                return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";
+
+            throw new InvalidOperationException("Unable to determine if running in a single or all experiment solution.");
         }
     }
 }

common/Labs.Head.props

@@ -22,7 +22,13 @@
     <Analyzer Include="$(RepositoryDirectory)common\CommunityToolkit.Labs.Core.SourceGenerators\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Labs.Core.SourceGenerators.dll" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(MSBuildProjectName.Contains('ProjectTemplate')) == 'false'">
+  <PropertyGroup>
+    <IsAllExperimentHead Condition="$(MSBuildProjectName.StartsWith('CommunityToolkit.Labs.')) == 'true'">true</IsAllExperimentHead>
+    <IsProjectTemplateHead Condition="$(MSBuildProjectName.StartsWith('ProjectTemplate')) == 'true'">true</IsProjectTemplateHead>
+    <IsSingleExperimentHead Condition="$(IsAllExperimentHead) == 'false' AND $(IsProjectTemplateHead) == 'false'">true</IsSingleExperimentHead>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$(IsAllExperimentHead) == 'true'">
     <!-- These are also included in Labs.Samples.props, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
     <Content Include="$(RepositoryDirectory)labs\**\samples\*.Sample\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Sample\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Sample\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
     <Content Include="$(RepositoryDirectory)labs\**\samples\*.Sample\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\*.Sample\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\*.Sample\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
@@ -34,7 +40,19 @@
     <AdditionalFiles Include="$(RepositoryDirectory)labs\**\samples\*.Sample\**\*.md"  Exclude="$(RepositoryDirectory)**\**\samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\**\bin\**\*.md"/>
   </ItemGroup>
 
-  <ItemGroup Condition="$(MSBuildProjectName.Contains('ProjectTemplate')) == 'true'">
+  <ItemGroup Condition="$(IsSingleExperimentHead) == 'true'">
+    <!-- These are also included in Labs.Samples.props, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
+    <Content Include="..\*.Sample\**\*.md" Exclude="..\*.Sample\obj\**\*.md;..\*.Sample\bin\**\*.md;..\**\SourceAssets\**\*.md"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+    <Content Include="..\*.Sample\**\*.xaml" Exclude="..\*.Sample\obj\**\*.xaml;..\*.Sample\bin\**\*.xaml;..\**\SourceAssets\**\*.xaml"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+
+    <!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
+    <Content Include="..\*.Sample\**\*.cs" Exclude="..\*.Sample\obj\**\*.cs;..\*.Sample\bin\**\*.cs" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat" />
+    
+    <!-- Include markdown files from all samples so the head can access them in the source generator -->
+    <AdditionalFiles Include="..\*.Sample\**\*.md"  Exclude="..\**\obj\**\*.md;..\**\bin\**\*.md"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="$(IsProjectTemplateHead) == 'true'">
     <!-- These are also included in Labs.Samples.props, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
     <Content Include="$(RepositoryDirectory)template\**\samples\*.Sample\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Sample\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Sample\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
     <Content Include="$(RepositoryDirectory)template\**\samples\*.Sample\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\*.Sample\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\*.Sample\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml"  Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>