Merge pull request #52 from rgb-master-team/fix-build

Fix build
rgb-master-team · Oct 17, 2021 · 0967279 · 0967279
2 parents 088182b + 731f047
commit 0967279
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 43 deletions.
diff --git a/EffectsExecution/EffectsExecution.csproj b/EffectsExecution/EffectsExecution.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
     <PackageReference Include="NAudio" Version="1.10.0" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0-rc.1.20451.14" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RGBMasterUWPApp/Pages/DevicesPage.xaml b/RGBMasterUWPApp/Pages/DevicesPage.xaml
@@ -4,7 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:state="using:AppExecutionManager.State" xmlns:common="using:Common" xmlns:utils="using:RGBMasterUWPApp.Utils"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:state="using:AppExecutionManager.State"
+    xmlns:common="using:Common"
+    xmlns:utils="using:RGBMasterUWPApp.Utils"
     mc:Ignorable="d"
     Loaded="Page_Loaded"
    >
@@ -56,7 +60,7 @@
                         </StackPanel.Resources>
                         <TextBlock Text="Devices" HorizontalAlignment="Left" />
                         <StackPanel x:Name="ProvidersProgress" Visibility="Collapsed" Orientation="Horizontal" Padding="8, 0, 0, 0">
-                            <ProgressBar Width="150" Maximum="100" Value="{x:Bind ProvidersLoadingProgressValue, Mode=OneWay}" Margin="0, 0, 4, 0" />
+                            <muxc:ProgressBar Width="150" Maximum="100" Value="{x:Bind ProvidersLoadingProgressValue, Mode=OneWay}" Margin="0, 0, 4, 0" />
                             <TextBlock Text="Initializing" Padding="0, 0, 4, 0"/>
                             <Image Source="{x:Bind CurrentProcessedProvider.ProviderIconAssetPath, Mode=OneWay}" Margin="0, 0, 4, 0" Width="14px" Height="14px"/>
                             <TextBlock Text="{x:Bind CurrentProcessedProvider.ProviderName, Mode=OneWay}" />

diff --git a/RGBMasterUWPApp/Pages/EffectsControls/CursorColorEffectControl.xaml b/RGBMasterUWPApp/Pages/EffectsControls/CursorColorEffectControl.xaml
@@ -4,7 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages.EffectsControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
     <Grid>

diff --git a/RGBMasterUWPApp/Pages/EffectsControls/DominantDisplayColorEffectControl.xaml b/RGBMasterUWPApp/Pages/EffectsControls/DominantDisplayColorEffectControl.xaml
@@ -4,7 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages.EffectsControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
     <Grid>

diff --git a/RGBMasterUWPApp/Pages/EffectsControls/GradientEffectControl.xaml b/RGBMasterUWPApp/Pages/EffectsControls/GradientEffectControl.xaml
@@ -5,7 +5,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages.EffectsControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:utils="using:RGBMasterUWPApp.Utils" xmlns:common="using:Common"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:utils="using:RGBMasterUWPApp.Utils"
+    xmlns:common="using:Common"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
     <Page.Resources>

diff --git a/RGBMasterUWPApp/Pages/EffectsControls/MusicEffectControl.xaml b/RGBMasterUWPApp/Pages/EffectsControls/MusicEffectControl.xaml
@@ -5,7 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages.EffectsControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:common="using:Common" xmlns:utils="using:RGBMasterUWPApp.Utils" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:state="using:AppExecutionManager.State"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:common="using:Common"
+    xmlns:utils="using:RGBMasterUWPApp.Utils"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:state="using:AppExecutionManager.State"
     mc:Ignorable="d">
     <Page.Resources>
         <utils:DrawingColorToBrushColorValueConverter x:Key="ColorConverter" />

diff --git a/RGBMasterUWPApp/Pages/EffectsControls/StaticColorEffectControl.xaml b/RGBMasterUWPApp/Pages/EffectsControls/StaticColorEffectControl.xaml
@@ -4,7 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:RGBMasterUWPApp.Pages.EffectsControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d"
     >
 

diff --git a/RGBMasterUWPApp/Pages/EffectsPage.xaml b/RGBMasterUWPApp/Pages/EffectsPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:RGBMasterUWPApp.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:common="using:Common"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d"
     >
 

diff --git a/RGBMasterUWPApp/Pages/SettingsPage.xaml b/RGBMasterUWPApp/Pages/SettingsPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:RGBMasterUWPApp.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:state="using:AppExecutionManager.State" xmlns:common="using:Common" 
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
     <Pivot Title="Settings">

diff --git a/RGBMasterUWPApp/RGBMasterUWPApp.csproj b/RGBMasterUWPApp/RGBMasterUWPApp.csproj
@@ -158,10 +158,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
+      <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.5.0-prerelease.200923002</Version>
+      <Version>2.7.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>

diff --git a/RGBMasterUWPApp/RGBMasterUserControl.xaml b/RGBMasterUWPApp/RGBMasterUserControl.xaml
@@ -9,8 +9,8 @@
     Loaded="RGBMasterUserControl_Loaded"
     mc:Ignorable="d">
     <UserControl.Resources>
-            <ResourceDictionary>
-                <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
                     <!--<SolidColorBrush x:Key="ButtonBackground" Color="#00a69a"/>
                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#4cc0b8"/>
@@ -21,7 +21,7 @@
                     <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#4cc0b8"/>-->
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-            </ResourceDictionary>
+        </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
         <VisualStateManager.VisualStateGroups>
