From 813419f83eb38ae124051e7ed11aef7a7f8c036f Mon Sep 17 00:00:00 2001 From: Mark Osborn Date: Sun, 1 Jan 2023 15:17:26 -0800 Subject: [PATCH 1/5] Fixes #9 --- .../ByteDev.Sonos.Testing.csproj | 52 ++----------------- .../Properties/AssemblyInfo.cs | 36 ------------- 2 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 tests/ByteDev.Sonos.Testing/Properties/AssemblyInfo.cs 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 @@ - - - + + - Debug - AnyCPU - {BD6A3697-E2F7-4D39-8F5D-36110314F712} - Library - Properties - ByteDev.Sonos.Testing - ByteDev.Sonos.Testing - v4.7.1 - 512 - true + netstandard2.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 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")] From fa6b11a2c0f55d510cb7dca5f1a894df6ee762ce Mon Sep 17 00:00:00 2001 From: Mark Osborn Date: Sun, 1 Jan 2023 15:33:22 -0800 Subject: [PATCH 2/5] Update to .NET7 --- tests/ByteDev.Sonos.IntTests/ByteDev.Sonos.IntTests.csproj | 2 +- tests/ByteDev.Sonos.UnitTests/ByteDev.Sonos.UnitTests.csproj | 2 +- .../ByteDev.Sonos.Upnp.IntTests.csproj | 2 +- .../ByteDev.Sonos.Upnp.UnitTests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 @@  - netcoreapp3.1 + net7.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 @@  - netcoreapp3.1 + net7.0 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 @@  - netcoreapp3.1 + net7.0 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 @@  - netcoreapp3.1 + net7.0 From c4868c4a1e13e1164530abf1f014d9602fdbfb79 Mon Sep 17 00:00:00 2001 From: Mark Osborn Date: Sun, 1 Jan 2023 15:36:57 -0800 Subject: [PATCH 3/5] Update AppVeyor image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b4b84070cf385fa4d5f5f4a6416172cc57f1a422 Mon Sep 17 00:00:00 2001 From: Mark Osborn Date: Sun, 1 Jan 2023 15:45:21 -0800 Subject: [PATCH 4/5] Update Console project --- .../ByteDev.Sonos.Console.csproj | 83 ++++--------------- .../Properties/AssemblyInfo.cs | 36 -------- 2 files changed, 14 insertions(+), 105 deletions(-) delete mode 100644 src/ByteDev.Sonos.Console/Properties/AssemblyInfo.cs diff --git a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj index 8d34241..b2b8504 100644 --- a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj +++ b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj @@ -1,77 +1,22 @@ - - - + + - Debug - AnyCPU - {DAE11BE5-432F-40BA-8E5C-5E3064C45F2A} - Exe - Properties - ByteDev.Sonos.Console - SonosConsole - v4.7.1 - 512 - true - + net7.0 + true + $(NoWarn);1591 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + - - ..\..\packages\ByteDev.Cmd.4.1.1\lib\netstandard2.0\ByteDev.Cmd.dll - - - - - - - - - - - - - - - - - - - + + - - {fad40b73-ed08-4bc1-81fc-a2b8483afb8c} - ByteDev.Sonos.Upnp - - - {da854649-1a35-46db-b583-471a87621a16} - ByteDev.Sonos - + + - - + \ 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")] From 0f7f7d6128bcdb6f4927dc915bc426975e222221 Mon Sep 17 00:00:00 2001 From: Mark Osborn Date: Sun, 1 Jan 2023 15:46:43 -0800 Subject: [PATCH 5/5] Update Console project --- src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj index b2b8504..792858e 100644 --- a/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj +++ b/src/ByteDev.Sonos.Console/ByteDev.Sonos.Console.csproj @@ -4,6 +4,7 @@ net7.0 true $(NoWarn);1591 + Exe