diff --git a/.gitignore b/.gitignore index 3ad0f7e..b16afcd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,16 @@ # IDE: Visual Studio .vs +# IDE: Rider +/.idea +/packages/ +riderModule.iml +/_ReSharper.Caches/ +*.user + + + + # IDE: Xcode xcuserdata @@ -19,4 +29,4 @@ obj # Toolchain: Swift build builds -/.idea + diff --git a/sk.Core/app.manifest b/sk.Core/app.manifest deleted file mode 100644 index b9b6474..0000000 --- a/sk.Core/app.manifest +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sk.Core/sk.Core.csproj b/sk.Core/sk.Core.csproj index d17c986..dc1a99f 100644 --- a/sk.Core/sk.Core.csproj +++ b/sk.Core/sk.Core.csproj @@ -1,27 +1,18 @@ - - - - netstandard2.0 - enable - - - - latest - - - latest - - - - - - - - - - - - - - - + + + + netstandard2.0 + enable + 8 + + + + + + + + + + + + diff --git a/sk.Players.Generic/sk.Players.Generic.csproj b/sk.Players.Generic/sk.Players.Generic.csproj index 72764a6..d2a210c 100644 --- a/sk.Players.Generic/sk.Players.Generic.csproj +++ b/sk.Players.Generic/sk.Players.Generic.csproj @@ -1,7 +1,7 @@ - - - - netstandard2.0 - - - + + + + netstandard2.0 + + + diff --git a/sk.Players.Mac.AppleMusic.BindingLibrary/ApiDefinition.cs b/sk.Players.Mac.AppleMusic.BindingLibrary/ApiDefinition.cs deleted file mode 100644 index ef1f1d0..0000000 --- a/sk.Players.Mac.AppleMusic.BindingLibrary/ApiDefinition.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Foundation; -using ObjCRuntime; -using ScriptingBridge; - -namespace sk.Players.Mac.AppleMusic { - - [BaseType(typeof(SBApplication))] - public interface iTunesApplication { - [Export("playerPosition")] - double playerPosition { - get; - } - } -} - - diff --git a/sk.Players.Mac.AppleMusic.BindingLibrary/StructsAndEnums.cs b/sk.Players.Mac.AppleMusic.BindingLibrary/StructsAndEnums.cs deleted file mode 100644 index 17e43c4..0000000 --- a/sk.Players.Mac.AppleMusic.BindingLibrary/StructsAndEnums.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace sk.Players.Mac.AppleMusic { - -} - - diff --git a/sk.Players.Mac.AppleMusic.BindingLibrary/sk.Players.Mac.AppleMusic.BindingLibrary.csproj b/sk.Players.Mac.AppleMusic.BindingLibrary/sk.Players.Mac.AppleMusic.BindingLibrary.csproj deleted file mode 100644 index 72b83fe..0000000 --- a/sk.Players.Mac.AppleMusic.BindingLibrary/sk.Players.Mac.AppleMusic.BindingLibrary.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - net7.0-macos10.14 - enable - true - true - - - - false - false - None - - - false - false - None - - - - - - diff --git a/sk.Players.Mac.AppleMusic/AppleMusicPlayer.cs b/sk.Players.Mac.AppleMusic/AppleMusicPlayer.cs index 6809db2..5dd958d 100644 --- a/sk.Players.Mac.AppleMusic/AppleMusicPlayer.cs +++ b/sk.Players.Mac.AppleMusic/AppleMusicPlayer.cs @@ -7,6 +7,7 @@ using static System.Net.Mime.MediaTypeNames; using System.Runtime.InteropServices; using ObjCRuntime; +using Foundation; namespace sk.Players.Mac.AppleMusic { public class SkMacAppleMusicPlayer : SkPlayer { diff --git a/sk.Players.Mac.AppleMusic/sk.Players.Mac.AppleMusic.csproj b/sk.Players.Mac.AppleMusic/sk.Players.Mac.AppleMusic.csproj index b638dc6..ca3e0e5 100644 --- a/sk.Players.Mac.AppleMusic/sk.Players.Mac.AppleMusic.csproj +++ b/sk.Players.Mac.AppleMusic/sk.Players.Mac.AppleMusic.csproj @@ -1,18 +1,14 @@ - net8.0-macos + net9.0-macos enable true - - - false - false - None - - - false - false - None + + + full diff --git a/sk.UI.Mac/Properties/PublishProfiles/FolderProfile.pubxml b/sk.UI.Mac/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index dca9b85..0000000 --- a/sk.UI.Mac/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - FileSystem - Release - AnyCPU - bin/Release/net7.0-macos10.14/publish - false - net7.0-macos10.14 - false - <_IsPortable>true - - \ No newline at end of file diff --git a/sk.UI.Mac/sk.UI.Mac.csproj b/sk.UI.Mac/sk.UI.Mac.csproj index d5c0ead..231987e 100644 --- a/sk.UI.Mac/sk.UI.Mac.csproj +++ b/sk.UI.Mac/sk.UI.Mac.csproj @@ -5,75 +5,23 @@ enable true 12.0 - osx-x64;osx-arm64 + + + + + dev.foxt.sk.mac true Entitlements.plist Developer ID Application automatic - true - - - false - false - None - 4 - - - false - false - Full - true - true - 4 + full - - - - - - - - - - - - - - Resources\logo16%402x.png - - - Resources\AppIcon-16%402x.png - - - - - Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png - - - Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png - - - Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png - - - Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png - - - Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png - - - Assets.xcassets\AppIcon.appiconset\AppIcon-64%402x.png - - - - - - - - diff --git a/sk.sln b/sk.sln index dd92699..2f3f450 100644 --- a/sk.sln +++ b/sk.sln @@ -1,67 +1,34 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 25.0.1705.4 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Core", "sk.Core\sk.Core.csproj", "{84CBE2BD-3178-4F68-AE9F-0A63451D880E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.UI.Mac", "sk.UI.Mac\sk.UI.Mac.csproj", "{6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Players.Mac.AppleMusic", "sk.Players.Mac.AppleMusic\sk.Players.Mac.AppleMusic.csproj", "{90C0AC8B-E5BF-4FB4-BC22-7064ED14B691}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{C1D225B7-9238-4986-A9C5-DE92A9EC52EA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Players", "Players", "{8BA469F1-9DC6-4827-8BA9-FC9D38B95421}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mac", "Mac", "{651E152D-C15A-4832-8F69-AF912B1EF732}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{6F36EB1B-AB15-416B-AEC6-FB33A44A6A1F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Players.Generic", "sk.Players.Generic\sk.Players.Generic.csproj", "{B4ABC74C-E2BE-4652-B8F0-707DB41EE481}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {84CBE2BD-3178-4F68-AE9F-0A63451D880E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84CBE2BD-3178-4F68-AE9F-0A63451D880E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84CBE2BD-3178-4F68-AE9F-0A63451D880E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84CBE2BD-3178-4F68-AE9F-0A63451D880E}.Release|Any CPU.Build.0 = Release|Any CPU - {0B8CA004-C932-44D1-A332-F40D254F1A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B8CA004-C932-44D1-A332-F40D254F1A42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B8CA004-C932-44D1-A332-F40D254F1A42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B8CA004-C932-44D1-A332-F40D254F1A42}.Release|Any CPU.Build.0 = Release|Any CPU - {6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6}.Release|Any CPU.Build.0 = Release|Any CPU - {90C0AC8B-E5BF-4FB4-BC22-7064ED14B691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90C0AC8B-E5BF-4FB4-BC22-7064ED14B691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90C0AC8B-E5BF-4FB4-BC22-7064ED14B691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90C0AC8B-E5BF-4FB4-BC22-7064ED14B691}.Release|Any CPU.Build.0 = Release|Any CPU - {B4ABC74C-E2BE-4652-B8F0-707DB41EE481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4ABC74C-E2BE-4652-B8F0-707DB41EE481}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4ABC74C-E2BE-4652-B8F0-707DB41EE481}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4ABC74C-E2BE-4652-B8F0-707DB41EE481}.Release|Any CPU.Build.0 = Release|Any CPU - {EDE4606C-4391-4AC4-9B00-96B9E9A935EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDE4606C-4391-4AC4-9B00-96B9E9A935EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDE4606C-4391-4AC4-9B00-96B9E9A935EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDE4606C-4391-4AC4-9B00-96B9E9A935EC}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {19704439-94E2-4A13-A7FF-D394DDE190E6} - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {84CBE2BD-3178-4F68-AE9F-0A63451D880E} = {C1D225B7-9238-4986-A9C5-DE92A9EC52EA} - {651E152D-C15A-4832-8F69-AF912B1EF732} = {8BA469F1-9DC6-4827-8BA9-FC9D38B95421} - {90C0AC8B-E5BF-4FB4-BC22-7064ED14B691} = {651E152D-C15A-4832-8F69-AF912B1EF732} - {6FD839FA-8DB2-4F98-9C6D-EFFC03B8E7C6} = {6F36EB1B-AB15-416B-AEC6-FB33A44A6A1F} - {B4ABC74C-E2BE-4652-B8F0-707DB41EE481} = {8BA469F1-9DC6-4827-8BA9-FC9D38B95421} - {EDE4606C-4391-4AC4-9B00-96B9E9A935EC} = {651E152D-C15A-4832-8F69-AF912B1EF732} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.UI.Mac", "sk.UI.Mac\sk.UI.Mac.csproj", "{4B079C82-732A-4866-BAE2-F596AD9602DC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Core", "sk.Core\sk.Core.csproj", "{F1D4A852-2B39-4228-99D4-51E9EC2714ED}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Players.Generic", "sk.Players.Generic\sk.Players.Generic.csproj", "{C99565DE-F761-4BA9-ADCA-7854FC06F2FB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sk.Players.Mac.AppleMusic", "sk.Players.Mac.AppleMusic\sk.Players.Mac.AppleMusic.csproj", "{130EAACD-E714-4486-AD83-2D0220CF676C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4B079C82-732A-4866-BAE2-F596AD9602DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B079C82-732A-4866-BAE2-F596AD9602DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B079C82-732A-4866-BAE2-F596AD9602DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B079C82-732A-4866-BAE2-F596AD9602DC}.Release|Any CPU.Build.0 = Release|Any CPU + {F1D4A852-2B39-4228-99D4-51E9EC2714ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1D4A852-2B39-4228-99D4-51E9EC2714ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1D4A852-2B39-4228-99D4-51E9EC2714ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1D4A852-2B39-4228-99D4-51E9EC2714ED}.Release|Any CPU.Build.0 = Release|Any CPU + {C99565DE-F761-4BA9-ADCA-7854FC06F2FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C99565DE-F761-4BA9-ADCA-7854FC06F2FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C99565DE-F761-4BA9-ADCA-7854FC06F2FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C99565DE-F761-4BA9-ADCA-7854FC06F2FB}.Release|Any CPU.Build.0 = Release|Any CPU + {130EAACD-E714-4486-AD83-2D0220CF676C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {130EAACD-E714-4486-AD83-2D0220CF676C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {130EAACD-E714-4486-AD83-2D0220CF676C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {130EAACD-E714-4486-AD83-2D0220CF676C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal