GithubStar/R3
1
0
Fork 0
mirror of https://github.com/Cysharp/R3.git synced 2026-10-21 16:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix R3.Uno

Browse Source
This commit is contained in:
neuecc
2025-02-15 14:06:05 +09:00
parent bc33548efb
commit 1d953ccfb2
5 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sandbox/BlazorWebAssemblyApp1/BlazorWebAssemblyApp1.csproj
+13 -13
View File
@@ -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>
sandbox/UnoSampleApp/.editorconfig
-1
View File
@@ -10,7 +10,6 @@ root = true
[*]
indent_style = space
end_of_line = crlf
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8
sandbox/UnoSampleApp/UnoSampleApp/Styles/ColorPaletteOverride.xaml
+12 -12
View File
@@ -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="SurfaceInverseColor">#E6E1E5</Color>
<Color x:Key="PrimaryInverseColor">#2A009F</Color>
<Color x:Key="SurfaceTintColor">#C7BFFF</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>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</ResourceDictionary>
src/R3.Uno/ObserveOnExtensions.cs
+6 -6
View File
@@ -83,11 +83,11 @@ internal sealed class ObserveOnDispatcher<T>(Observable<T> source, CoreDispatche
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 @@ internal sealed class ObserveOnDispatcher<T>(Observable<T> source, CoreDispatche
// 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 @@ internal sealed class SubscribeOnDispatcher<T>(Observable<T> source, CoreDispatc
{
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;
}
src/R3.Uno/R3.Uno.csproj
+9
View File
@@ -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" />