Merge pull request unoplatform#16593 from unoplatform/dev/ds/resizeti…

…zer-svgs Include Svg/**/*.svg as Content
jeromelaban · May 7, 2024 · 56f15f5 · 56f15f5
2 parents 1341aec + 01c60f0
commit 56f15f5
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 1 deletion.
diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
@@ -57,6 +57,7 @@
         <!-- Transitive library asset -->
         <_AssetsToValidate Include="$(OutputPath)\uno52lib\Assets\test.xml" />
         <_AssetsToValidate Include="$(OutputPath)\uno52lib\Assets\icon_lib.png" />
+        <_AssetsToValidate Include="$(OutputPath)\uno52lib\Assets\Svg\myimage.svg" />
       </ItemGroup>
 
       <ItemGroup

diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/Assets/Svg/myimage.svg b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52lib/Assets/Svg/myimage.svg
diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.Resizetizer.targets
@@ -36,7 +36,7 @@
 
 	<ItemGroup>
 		<UnoImage Include="$(AssetsFolder)**\*.svg"
-			Exclude="@(UnoImage);@(UnoIcon);@(UnoSplashScreen);$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(AssetsFolder)\**\Svg\*.svg"
+			Exclude="@(UnoImage);@(UnoIcon);@(UnoSplashScreen);$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(AssetsFolder)\**\Svg\**\*.svg"
 			IsDefaultItem="true"
 			Link="$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))" />
 		<Content Remove="@(UnoImage);$(UnoIconBackgroundFile);$(UnoIconForegroundFile);$(UnoSplashScreenFile)" />

diff --git a/src/Uno.Sdk/targets/Uno.DefaultItems.targets b/src/Uno.Sdk/targets/Uno.DefaultItems.targets
@@ -8,6 +8,9 @@
 		<Content Include="$(AssetsFolder)**"
 			Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);**\*.svg;**\*.cs;@(Content)"
 			IsDefaultItem="true" />
+		<Content Include="$(AssetsFolder)\**\Svg\**\*.svg"
+			Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);**\*.cs;@(Content)"
+			IsDefaultItem="true" />
 		<Content Include="**\*.png"
 			Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Content)"
 			IsDefaultItem="true" />