Merge pull request CommunityToolkit#369 from CommunityToolkit/refactor/component-folder-structure

Arlodotexe · web-flow · commit 799882a7fd42 · 2023-02-23T14:58:52.000-06:00
Organize component folders
diff --git a/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs
@@ -162,24 +162,14 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
         var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);
         var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
         var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
-
+        
         if (metadata.FilePath is null || string.IsNullOrWhiteSpace(metadata.FilePath))
             throw new InvalidOperationException("Missing or malformed path to markdown file. Unable to continue;");
 
+        // Normalize the path separators
         var path = metadata.FilePath;
 
-        if (isSingleExperimentHead || isProjectTemplateHead)
-        {
-            var experimentName = assemblyName.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)[0];
-
-            // Our assembly has 'ProjectTemplateExperiment.Samples', but our folder is 'ProjectTemplate.Samples'
-            experimentName = experimentName.Replace("Experiment", "");
-
-            path = path.Split(new[] { $"\\{experimentName}.Samples" }, StringSplitOptions.RemoveEmptyEntries)[1];
-            path = $"{experimentName}.Samples{path}";
-        }
-
-        var fileUri = new Uri($"ms-appx:///SourceAssets/{path}");
+        var fileUri = new Uri($"ms-appx:///SourceAssets/{(isSingleExperimentHead ? Path.GetFileName(path.Replace('\\', '/')) : path)}");
 
         try
         {
diff --git a/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs
@@ -190,13 +190,11 @@ private async Task LoadData()
 
         try
         {
-#if __WASM__
             // Workaround for https://github.com/unoplatform/uno/issues/8649
             if (fileExtension.Contains(".cs"))
             {
                 fileExtension = fileExtension.Replace(".cs", ".cs.dat");
             }
-#endif
 
             var finalPath = $"ms-appx:///{filePath}.{fileExtension.Trim('.')}";
 
@@ -226,7 +224,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
         if (string.IsNullOrWhiteSpace(assemblyName))
             throw new InvalidOperationException();
 
-        var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.Labs.", StringComparison.OrdinalIgnoreCase);
+        var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);
         var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
         var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
 
@@ -247,19 +245,19 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
         if (folderPath.Length != 0)
             folderPath += "/";
 
-        // Component assembly names are formatted as 'ProjectTemplateComponent.Samples'
+        // Component assembly names are formatted as 'ProjectTemplateExperiment.Samples'
         // but the content folder is formatted as 'ProjectTemplate.Samples'
         simpleAssemblyName = simpleAssemblyName.Replace("Experiment", "");
 
         if (isSingleExperimentHead || isProjectTemplateHead)
         {
-            return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}";
+            return $"SourceAssets/{folderPath}{type.Name}";
         }
 
         if (isAllExperimentHead)
         {
             var sampleName = simpleAssemblyName.Replace(".Samples", "");
-            return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";
+            return $"SourceAssets/{sampleName}/samples/{folderPath}{type.Name}";
         }
 
         throw new InvalidOperationException("Unable to determine if running in a single or all experiment solution.");
diff --git a/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs b/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
@@ -473,7 +473,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies()
 
         if (!string.IsNullOrWhiteSpace(markdown))
         {
-            var text = new InMemoryAdditionalText(@"C:\pathtorepo\labs\experiment\samples\experiment.Samples\documentation.md", markdown);
+            var text = new InMemoryAdditionalText(@"C:\pathtorepo\components\experiment\samples\experiment.Samples\documentation.md", markdown);
 
             driver = driver.AddAdditionalTexts(ImmutableArray.Create<AdditionalText>(text));
         }
diff --git a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
@@ -148,7 +148,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
                 }
 
                 // Get the filepath we need to be able to load the markdown file in sample app.
