dan/Hyperbar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update packes

Browse Source
This commit is contained in:
TheXamlGuy
2024-02-15 19:13:58 +00:00
parent cc61842c9a
commit 6f5f6f8cfe
12 changed files with 44 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hyperbar.Controls.Windows/Hyperbar.Controls.Windows.csproj
+1 -1
View File
@@ -17,7 +17,7 @@
<None Remove="bin/Debug/net8.0-windows10.0.19041.0/Hyperbar.Windows.Controls.pri" /> <None Remove="bin/Debug/net8.0-windows10.0.19041.0/Hyperbar.Windows.Controls.pri" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Hyperbar.UI.Windows/Hyperbar.UI.Windows.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" /> <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
</ItemGroup> </ItemGroup>
Hyperbar.Widget.MediaController.Windows/Hyperbar.Widget.MediaController.Windows.csproj
+2 -2
View File
@@ -12,10 +12,10 @@
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" /> <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="CustomExtensions.WinUI" Version="0.1.10-beta" /> <PackageReference Include="CustomExtensions.WinUI" Version="0.1.10-beta" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Hyperbar.Widget.Primary.Windows/Hyperbar.Widget.Primary.Windows.csproj
+2 -2
View File
@@ -6,8 +6,8 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Runtime.Caching" Version="8.0.0" /> <PackageReference Include="System.Runtime.Caching" Version="9.0.0-preview.1.24080.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" /> <ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj
+6 -20
View File
@@ -8,12 +8,12 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="WidgetConfigurationNavigationView.xaml" /> <PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
<None Remove="WidgetConfigurationView.xaml" /> <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
<None Remove="WidgetNavigationView.xaml" /> <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
</ItemGroup> <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.240109" />
<ItemGroup> <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.0.240109" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" /> <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
</ItemGroup> </ItemGroup>
@@ -23,18 +23,4 @@
<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" /> <ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" /> <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Page Update="WidgetConfigurationNavigationView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetNavigationView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetConfigurationView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project> </Project>
Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs
+2
View File
@@ -38,6 +38,8 @@ public static class IServiceCollectionExtensions
services.AddContentTemplate<WidgetConfigurationNavigationViewModel, WidgetConfigurationNavigationView>(); services.AddContentTemplate<WidgetConfigurationNavigationViewModel, WidgetConfigurationNavigationView>();
services.AddContentTemplate<WidgetConfigurationViewModel, WidgetConfigurationView>("WidgetSettings"); services.AddContentTemplate<WidgetConfigurationViewModel, WidgetConfigurationView>("WidgetSettings");
services.AddContentTemplate<WidgetConfigurationViewModel<WidgetAvailability, bool>, WidgetAvailabilityConfigurationView>();
}))); })));
return services; return services;
Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<controls:SettingsCard
x:Class="Hyperbar.Widget.Windows.WidgetAvailabilityConfigurationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
Description="foo foo foo" />
Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
using CommunityToolkit.WinUI.Controls;
namespace Hyperbar.Widget.Windows;
public sealed partial class WidgetAvailabilityConfigurationView :
SettingsCard
{
public WidgetAvailabilityConfigurationView() =>
InitializeComponent();
}
Hyperbar.Widget.Windows/WidgetConfigurationView.xaml
+1 -1
View File
@@ -3,5 +3,5 @@
x:Class="Hyperbar.Widget.Windows.WidgetConfigurationView" x:Class="Hyperbar.Widget.Windows.WidgetConfigurationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ListBox ItemsSource="{Binding Mode=TwoWay}" /> <ItemsControl ItemTemplateSelector="{Binding ViewModelTemplateSelector}" ItemsSource="{Binding Mode=TwoWay}" />
</UserControl> </UserControl>
Hyperbar.Windows/Dispatcher.cs
+5 -2
View File
@@ -1,4 +1,5 @@
using CommunityToolkit.WinUI;
using CommunityToolkit.WinUI;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
namespace Hyperbar.Windows; namespace Hyperbar.Windows;
@@ -6,6 +7,8 @@ namespace Hyperbar.Windows;
public class Dispatcher(DispatcherQueue dispatcherQueue) : public class Dispatcher(DispatcherQueue dispatcherQueue) :
IDispatcher IDispatcher
{ {
public async Task InvokeAsync(Action action) => public async Task InvokeAsync(Action action)
{
await dispatcherQueue.EnqueueAsync(action.Invoke); await dispatcherQueue.EnqueueAsync(action.Invoke);
}
} }
Hyperbar.Windows/Hyperbar.Windows.csproj
+6 -37
View File
@@ -32,12 +32,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" /> <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.240109" />
<PackageReference Include="CustomExtensions.WinUI" Version="0.1.10-beta" /> <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.0.240109" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" /> <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<Manifest Include="$(ApplicationManifest)" /> <Manifest Include="$(ApplicationManifest)" />
@@ -56,35 +56,4 @@
<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" /> <ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" /> <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Page Update="GeneralSettingsNavigationView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="SettingsView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="SettingsButtonView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="SecondaryView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="PrimaryView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="ApplicationBarView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project> </Project>
Hyperbar/Hyperbar.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" /> <PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>