Skip to content

Commit 457ddd5

Browse files
committed
Fixed various path issues with sample and doc rendering
1 parent 739410e commit 457ddd5

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,14 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
162162
var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);
163163
var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
164164
var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
165-
165+
166166
if (metadata.FilePath is null || string.IsNullOrWhiteSpace(metadata.FilePath))
167167
throw new InvalidOperationException("Missing or malformed path to markdown file. Unable to continue;");
168168

169+
// Normalize the path separators
169170
var path = metadata.FilePath;
170171

171-
var fileUri = new Uri($"ms-appx:///SourceAssets/{path}");
172+
var fileUri = new Uri($"ms-appx:///SourceAssets/{(isSingleExperimentHead ? Path.GetFileName(path.Replace('\\', '/')) : path)}");
172173

173174
try
174175
{

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
253253

254254
if (isSingleExperimentHead || isProjectTemplateHead)
255255
{
256-
return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}";
256+
Console.WriteLine($"type.Name: {type.Name}, folderPath: {folderPath}, isAllExperimentHead: {isAllExperimentHead}, isProjectTemplateHead: {isProjectTemplateHead}, isSingleExperimentHead: {isSingleExperimentHead}");
257+
258+
return $"SourceAssets/{folderPath}{type.Name}";
257259
}
258260

259261
if (isAllExperimentHead)

common/ProjectHeads/App.Head.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@
6060
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
6161

6262
<!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
63-
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.cs" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat" />
63+
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.cs">
64+
<Link Condition="$(IsWasm) == 'true'">SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
65+
</Content>
6466

6567
<!-- Include markdown files from all samples so the head can access them in the source generator -->
66-
<AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
68+
<AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
6769
</ItemGroup>
6870

6971
<PropertyGroup>

0 commit comments

Comments
 (0)