Skip to content

Commit

Permalink
rebuild all the csproj & sln with rider
Browse files Browse the repository at this point in the history
  • Loading branch information
foxt committed Nov 13, 2024
1 parent 6592f7e commit 52281ee
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 249 deletions.
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
# IDE: Visual Studio
.vs

# IDE: Rider
/.idea
/packages/
riderModule.iml
/_ReSharper.Caches/
*.user




# IDE: Xcode
xcuserdata

Expand All @@ -19,4 +29,4 @@ obj
# Toolchain: Swift
build
builds
/.idea

18 changes: 0 additions & 18 deletions sk.Core/app.manifest

This file was deleted.

45 changes: 18 additions & 27 deletions sk.Core/sk.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<None Remove="LastFM\" />
</ItemGroup>
<ItemGroup>
<Folder Include="LastFM\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\sk.Players.Generic\sk.Players.Generic.csproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>8</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\sk.Players.Generic\sk.Players.Generic.csproj" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions sk.Players.Generic/sk.Players.Generic.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

</Project>
16 changes: 0 additions & 16 deletions sk.Players.Mac.AppleMusic.BindingLibrary/ApiDefinition.cs

This file was deleted.

5 changes: 0 additions & 5 deletions sk.Players.Mac.AppleMusic.BindingLibrary/StructsAndEnums.cs

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions sk.Players.Mac.AppleMusic/AppleMusicPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 7 additions & 11 deletions sk.Players.Mac.AppleMusic/sk.Players.Mac.AppleMusic.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-macos</TargetFramework>
<TargetFramework>net9.0-macos</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>None</LinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>None</LinkMode>

<!--
Enable full trimming in Release mode.
To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
-->
<TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\sk.Players.Generic\sk.Players.Generic.csproj" />
Expand Down
13 changes: 0 additions & 13 deletions sk.UI.Mac/Properties/PublishProfiles/FolderProfile.pubxml

This file was deleted.

70 changes: 9 additions & 61 deletions sk.UI.Mac/sk.UI.Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,23 @@
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>


<!--
Enable full trimming in Release mode.
To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<ApplicationId>dev.foxt.sk.mac</ApplicationId>
<EnableCodeSigning>true</EnableCodeSigning>
<CodeSignEntitlements>Entitlements.plist</CodeSignEntitlements>
<CodeSigningKey>Developer ID Application</CodeSigningKey>
<ProvisioningType>automatic</ProvisioningType>
<UseHardenedRuntime>true</UseHardenedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>None</LinkMode>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>Full</LinkMode>
<SignAssembly>true</SignAssembly>
<DebugSymbols>true</DebugSymbols>
<WarningLevel>4</WarningLevel>
<TrimMode>full</TrimMode>
</PropertyGroup>
<ItemGroup>
<None Remove="Assets.xcassets\.DS_Store" />
<None Remove="SecretStore\" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\.DS_Store" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\sk.Core\sk.Core.csproj" />
<ProjectReference Include="..\sk.Players.Generic\sk.Players.Generic.csproj" />
<ProjectReference Include="..\sk.Players.Mac.AppleMusic\sk.Players.Mac.AppleMusic.csproj" />
</ItemGroup>
<ItemGroup>
<BundleResource Remove="Resources\AppleMusicPlayer.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Condition="'$(_ResourcePrefix)' != ''" Update="Resources\logo16%402x.png">
<Link>Resources\logo16%402x.png</Link>
</BundleResource>
<BundleResource Condition="'$(_ResourcePrefix)' != ''" Update="Resources\AppIcon-16%402x.png">
<Link>Resources\AppIcon-16%402x.png</Link>
</BundleResource>
</ItemGroup>
<ItemGroup>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png</Link>
</ImageAsset>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png</Link>
</ImageAsset>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png</Link>
</ImageAsset>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png</Link>
</ImageAsset>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png</Link>
</ImageAsset>
<ImageAsset Update="Assets.xcassets\AppIcon.appiconset\AppIcon-64%402x.png">
<Link>Assets.xcassets\AppIcon.appiconset\AppIcon-64%402x.png</Link>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="SecretStore\" />
</ItemGroup>
</Project>
101 changes: 34 additions & 67 deletions sk.sln
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 52281ee

Please sign in to comment.