Upgrade to NET 6.0 (untested on Windows)

timschneeb · May 6, 2022 · a465b15 · a465b15
1 parent 191801a
commit a465b15
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 33 deletions.
diff --git a/GalaxyBudsClient.Bluetooth.Linux/GalaxyBudsClient.Bluetooth.Linux.csproj b/GalaxyBudsClient.Bluetooth.Linux/GalaxyBudsClient.Bluetooth.Linux.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>GalaxyBudsClient.Bluetooth.Linux</RootNamespace>
         <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>

diff --git a/GalaxyBudsClient.Bluetooth.Windows/GalaxyBudsClient.Bluetooth.Windows.csproj b/GalaxyBudsClient.Bluetooth.Windows/GalaxyBudsClient.Bluetooth.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>GalaxyBudsClient.Bluetooth.Windows</RootNamespace>
         <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>

diff --git a/GalaxyBudsClient.Bluetooth.WindowsRT/GalaxyBudsClient.Bluetooth.WindowsRT.csproj b/GalaxyBudsClient.Bluetooth.WindowsRT/GalaxyBudsClient.Bluetooth.WindowsRT.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+        <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
         <Configurations>Debug;Release;Release - Windows ARM</Configurations>
         <Platforms>AnyCPU</Platforms>
@@ -24,7 +25,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
         <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
     </ItemGroup>
 </Project>
diff --git a/GalaxyBudsClient.Bluetooth/GalaxyBudsClient.Bluetooth.csproj b/GalaxyBudsClient.Bluetooth/GalaxyBudsClient.Bluetooth.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <nullable>enable</nullable>
         <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>
         <Platforms>AnyCPU</Platforms>

diff --git a/GalaxyBudsClient/GalaxyBudsClient.csproj b/GalaxyBudsClient/GalaxyBudsClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <ApplicationIcon>Resources/icon_white.ico</ApplicationIcon>
         <AssemblyVersion>4.5.1.0</AssemblyVersion>
         <Version>4.5.1.0</Version>
@@ -87,25 +87,17 @@
         <PackageReference Include="Tmds.DBus" Version="0.9.1" />
         <PackageReference Include="Trinet.Core.IO.Ntfs" Version="4.1.1" />
     </ItemGroup>
+
+    <ItemGroup Condition="'$(IsWindows)'=='true'">
+        <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.WindowsRT\GalaxyBudsClient.Bluetooth.WindowsRT.csproj" />
+        <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Windows\GalaxyBudsClient.Bluetooth.Windows.csproj" />
+    </ItemGroup>
 
-    <Choose>
-        <When Condition="$(DefineConstants.Contains('WindowsNoARM'))">
-            <ItemGroup>
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Linux\GalaxyBudsClient.Bluetooth.Linux.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.WindowsRT\GalaxyBudsClient.Bluetooth.WindowsRT.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Windows\GalaxyBudsClient.Bluetooth.Windows.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth\GalaxyBudsClient.Bluetooth.csproj" />
-                <ProjectReference Include="..\ThePBone.MprisClient\ThePBone.MprisClient.csproj" />
-            </ItemGroup>
-        </When>
-        <Otherwise>
-            <ItemGroup>
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Linux\GalaxyBudsClient.Bluetooth.Linux.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.WindowsRT\GalaxyBudsClient.Bluetooth.WindowsRT.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Windows\GalaxyBudsClient.Bluetooth.Windows.csproj" />
-                <ProjectReference Include="..\GalaxyBudsClient.Bluetooth\GalaxyBudsClient.Bluetooth.csproj" />
-                <ProjectReference Include="..\ThePBone.MprisClient\ThePBone.MprisClient.csproj" />
-            </ItemGroup>
-        </Otherwise>
-    </Choose>
+    <ItemGroup>
+        <ProjectReference Include="..\GalaxyBudsClient.Bluetooth.Linux\GalaxyBudsClient.Bluetooth.Linux.csproj" />
+        <ProjectReference Include="..\GalaxyBudsClient.Bluetooth\GalaxyBudsClient.Bluetooth.csproj" />
+        <ProjectReference Include="..\ThePBone.MprisClient\ThePBone.MprisClient.csproj" />
+        <ProjectReference Include="..\ThePBone.Interop.Win32\ThePBone.Interop.Win32.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/GalaxyBudsClient/Message/Decoder/ExtendedStatusUpdateParser.cs b/GalaxyBudsClient/Message/Decoder/ExtendedStatusUpdateParser.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Windows.AI.MachineLearning;
 using GalaxyBudsClient.Model.Attributes;
 using GalaxyBudsClient.Model.Constants;
 using GalaxyBudsClient.Utils;

diff --git a/GalaxyBudsClient/Platform/BluetoothImpl.cs b/GalaxyBudsClient/Platform/BluetoothImpl.cs
@@ -69,6 +69,7 @@ private BluetoothImpl()
         {
             try
             {
+#if Windows
                 if (PlatformUtils.IsWindows && SettingsProvider.Instance.UseBluetoothWinRT
                                             && PlatformUtils.IsWindowsContractsSdkSupported)
                 {
@@ -89,11 +90,14 @@ private BluetoothImpl()
                 }
 #endif
                 else if (PlatformUtils.IsLinux)
+#else
+                if(PlatformUtils.IsLinux)
+#endif
                 {   
                     Log.Debug("BluetoothImpl: Using Linux.BluetoothService");
                     _backend = new Bluetooth.Linux.BluetoothService();
                 }
-                else
+                else if(_backend == null)
                 {
                     Log.Warning("BluetoothImpl: Using Dummy.BluetoothService");
                     _backend = new Dummy.BluetoothService();

diff --git a/ThePBone.BlueZNet/ThePBone.BlueZNet.csproj b/ThePBone.BlueZNet/ThePBone.BlueZNet.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>ThePBone.BlueZNet</RootNamespace>
         <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>
         <Platforms>AnyCPU</Platforms>

diff --git a/ThePBone.Interop.Win32.Devices/ThePBone.Interop.Win32.Devices.csproj b/ThePBone.Interop.Win32.Devices/ThePBone.Interop.Win32.Devices.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+      <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <LangVersion>8.0</LangVersion>
     <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>

diff --git a/ThePBone.Interop.Win32/ThePBone.Interop.Win32.csproj b/ThePBone.Interop.Win32/ThePBone.Interop.Win32.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+      <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>8</LangVersion>
     <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>

diff --git a/ThePBone.MprisClient/ThePBone.MprisClient.csproj b/ThePBone.MprisClient/ThePBone.MprisClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>ThePBone.MprisClient</RootNamespace>
         <Configurations>Debug;Release;Debug (Local server);Release - Windows ARM</Configurations>