fix: Fonts

unoplatform · Oct 31, 2022 · e393853 · e393853
1 parent ac41c14
commit e393853
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 11 deletions.
diff --git a/...plates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj b/...plates/content/unoapp-extensions/MyExtensionsApp.Skia.Gtk/MyExtensionsApp.Skia.Gtk.csproj
@@ -15,15 +15,12 @@
 
 	<ItemGroup>
 		<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Light.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Medium.ttf" />
-		<Content Include="Assets\Fonts\Roboto-Regular.ttf" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI.Skia.Gtk"  />
-		<PackageReference Include="Uno.WinUI.RemoteControl"  Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI"  />
-		<PackageReference Include="SkiaSharp.Skottie"  />
+		<PackageReference Include="Uno.WinUI.Skia.Gtk" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
+		<PackageReference Include="SkiaSharp.Skottie" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
 		<PackageReference Include="Uno.Material.WinUI" />
 		<PackageReference Include="Uno.Toolkit.WinUI.Material" />

diff --git a/...content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Light.ttf b/...content/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Light.ttf
diff --git a/...ontent/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Medium.ttf b/...ontent/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Medium.ttf
diff --git a/...ntent/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Regular.ttf b/...ntent/unoapp-extensions/MyExtensionsApp.Skia.WPF/Assets/Fonts/Material/Roboto-Regular.ttf
diff --git a/...plates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj b/...plates/content/unoapp-extensions/MyExtensionsApp.Skia.WPF/MyExtensionsApp.Skia.WPF.csproj
@@ -54,9 +54,6 @@
 	<Import Project="..\MyExtensionsApp.UI\MyExtensionsApp.UI.projitems" Label="Shared" />
 
 	<ItemGroup>
-		<Content Include="Assets\Fonts\Material\Roboto-Light.ttf" />
-		<Content Include="Assets\Fonts\Material\Roboto-Medium.ttf" />
-		<Content Include="Assets\Fonts\Material\Roboto-Regular.ttf" />
 		<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
 	</ItemGroup>
 </Project>
diff --git a/...pp.Skia.Gtk/Assets/Fonts/Roboto-Light.ttf → ...UI/Assets/Fonts/Material/Roboto-Light.ttf b/...pp.Skia.Gtk/Assets/Fonts/Roboto-Light.ttf → ...UI/Assets/Fonts/Material/Roboto-Light.ttf
diff --git a/...p.Skia.Gtk/Assets/Fonts/Roboto-Medium.ttf → ...I/Assets/Fonts/Material/Roboto-Medium.ttf b/...p.Skia.Gtk/Assets/Fonts/Roboto-Medium.ttf → ...I/Assets/Fonts/Material/Roboto-Medium.ttf
diff --git a/....Skia.Gtk/Assets/Fonts/Roboto-Regular.ttf → .../Assets/Fonts/Material/Roboto-Regular.ttf b/....Skia.Gtk/Assets/Fonts/Roboto-Regular.ttf → .../Assets/Fonts/Material/Roboto-Regular.ttf
diff --git a/...sions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems b/...sions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.projitems
@@ -34,6 +34,18 @@
 		 explicitly included in the projitem, so files can be added from vscode
 		 without manipulating the projitem file.
 	-->
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Light.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Medium.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Fonts\Material\Roboto-Regular.ttf">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
     <Page Include="$(MSBuildThisFileDirectory)Views\Shell.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/...tensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj b/...tensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/MyExtensionsApp.UI.shproj
@@ -10,4 +10,9 @@
   <PropertyGroup />
   <Import Project="MyExtensionsApp.UI.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
+  <ItemGroup>
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Light.ttf" />
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Medium.ttf" />
+    <_Globbed_Content Remove="Assets\Fonts\Material\Roboto-Regular.ttf" />
+  </ItemGroup>
+</Project>
diff --git a/...ensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Light.ttf b/...ensions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Light.ttf
diff --git a/...nsions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Medium.ttf b/...nsions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Medium.ttf
diff --git a/...sions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Regular.ttf b/...sions.Templates/content/unoapp-extensions/MyExtensionsApp.Wasm/wwwroot/Roboto-Regular.ttf