fix(net6): Auto include BundleResources, show excluded compile items

unoplatform · Apr 14, 2022 · 42c6eba · 42c6eba
1 parent 8fd4390
commit 42c6eba
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/build/uno.winui.single-project.targets b/build/uno.winui.single-project.targets
@@ -22,6 +22,7 @@
 		<ImageAsset Include="$(iOSProjectFolder)**/*.xcassets/**/*.png;$(iOSProjectFolder)**/*.xcassets/*/*.jpg;$(iOSProjectFolder)**/*.xcassets/**/*.pdf;$(iOSProjectFolder)**/*.xcassets/**/*.json" Exclude="$(_SingleProjectiOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" Visible="false" IsDefaultItem="true" />
 		<SceneKitAsset Include="$(iOSProjectFolder)**/*.scnassets/*" Exclude="$(_SingleProjectiOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
 		<InterfaceDefinition Include="$(iOSProjectFolder)**/*.storyboard;$(iOSProjectFolder)**/*.xib" Exclude="$(_SingleProjectiOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
+		<BundleResource Include="$(iOSProjectFolder)Resources\**" Exclude="$(_SingleProjectiOSExcludes)" IsDefaultItem="true" />
 	</ItemGroup>
 
 	<!-- MacCatalyst -->
@@ -30,6 +31,7 @@
 		<ImageAsset Include="$(MacCatalystProjectFolder)**/*.xcassets/**/*.png;$(MacCatalystProjectFolder)**/*.xcassets/*/*.jpg;$(MacCatalystProjectFolder)**/*.xcassets/**/*.pdf;$(MacCatalystProjectFolder)**/*.xcassets/**/*.json" Exclude="$(_SingleProjectMacCatalystExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" Visible="false" IsDefaultItem="true" />
 		<SceneKitAsset Include="$(MacCatalystProjectFolder)**/*.scnassets/*" Exclude="$(_SingleProjectMacCatalystExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
 		<InterfaceDefinition Include="$(MacCatalystProjectFolder)**/*.storyboard;$(MacCatalystProjectFolder)**/*.xib" Exclude="$(_SingleProjectMacCatalystExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
+		<BundleResource Include="$(MacCatalystProjectFolder)Resources\**" Exclude="$(_SingleProjectMacCatalystExcludes)" IsDefaultItem="true" />
 	</ItemGroup>
 
 	<!-- macOS -->
@@ -38,6 +40,7 @@
 		<ImageAsset Include="$(MacOSProjectFolder)**/*.xcassets/**/*.png;$(MacOSProjectFolder)**/*.xcassets/*/*.jpg;$(MacOSProjectFolder)**/*.xcassets/**/*.pdf;$(MacOSProjectFolder)**/*.xcassets/**/*.json" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" Visible="false" IsDefaultItem="true" />
 		<SceneKitAsset Include="$(MacOSProjectFolder)**/*.scnassets/*" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
 		<InterfaceDefinition Include="$(MacOSProjectFolder)**/*.storyboard;$(MacOSProjectFolder)**/*.xib" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
+		<BundleResource Include="$(MacOSProjectFolder)Resources\**" Exclude="$(_SingleProjectMacOSExcludes)" IsDefaultItem="true" />
 	</ItemGroup>
 
 	<!-- Targets -->
@@ -75,6 +78,9 @@
 		<Compile Condition=" '$(TargetPlatformIdentifier)' != 'ios' and '$(iOSProjectFolder)' != '' " Remove="$(iOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
 		<Compile Condition=" '$(TargetPlatformIdentifier)' != 'maccatalyst' and '$(MacCatalystProjectFolder)' != '' " Remove="$(MacCatalystProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
 		<Compile Condition=" '$(TargetPlatformIdentifier)' != 'macos' and '$(MacOSProjectFolder)' != '' " Remove="$(MacOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
+
+		<!-- Make files available in the tree -->
+		<None Include="**/*$(DefaultLanguageSourceExtension)"/>
 	</ItemGroup>
 
 	<!-- IDE capabilities -->