Include component icons as library assets

2023-10-03 11:25:05 -05:00 · 2023-10-03 11:25:05 -05:00 · a964b90195
--- a/components/CanvasLayout/samples/CanvasLayout.Samples.csproj
+++ b/components/CanvasLayout/samples/CanvasLayout.Samples.csproj
@ -5,4 +5,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\CanvasLayout.png" />
+
+    <Content Include="Assets\CanvasLayout.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/CanvasView/samples/CanvasView.Samples.csproj
+++ b/components/CanvasView/samples/CanvasView.Samples.csproj
@ -5,4 +5,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\CanvasView.png" />
+
+    <Content Include="Assets\CanvasView.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/DataTable/samples/DataTable.Samples.csproj
+++ b/components/DataTable/samples/DataTable.Samples.csproj
@ -5,4 +5,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\DataTable.png" />
+
+    <Content Include="Assets\DataTable.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/MarqueeText/samples/MarqueeText.Samples.csproj
+++ b/components/MarqueeText/samples/MarqueeText.Samples.csproj
@ -13,4 +13,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\MarqueeText.png" />
+
+    <Content Include="Assets\MarqueeText.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/RivePlayer/samples/RivePlayer.Samples.csproj
+++ b/components/RivePlayer/samples/RivePlayer.Samples.csproj
@ -11,4 +11,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\RivePlayer.png" />
+
+    <Content Include="Assets\RivePlayer.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/RivePlayer/src/Dependencies.props
+++ b/components/RivePlayer/src/Dependencies.props
@ -17,24 +17,24 @@
  <!-- WinUI 2 / UWP -->
  <ItemGroup Condition="'$(IsUwp)' == 'true'">
    <!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views" Version="2.88.6" />
  </ItemGroup>

  <!-- WinUI 2 / Uno -->
  <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
    <!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
-    <PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.6" />
  </ItemGroup>

  <!-- WinUI 3 / WinAppSdk -->
  <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
    <!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
-    <PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.6" />
  </ItemGroup>

  <!-- WinUI 3 / Uno -->
  <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
    <!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
-    <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
  </ItemGroup>
 </Project>
--- a/components/Shimmer/samples/Shimmer.Samples.csproj
+++ b/components/Shimmer/samples/Shimmer.Samples.csproj
@ -7,10 +7,14 @@
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
  <ItemGroup>
    <None Remove="Assets\Owl.jpg" />
+    <None Remove="Assets\Shimmer.png" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Assets\Owl.jpg">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="Assets\Shimmer.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
  </ItemGroup>
 </Project>
--- a/components/TokenView/samples/TokenView.Samples.csproj
+++ b/components/TokenView/samples/TokenView.Samples.csproj
@ -21,4 +21,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\TokenView.png" />
+
+    <Content Include="Assets\TokenView.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
--- a/components/TransitionHelper/samples/TransitionHelper.Samples.csproj
+++ b/components/TransitionHelper/samples/TransitionHelper.Samples.csproj
@ -11,4 +11,12 @@

  <!-- Sets this up as a toolkit component's sample project -->
  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
+
+  <ItemGroup>
+    <None Remove="Assets\TransitionHelper.png" />
+
+    <Content Include="Assets\TransitionHelper.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>