Skip to content

Commit

Permalink
chore: Adding material styles and missing pub files
Browse files Browse the repository at this point in the history
  • Loading branch information
nickrandolph committed Nov 13, 2023
1 parent 5c67aa5 commit 3a00dfe
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>arm64</Platform>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
<TrimMode>partial</TrimMode>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>x64</Platform>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
<TrimMode>partial</TrimMode>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>x86</Platform>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
<TrimMode>partial</TrimMode>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions samples/Playground/Playground.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.31911.260
MinimumVisualStudioVersion = 10.0.40219.1
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Playground.Shared", "Playground.Shared\Playground.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{DD8F5097-D88A-403A-A20C-B22242F46A2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Wasm", "Playground.Wasm\Playground.Wasm.csproj", "{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}"
Expand Down Expand Up @@ -3007,7 +3005,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6279C845-92F8-4333-AB99-3D213163593C} = {9FDE6A95-7086-43A9-A909-74C2FE64B509}
{DD8F5097-D88A-403A-A20C-B22242F46A2D} = {9FDE6A95-7086-43A9-A909-74C2FE64B509}
{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
{7034CDEC-7056-4E65-A043-A380582CFBD0} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
Expand Down Expand Up @@ -3077,7 +3074,6 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Playground.Shared\Playground.Shared.projitems*{0c7a4b61-d7c6-48f8-83b6-d7cfa896b8c9}*SharedItemsImports = 5
Playground.Shared\Playground.Shared.projitems*{1efb7b93-88d1-4f14-b335-bab42a49faf0}*SharedItemsImports = 5
Playground.Shared\Playground.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
Playground.Shared\Playground.Shared.projitems*{7034cdec-7056-4e65-a043-a380582cfbd0}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions samples/Playground/Playground/AppResources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />

<!-- Load the Material control resources -->
<!--<MaterialResources xmlns="using:Uno.Material" />-->
<MaterialResources xmlns="using:Uno.Material" />
<ToolkitResources xmlns="using:Uno.Toolkit.UI" />

<!-- Load Material Toolkit resources -->
<!--<MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />-->
<MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />
<!-- Place resources here -->
</ResourceDictionary.MergedDictionaries>
<Style TargetType="utu:ExtendedSplashScreen"
Expand Down

0 comments on commit 3a00dfe

Please sign in to comment.