diff --git a/appveyor.yml b/appveyor.yml
index 1ad2597..ee68ed8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2019
+image: Visual Studio 2022
 build_script:
 - ps: >-
     & cd build
diff --git a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj
index 8d34241..792858e 100644
--- a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj
+++ b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj
@@ -1,77 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DAE11BE5-432F-40BA-8E5C-5E3064C45F2A}</ProjectGuid>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);1591</NoWarn>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ByteDev.Sonos.Console</RootNamespace>
-    <AssemblyName>SonosConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="ByteDev.Cmd, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ByteDev.Cmd.4.1.1\lib\netstandard2.0\ByteDev.Cmd.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="OutputExtensions.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SonosOperations.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="ByteDev.Cmd" Version="4.1.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\ByteDev.Sonos.Upnp\ByteDev.Sonos.Upnp.csproj">
-      <Project>{fad40b73-ed08-4bc1-81fc-a2b8483afb8c}</Project>
-      <Name>ByteDev.Sonos.Upnp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ByteDev.Sonos\ByteDev.Sonos.csproj">
-      <Project>{da854649-1a35-46db-b583-471a87621a16}</Project>
-      <Name>ByteDev.Sonos</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\ByteDev.Sonos\ByteDev.Sonos.csproj" />
+    <ProjectReference Include="..\ByteDev.Sonos.Upnp\ByteDev.Sonos.Upnp.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/src/ByteDev.Sonos.Console/Properties/AssemblyInfo.cs b/src/ByteDev.Sonos.Console/Properties/AssemblyInfo.cs
deleted file mode 100644
index d30bd26..0000000
--- a/src/ByteDev.Sonos.Console/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ByteDev.Sonos.Console")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ByteDev.Sonos.Console")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("dae11be5-432f-40ba-8e5c-5e3064c45f2a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/ByteDev.Sonos.IntTests/ByteDev.Sonos.IntTests.csproj b/tests/ByteDev.Sonos.IntTests/ByteDev.Sonos.IntTests.csproj
index 2a5f230..66c7dcb 100644
--- a/tests/ByteDev.Sonos.IntTests/ByteDev.Sonos.IntTests.csproj
+++ b/tests/ByteDev.Sonos.IntTests/ByteDev.Sonos.IntTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/ByteDev.Sonos.Testing/ByteDev.Sonos.Testing.csproj b/tests/ByteDev.Sonos.Testing/ByteDev.Sonos.Testing.csproj
index 9b0b19a..dbdcea4 100644
--- a/tests/ByteDev.Sonos.Testing/ByteDev.Sonos.Testing.csproj
+++ b/tests/ByteDev.Sonos.Testing/ByteDev.Sonos.Testing.csproj
@@ -1,49 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{BD6A3697-E2F7-4D39-8F5D-36110314F712}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ByteDev.Sonos.Testing</RootNamespace>
-    <AssemblyName>ByteDev.Sonos.Testing</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Speakers.cs" />
-    <Compile Include="TestSpeaker.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/tests/ByteDev.Sonos.Testing/Properties/AssemblyInfo.cs b/tests/ByteDev.Sonos.Testing/Properties/AssemblyInfo.cs
deleted file mode 100644
index 62cf8ac..0000000
--- a/tests/ByteDev.Sonos.Testing/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ByteDev.Sonos.Testing")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("ByteDev.Sonos.Testing")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bd6a3697-e2f7-4d39-8f5d-36110314f712")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/ByteDev.Sonos.UnitTests/ByteDev.Sonos.UnitTests.csproj b/tests/ByteDev.Sonos.UnitTests/ByteDev.Sonos.UnitTests.csproj
index 9085f19..8308761 100644
--- a/tests/ByteDev.Sonos.UnitTests/ByteDev.Sonos.UnitTests.csproj
+++ b/tests/ByteDev.Sonos.UnitTests/ByteDev.Sonos.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/ByteDev.Sonos.Upnp.IntTests/ByteDev.Sonos.Upnp.IntTests.csproj b/tests/ByteDev.Sonos.Upnp.IntTests/ByteDev.Sonos.Upnp.IntTests.csproj
index 119f662..f8bdc84 100644
--- a/tests/ByteDev.Sonos.Upnp.IntTests/ByteDev.Sonos.Upnp.IntTests.csproj
+++ b/tests/ByteDev.Sonos.Upnp.IntTests/ByteDev.Sonos.Upnp.IntTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/ByteDev.Sonos.Upnp.UnitTests/ByteDev.Sonos.Upnp.UnitTests.csproj b/tests/ByteDev.Sonos.Upnp.UnitTests/ByteDev.Sonos.Upnp.UnitTests.csproj
index 68688b9..f3b3374 100644
--- a/tests/ByteDev.Sonos.Upnp.UnitTests/ByteDev.Sonos.Upnp.UnitTests.csproj
+++ b/tests/ByteDev.Sonos.Upnp.UnitTests/ByteDev.Sonos.Upnp.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>