-                var filepath = file.Path.Split(new string[] { @"\labs\", "/labs/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+                var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
 
                 // Look for sample id tags
                 var matches = MarkdownRegexSampleTag.Matches(content);
diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
@@ -64,9 +64,9 @@ if ($IncludeHeads -ne 'uwp')
 [void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.Wasm.csproj")
 
 # Individual projects
-[void]$projects.Add(".\labs\**\src\*.csproj")
-[void]$projects.Add(".\labs\**\samples\*.Samples\*.Samples.csproj")
-[void]$projects.Add(".\labs\**\tests\*.Tests\*.shproj")
+[void]$projects.Add(".\components\**\src\*.csproj")
+[void]$projects.Add(".\components\**\samples\*.Samples.csproj")
+[void]$projects.Add(".\components\**\tests\*.Tests\*.shproj")
 
 if ($UseDiagnostics.IsPresent)
 {
diff --git a/GenerateVSCodeLaunchConfig.ps1 b/GenerateVSCodeLaunchConfig.ps1
@@ -20,12 +20,12 @@ function CreateVsCodeLaunchConfigJson {
       `"/p:UnoSourceGeneratorUseGenerationHost=true`",
       `"/p:UnoSourceGeneratorUseGenerationController=false`",
       `"/p:UnoRemoteControlPort=443`",
-      `"--project=`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`"
+      `"--project=`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`"
     ],
     `"presentation`": {
       `"group`": `"2`"
     },
-    `"cwd`": `"`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm`"
+    `"cwd`": `"`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm`"
   }";
 }
 
diff --git a/MultiTarget/GenerateAllProjectReferences.ps1 b/MultiTarget/GenerateAllProjectReferences.ps1
@@ -11,7 +11,7 @@ Remove-Item -Path $projectPropsOutputDir -Recurse -Force -ErrorAction SilentlyCo
 New-Item -ItemType Directory -Force -Path $projectPropsOutputDir -ErrorAction SilentlyContinue | Out-Null;
 
 # Discover projects in provided paths
-foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../labs/") {
+foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../components/*") {
   # Normalize project path
   $projectName = $projectPath.Name;
 
@@ -21,7 +21,7 @@ foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/
   $srcPath = Resolve-Path "$($projectPath.FullName)\src";
   $srcProjectPath = Get-ChildItem -File "$srcPath\*.csproj";
 
-  $samplePath = Resolve-Path "$($projectPath.FullName)\samples\$projectName.Samples";
+  $samplePath = Resolve-Path "$($projectPath.FullName)\samples";
   $sampleProjectPath = Get-ChildItem -File "$samplePath\*.csproj";
 
   if ($srcProjectPath.Length -eq 0) {
diff --git a/ProjectHeads/AllComponents/Tests.Head.AllComponents.props b/ProjectHeads/AllComponents/Tests.Head.AllComponents.props
@@ -3,7 +3,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Visual Studio likes to delete the following line - but it's needed to find the tests -->
-  <Import Project="$(RepositoryDirectory)\labs\**\*.Tests.projitems" Label="Shared" />
+  <Import Project="$(RepositoryDirectory)\components\**\*.Tests.projitems" Label="Shared" />
 
   <!-- Include all base code to be tested -->
   <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
@@ -36,34 +36,36 @@
   <!-- See https://github.com/CommunityToolkit/Labs-Windows/issues/142 -->
   <ItemGroup Condition="'$(IsAllExperimentHead)' == 'true'">
     <!-- These are also included in the Samples props file, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md">
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.md;$(RepositoryDirectory)**\**\samples\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md">
       <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
 
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml">
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml">
       <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
 
     <!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.cs" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.cs;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.cs">
-      <Link Condition="$(IsWasm) == 'true'">SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.cs" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.cs;$(RepositoryDirectory)**\**\samples\bin\**\*.cs">
+      <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
     </Content>
 
     <!-- Include markdown files from all samples so the head can access them in the source generator -->
-    <AdditionalFiles Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Samples\**\bin\**\*.md"/>
+    <AdditionalFiles Include="$(RepositoryDirectory)components\**\samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\**\bin\**\*.md"/>
   </ItemGroup>
 
   <!-- See https://github.com/CommunityToolkit/Labs-Windows/issues/142 -->
   <ItemGroup Condition="'$(IsSingleExperimentHead)' == 'true' or '$(IsProjectTemplateHead)' == 'true'">
     <!-- These are also included in the Samples props file, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.md;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.md" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.md;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.md" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
 
     <!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.cs" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat" />
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.cs">
+      <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
+    </Content>
 
     <!-- Include markdown files from all samples so the head can access them in the source generator -->
-    <AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
+    <AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/ProjectHeads/GenerateSingleSampleHeads.ps1 b/ProjectHeads/GenerateSingleSampleHeads.ps1
@@ -55,7 +55,7 @@ Push-Location $componentPath
 dotnet new ct-tooling-heads -n $componentName
 
 # Rename folder from component name (dotnet tooling default) to 'heads'
-Rename-Item -Path "$componentPath/$componentName" -NewName $headsFolderName -Force
+Rename-Item -Path "$componentName" -NewName $headsFolderName -Force
 
 # Remove template, as just for script
 dotnet new --uninstall "$PSScriptRoot/SingleComponent"
diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -42,7 +42,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
-  <Import Project="..\..\tests\ProjectTemplate.Tests\ProjectTemplate.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj
@@ -39,7 +39,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
-  <Import Project="..\..\tests\ProjectTemplate.Tests\ProjectTemplate.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
diff --git a/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj"/>
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj"/>
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj"/>
   </ItemGroup>
   
   <!-- Must be imported after any shared projects in non-sdk style projects -->
diff --git a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
@@ -28,6 +28,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj" />
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
   </ItemGroup>
 </Project>
diff --git a/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj" />
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/Scripts/PackEachExperiment.ps1 b/Scripts/PackEachExperiment.ps1
@@ -1,4 +1,4 @@
 
-foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../labs/*/src/*.csproj') {
+foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') {
   & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable $experimentProjPath
 }
diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
@@ -28,7 +28,7 @@
 
     <!-- Needed for Source Generators to find Markdown files -->
     <AdditionalFiles Include="**\*.md" Exclude="bin\**\*.md;obj\**\*.md" />
-    <ProjectReference Condition="Exists('$(MSBuildProjectDirectory)\..\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj')" Include="$(MSBuildProjectDirectory)\..\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj" />
+    <ProjectReference Condition="Exists('$(MSBuildProjectDirectory)\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj')" Include="$(MSBuildProjectDirectory)\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj" />
   </ItemGroup>
 
   <PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -190,13 +190,11 @@ private async Task LoadData()`
`190`	`190`
`191`	`191`	`try`
`192`	`192`	`{`
`193`		`-#if __WASM__`
`194`	`193`	`// Workaround for https://github.com/unoplatform/uno/issues/8649`
`195`	`194`	`if (fileExtension.Contains(".cs"))`
`196`	`195`	`{`
`197`	`196`	`fileExtension = fileExtension.Replace(".cs", ".cs.dat");`
`198`	`197`	`}`
`199`		`-#endif`
`200`	`198`
`201`	`199`	`var finalPath = $"ms-appx:///{filePath}.{fileExtension.Trim('.')}";`
`202`	`200`
`@@ -226,7 +224,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type)`
`226`	`224`	`if (string.IsNullOrWhiteSpace(assemblyName))`
`227`	`225`	`throw new InvalidOperationException();`
`228`	`226`
`229`		`- var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.Labs.", StringComparison.OrdinalIgnoreCase);`
	`227`	`+ var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);`
`230`	`228`	`var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");`
`231`	`229`	`var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;`
`232`	`230`
`@@ -247,19 +245,19 @@ private static string GetRelativePathToFileWithoutExtension(Type type)`
`247`	`245`	`if (folderPath.Length != 0)`
`248`	`246`	`folderPath += "/";`
`249`	`247`
`250`		`- // Component assembly names are formatted as 'ProjectTemplateComponent.Samples'`
	`248`	`+ // Component assembly names are formatted as 'ProjectTemplateExperiment.Samples'`
`251`	`249`	`// but the content folder is formatted as 'ProjectTemplate.Samples'`
`252`	`250`	`simpleAssemblyName = simpleAssemblyName.Replace("Experiment", "");`
`253`	`251`
`254`	`252`	`if (isSingleExperimentHead \|\| isProjectTemplateHead)`
`255`	`253`	`{`
`256`		`- return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}";`
	`254`	`+ return $"SourceAssets/{folderPath}{type.Name}";`
`257`	`255`	`}`
`258`	`256`
`259`	`257`	`if (isAllExperimentHead)`
`260`	`258`	`{`
`261`	`259`	`var sampleName = simpleAssemblyName.Replace(".Samples", "");`
`262`		`- return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";`
	`260`	`+ return $"SourceAssets/{sampleName}/samples/{folderPath}{type.Name}";`
`263`	`261`	`}`
`264`	`262`
`265`	`263`	`throw new InvalidOperationException("Unable to determine if running in a single or all experiment solution.");`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies()`
`473`	`473`
`474`	`474`	`if (!string.IsNullOrWhiteSpace(markdown))`
`475`	`475`	`{`
`476`		`- var text = new InMemoryAdditionalText(@"C:\pathtorepo\labs\experiment\samples\experiment.Samples\documentation.md", markdown);`
	`476`	`+ var text = new InMemoryAdditionalText(@"C:\pathtorepo\components\experiment\samples\experiment.Samples\documentation.md", markdown);`
`477`	`477`
`478`	`478`	`driver = driver.AddAdditionalTexts(ImmutableArray.Create<AdditionalText>(text));`
`479`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// Get the filepath we need to be able to load the markdown file in sample app.`
`151`		`- var filepath = file.Path.Split(new string[] { @"\labs\", "/labs/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();`
	`151`	`+ var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();`
`152`	`152`
`153`	`153`	`// Look for sample id tags`
`154`	`154`	`var matches = MarkdownRegexSampleTag.Matches(content);`