fix R3.Uno

Cysharp · Feb 15, 2025 · 1d953cc · 1d953cc
1 parent bc33548
commit 1d953cc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/sandbox/BlazorWebAssemblyApp1/BlazorWebAssemblyApp1.csproj b/sandbox/BlazorWebAssemblyApp1/BlazorWebAssemblyApp1.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-      <IsPackable>false</IsPackable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\R3.BlazorWebAssembly\R3.BlazorWebAssembly.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\R3.BlazorWebAssembly\R3.BlazorWebAssembly.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/sandbox/UnoSampleApp/.editorconfig b/sandbox/UnoSampleApp/.editorconfig
@@ -10,7 +10,6 @@ root = true
 
 [*]
 indent_style = space
-end_of_line = crlf
 trim_trailing_whitespace = true
 insert_final_newline = true
 charset = utf-8

diff --git a/sandbox/UnoSampleApp/UnoSampleApp/Styles/ColorPaletteOverride.xaml b/sandbox/UnoSampleApp/UnoSampleApp/Styles/ColorPaletteOverride.xaml
@@ -1,8 +1,9 @@
-<!-- This file is generated by a tool from the file ColorPaletteOverride.zip - - YOU SHOULD NOT EDIT IT manually.-->
+<!-- This file is generated by a tool from the file ColorPaletteOverride.json - - YOU SHOULD NOT EDIT IT manually.-->
 <ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Light">
       <Color x:Key="PrimaryColor">#5946D2</Color>
+      <Color x:Key="SurfaceTintColor">#5946D2</Color>
       <Color x:Key="OnPrimaryColor">#FFFFFF</Color>
       <Color x:Key="PrimaryContainerColor">#E5DEFF</Color>
       <Color x:Key="OnPrimaryContainerColor">#170065</Color>
@@ -15,8 +16,8 @@
       <Color x:Key="TertiaryContainerColor">#CFE4FF</Color>
       <Color x:Key="OnTertiaryContainerColor">#001D36</Color>
       <Color x:Key="ErrorColor">#B3261E</Color>
-      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
       <Color x:Key="OnErrorColor">#FFFFFF</Color>
+      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
       <Color x:Key="OnErrorContainerColor">#410E0B</Color>
       <Color x:Key="BackgroundColor">#FCFBFF</Color>
       <Color x:Key="OnBackgroundColor">#1C1B1F</Color>
@@ -25,14 +26,14 @@
       <Color x:Key="SurfaceVariantColor">#F2EFF5</Color>
       <Color x:Key="OnSurfaceVariantColor">#8B8494</Color>
       <Color x:Key="OutlineColor">#79747E</Color>
-      <Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>
-      <Color x:Key="SurfaceInverseColor">#313033</Color>
-      <Color x:Key="PrimaryInverseColor">#C8BFFF</Color>
-      <Color x:Key="SurfaceTintColor">#5946D2</Color>
       <Color x:Key="OutlineVariantColor">#C9C5D0</Color>
+      <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="PrimaryInverseColor">#2A009F</Color>
     </ResourceDictionary>
     <ResourceDictionary x:Key="Dark">
       <Color x:Key="PrimaryColor">#C7BFFF</Color>
+      <Color x:Key="SurfaceTintColor">#C7BFFF</Color>
       <Color x:Key="OnPrimaryColor">#2A009F</Color>
       <Color x:Key="PrimaryContainerColor">#4129BA</Color>
       <Color x:Key="OnPrimaryContainerColor">#E4DFFF</Color>
@@ -45,8 +46,8 @@
       <Color x:Key="TertiaryContainerColor">#00497D</Color>
       <Color x:Key="OnTertiaryContainerColor">#D1E4FF</Color>
       <Color x:Key="ErrorColor">#FFB4AB</Color>
-      <Color x:Key="ErrorContainerColor">#93000A</Color>
       <Color x:Key="OnErrorColor">#690005</Color>
+      <Color x:Key="ErrorContainerColor">#93000A</Color>
       <Color x:Key="OnErrorContainerColor">#FFDAD6</Color>
       <Color x:Key="BackgroundColor">#1C1B1F</Color>
       <Color x:Key="OnBackgroundColor">#E5E1E6</Color>
@@ -55,11 +56,10 @@
       <Color x:Key="SurfaceVariantColor">#47464F</Color>
       <Color x:Key="OnSurfaceVariantColor">#C9C5D0</Color>
       <Color x:Key="OutlineColor">#928F99</Color>
-      <Color x:Key="OnSurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="OutlineVariantColor">#57545D</Color>
       <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
       <Color x:Key="PrimaryInverseColor">#2A009F</Color>
-      <Color x:Key="SurfaceTintColor">#C7BFFF</Color>
-      <Color x:Key="OutlineVariantColor">#57545D</Color>
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/src/R3.Uno/ObserveOnExtensions.cs b/src/R3.Uno/ObserveOnExtensions.cs
@@ -83,11 +83,11 @@ void EnqueueValue(Notification<T> value)
                     running = true;
                     if (dispatcherPriority == null)
                     {
-                        dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
+                        _ = dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
                     }
                     else
                     {
-                        dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
+                        _ = dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
                     }
                 }
             }
@@ -168,11 +168,11 @@ void DrainMessages()
                     // post again
                     if (dispatcherPriority == null)
                     {
-                        dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
+                        _ = dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
                     }
                     else
                     {
-                        dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
+                        _ = dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
                     }
                     return;
                 }
@@ -216,11 +216,11 @@ public IDisposable Run()
         {
             if (dispatcherPriority == null)
             {
-                dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
+                _ = dispatcher.RunAsync(CoreDispatcherPriority.Normal, postCallback);
             }
             else
             {
-                dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
+                _ = dispatcher.RunAsync(dispatcherPriority.Value, postCallback);
             }
             return this;
         }

diff --git a/src/R3.Uno/R3.Uno.csproj b/src/R3.Uno/R3.Uno.csproj
@@ -5,8 +5,17 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <NoWarn>1701;1702;CS8002</NoWarn>
+
+        <!-- NuGet Packaging -->
+        <PackageId>R3Extensions.Uno</PackageId>
+        <PackageTags>rx</PackageTags>
+        <Description>Uno Provider and Methods for R3.</Description>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="../../Icon.png" Pack="true" PackagePath="/" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Uno.Extensions.Hosting.WinUI" Version="5.2.7" />
         <PackageReference Include="Uno.WinUI" Version="5.6.33" />