Skip to content

Commit f3f17ba

Browse files
Arlodotexemichael-hawker
authored andcommitted
Removed png asset workaround for library projects
1 parent a869496 commit f3f17ba

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

CommunityToolkit.App.Shared/Helpers/IconHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace CommunityToolkit.App.Shared.Helpers;
88

99
public static class IconHelper
1010
{
11-
internal const string SourceAssetsPrefix = "ms-appx:///SourceAssets/";
11+
internal const string SourceAssetsPrefix = "ms-appx:///";
1212
internal const string FallBackControlIconPath = "ms-appx:///Assets/DefaultControlIcon.png";
1313

1414
public static IconElement? GetCategoryIcon(ToolkitSampleCategory category)

CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
156156

157157
// Get the filepath we need to be able to load the markdown file in sample app.
158158
var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\tooling\", "/tooling/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
159-
var iconpath = (filepath.Split(new string[] { @"\samples\", "/samples/" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() + "\\samples\\" + icon).Replace('\\', '/');
159+
160+
var iconpath = icon.Replace('\\', '/');
160161

161162
// Look for sample id tags
162163
var matches = MarkdownRegexSampleTag.Matches(content);

ProjectHeads/App.Head.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@
9292
<Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
9393
</Content>
9494

95-
<Content Include="$(RepositoryDirectory)components\**\samples\**\*.png" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.png;$(RepositoryDirectory)**\**\samples\bin\**\*.png;$(RepositoryDirectory)**\SourceAssets\**\*.png">
96-
<Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension)</Link>
97-
</Content>
98-
9995
<!-- Include markdown files from all samples so the head can access them in the source generator -->
10096
<AdditionalFiles Include="$(RepositoryDirectory)components\**\samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\**\bin\**\*.md"/>
10197
</ItemGroup>
@@ -104,7 +100,6 @@
104100
<ItemGroup Condition="'$(IsSingleExperimentHead)' == 'true' or '$(IsProjectTemplateHead)' == 'true'">
105101
<!-- These are also included in the Samples props file, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
106102
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.md;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.md" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
107-
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.png" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.png;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.png;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.png" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
108103
<Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
109104

110105
<!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->

0 commit comments

Comments
 (0)