@@ -43,14 +43,14 @@
                         <Setter Target="MainNavigationView.IsPaneOpen" Value="True" />
                     </VisualState.Setters>
                 </VisualState>
-                
+
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        
-        
-        
+
+
+
         <winui:NavigationView x:Name="MainNavigationView" PaneDisplayMode="Left" IsBackButtonVisible="Collapsed" SelectionChanged="MainNavigationView_SelectionChanged" Loaded="NavigationView_Loaded">
-                <winui:NavigationView.PaneHeader>
+            <winui:NavigationView.PaneHeader>
                 <StackPanel Orientation="Horizontal">
                     <Image Source="Assets/128.png" Width="23" Height="23" Margin="4 0 4 0" />
                     <TextBlock VerticalAlignment="Center" Text="RGB Master" FontWeight="SemiBold" FontSize="16" />

diff --git a/RGBMasterUWPHost/App.xaml b/RGBMasterUWPHost/App.xaml
@@ -4,12 +4,13 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:xaml="using:Microsoft.Toolkit.Win32.UI.XamlHost"
     xmlns:local="using:RGBMasterUWPHost"
+    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
     RequestedTheme="Dark">
     <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
+        <controls:XamlControlsResources>
+            <controls:XamlControlsResources.MergedDictionaries>
+                <!-- Other app resources here -->
+            </controls:XamlControlsResources.MergedDictionaries>
+        </controls:XamlControlsResources>
     </Application.Resources>
 </xaml:XamlApplication>
diff --git a/RGBMasterUWPHost/RGBMasterUWPHost.csproj b/RGBMasterUWPHost/RGBMasterUWPHost.csproj
@@ -180,13 +180,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
+      <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.1.2</Version>
+      <Version>6.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.5.0-prerelease.200923002</Version>
+      <Version>2.7.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/RGBMasterWPFRunner/MainWindow.xaml b/RGBMasterWPFRunner/MainWindow.xaml
@@ -5,13 +5,12 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
         xmlns:local="clr-namespace:RGBMasterWPFRunner"
-        xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
-        xmlns:xamlhost="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
+        xmlns:controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
         mc:Ignorable="d"
         Title="RGBMaster" Height="800" Width="800"
         Closing="Window_Closing"
         >
     <Grid>
-        <xamlhost:WindowsXamlHost InitialTypeName="RGBMasterUWPApp.RGBMasterUserControl" x:Name="MainUserControlWrapper" ChildChanged="MainUserControlWrapper_ChildChanged" />
+        <xaml:WindowsXamlHost InitialTypeName="RGBMasterUWPApp.RGBMasterUserControl" x:Name="MainUserControlWrapper" ChildChanged="MainUserControlWrapper_ChildChanged" />
     </Grid>
 </Window>
diff --git a/RGBMasterWPFRunner/MainWindow.xaml.cs b/RGBMasterWPFRunner/MainWindow.xaml.cs
@@ -11,6 +11,7 @@
 using NAudio.CoreAudioApi;
 using Provider;
 using RazerChroma;
+using RGBMasterUWPApp;
 using Serilog;
 using Serilog.Exceptions;
 using System;
@@ -529,7 +530,13 @@ private async Task CleanupDevicesAndProviders()
 
         private void MainUserControlWrapper_ChildChanged(object sender, EventArgs e)
         {
-            MainUserControl = (RGBMasterUWPApp.RGBMasterUserControl) ((WindowsXamlHost)sender).Child;
+            var windowsXamlHost = sender as WindowsXamlHost;
+            var userControl = windowsXamlHost.GetUwpInternalObject() as RGBMasterUserControl;
+
+            if (userControl != null)
+            {
+                MainUserControl = userControl;
+            }
         }
     }
 }
diff --git a/RGBMasterWPFRunner/RGBMasterWPFRunner.csproj b/RGBMasterWPFRunner/RGBMasterWPFRunner.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <AssetTargetFallback>uap10.0.19041</AssetTargetFallback>
     <StartupObject>RGBMasterWPFRunner.Program</StartupObject>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Colore" Version="6.0.0-rc0014" />
+    <PackageReference Include="Colore" Version="6.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.1.2" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.2" />
     <PackageReference Include="NAudio" Version="1.10.0" />
@@ -49,9 +49,9 @@
       <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  
-  <PropertyGroup>
-    <AssetTargetFallback>uap10.0.18362</AssetTargetFallback>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.7" />
+  </ItemGroup>
 
 </Project>
diff --git a/RGBMasterWap/Package.appxmanifest b/RGBMasterWap/Package.appxmanifest
@@ -8,8 +8,8 @@
 
   <Identity
     Name="6442bda9-8e61-4e00-a286-4af1d801567a"
-    Publisher="CN=RGBMaster"
-    Version="2.4.0.0" />
+    Publisher="CN=RGBMasterTeam"
+    Version="2.5.0.0" />
 
   <Properties>
     <DisplayName>RGBMasterWap</DisplayName>

diff --git a/RGBMasterWap/RGBMasterWap.wapproj b/RGBMasterWap/RGBMasterWap.wapproj
@@ -61,7 +61,7 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateThumbprint>5D09A44EB37314BE563C54AB731ACD8012FC37E9</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>1264F37C050647D14231B1417C61100EDB09C0B0</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>

diff --git a/RGBMasterWap/RGBMasterWap_TemporaryKey.pfx b/RGBMasterWap/RGBMasterWap_TemporaryKey.pfx
diff --git a/RazerChroma/RazerChroma.csproj b/RazerChroma/RazerChroma.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Colore" Version="6.0.0-rc0014" />
+    <PackageReference Include="Colore" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>