#204 AGPL 3.0 + Commerical 듀얼 라이선스 모델로 변경

yourtablecloth · Apr 5, 2024 · 9fe5717 · 9fe5717
1 parent 3b63278
commit 9fe5717
Show file tree

Hide file tree

Showing 13 changed files with 741 additions and 84 deletions.
diff --git a/LICENSE-AGPL-3-OR-LATER b/LICENSE-AGPL-3-OR-LATER
diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL
@@ -0,0 +1,3 @@
+If you wish to use the source code of this project for commercial purposes, you must consult with the main developer of this project, Jung Hyun, Nam.
+
+He can be reached at rkttu at rkttu dot com. His time zone is GMT+9 Asia/Seoul.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,21 +1 @@
-MIT License
-
-Copyright (c) 2021 Jung Hyun, Nam
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+This project consists of multiple licences. Please check each 'LICENSE*' file for the available licence options.
diff --git a/src/Cloth/Cloth.csproj b/src/Cloth/Cloth.csproj
@@ -9,8 +9,8 @@
 		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
 		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 		<Title>Cloth</Title>
-		<AssemblyVersion>1.12.3.0</AssemblyVersion>
-		<FileVersion>1.12.3.0</FileVersion>
+		<AssemblyVersion>1.13.0.0</AssemblyVersion>
+		<FileVersion>1.13.0.0</FileVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/src/Cloth/app.manifest b/src/Cloth/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.12.3.0" name="Cloth.app" />
+  <assemblyIdentity version="1.13.0.0" name="Cloth.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/src/License.rtf b/src/License.rtf
diff --git a/src/Spork/Properties/AssemblyInfo.cs b/src/Spork/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyProduct("TableCloth")]
 [assembly: AssemblyCopyright("(c) rkttu.com, 2021")]
 [assembly: AssemblyTrademark("TableCloth")]
-[assembly: AssemblyVersion("1.12.3.0")]
-[assembly: AssemblyFileVersion("1.12.3.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]
 [assembly: Guid("36e7b617-ca94-4ecb-ad65-39fe94ce265b")]
 [assembly: ComVisible(true)]
 

diff --git a/src/Spork/app.manifest b/src/Spork/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-	<assemblyIdentity version="1.12.3.0" name="Spork.app" />
+	<assemblyIdentity version="1.13.0.0" name="Spork.app" />
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
 		<security>
 			<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/src/TableCloth.Resources/TableCloth.Resources.csproj b/src/TableCloth.Resources/TableCloth.Resources.csproj
@@ -10,7 +10,7 @@
 		<Product>TableCloth</Product>
 		<ProductName>TableCloth</ProductName>
 		<Copyright>(c) rkttu.com, 2021</Copyright>
-		<Version>1.12.3.0</Version>
+		<Version>1.13.0.0</Version>
 		<PackageProjectUrl>https://yourtablecloth.github.io</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/yourtablecloth/TableCloth</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>

diff --git a/src/TableCloth.Test/TableCloth.Test.csproj b/src/TableCloth.Test/TableCloth.Test.csproj
@@ -1,56 +1,68 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.18362.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<UseWPF>True</UseWPF>
-		<Nullable>enable</Nullable>
-		<IsPackable>false</IsPackable>
-		<IsTestProject>true</IsTestProject>
-		<Platforms>AnyCPU;ARM64;x64</Platforms>
-	</PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.18362.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UseWPF>True</UseWPF>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<Platforms>ARM64;x64</Platforms>
+		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+		<Description>Keep Your Computer Sound &amp; Safe!</Description>
+		<Title>TableCloth.Test</Title>
+		<Company>rkttu.com</Company>
+		<Product>TableCloth</Product>
+		<ProductName>TableCloth</ProductName>
+		<Copyright>(c) rkttu.com, 2021</Copyright>
+		<Version>1.13.0.0</Version>
+		<PackageProjectUrl>https://yourtablecloth.github.io</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/yourtablecloth/TableCloth</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageTags>TableCloth</PackageTags>
+	</PropertyGroup>
+
 	<ItemGroup>
 	  <None Remove="Spork.zip" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-		<PackageReference Include="Moq" Version="4.20.70" />
-		<PackageReference Include="xunit" Version="2.6.6" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\TableCloth.Resources\TableCloth.Resources.csproj" />
-		<ProjectReference Include="..\TableCloth\TableCloth.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="commit.txt">
-			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
-		</EmbeddedResource>
-		<Content Include="Images.zip">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+		<PackageReference Include="Moq" Version="4.20.70" />
+		<PackageReference Include="xunit" Version="2.6.6" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\TableCloth.Resources\TableCloth.Resources.csproj" />
+		<ProjectReference Include="..\TableCloth\TableCloth.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="commit.txt">
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</EmbeddedResource>
+		<Content Include="Images.zip">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
 		<Content Include="Spork.zip">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
-	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-	  <Exec Command="git.exe rev-parse HEAD &gt; &quot;$(ProjectDir)commit.txt&quot;&#xD;&#xA;&#xD;&#xA;dir &quot;$(ProjectDir)..\Spork\bin\$(PlatformName)\$(ConfigurationName)\Spork.zip&quot;&#xD;&#xA;copy /y &quot;$(ProjectDir)..\Spork\bin\$(PlatformName)\$(ConfigurationName)\Spork.zip&quot; &quot;$(ProjectDir)Spork.zip&quot;&#xD;&#xA;dir &quot;$(ProjectDir)Spork.zip&quot;&#xD;&#xA;&#xD;&#xA;curl.exe -L https://yourtablecloth.app/TableClothCatalog/Images.zip -o &quot;$(ProjectDir)Images.zip&quot;&#xD;&#xA;" />
-	</Target>
-
-</Project>
+		</Content>
+	</ItemGroup>
+
+	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+	  <Exec Command="git.exe rev-parse HEAD &gt; &quot;$(ProjectDir)commit.txt&quot;&#xD;&#xA;&#xD;&#xA;dir &quot;$(ProjectDir)..\Spork\bin\$(PlatformName)\$(ConfigurationName)\Spork.zip&quot;&#xD;&#xA;copy /y &quot;$(ProjectDir)..\Spork\bin\$(PlatformName)\$(ConfigurationName)\Spork.zip&quot; &quot;$(ProjectDir)Spork.zip&quot;&#xD;&#xA;dir &quot;$(ProjectDir)Spork.zip&quot;&#xD;&#xA;&#xD;&#xA;curl.exe -L https://yourtablecloth.app/TableClothCatalog/Images.zip -o &quot;$(ProjectDir)Images.zip&quot;&#xD;&#xA;" />
+	</Target>
+
+</Project>
diff --git a/src/TableCloth.sln b/src/TableCloth.sln
@@ -15,7 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Directory.build.props = Directory.build.props
-		LICENSE.txt = LICENSE.txt
+		License.rtf = License.rtf
+		..\LICENSE.txt = ..\LICENSE.txt
 		PRIVACY.md = PRIVACY.md
 		README.md = README.md
 		SECURITY.md = SECURITY.md
@@ -90,7 +91,7 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		TableCloth.Shared\TableCloth.Shared.projitems*{0f58b6a7-cca8-471a-b767-01c7b8f6e839}*SharedItemsImports = 13
 		TableCloth.Shared\TableCloth.Shared.projitems*{2d6cd03c-52b2-46f2-8ec1-7480e7a92e5e}*SharedItemsImports = 5
-		D:\Projects\TableCloth\src\TableCloth.Shared\TableCloth.Shared.projitems*{369bb263-3c8d-4b56-9301-2c47de7746e8}*SharedItemsImports = 4
+		TableCloth.Shared\TableCloth.Shared.projitems*{369bb263-3c8d-4b56-9301-2c47de7746e8}*SharedItemsImports = 4
 		TableCloth.Shared\TableCloth.Shared.projitems*{f3b53bf9-ae1c-41b5-b2c2-bf24840440dd}*SharedItemsImports = 5
 	EndGlobalSection
 EndGlobal
diff --git a/src/TableCloth/TableCloth.csproj b/src/TableCloth/TableCloth.csproj
@@ -13,7 +13,7 @@
 		<Product>TableCloth</Product>
 		<ProductName>TableCloth</ProductName>
 		<Copyright>(c) rkttu.com, 2021</Copyright>
-		<Version>1.12.3.0</Version>
+		<Version>1.13.0.0</Version>
 		<PackageProjectUrl>https://yourtablecloth.github.io</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/yourtablecloth/TableCloth</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>

diff --git a/src/TableCloth/app.manifest b/src/TableCloth/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.12.3.0" name="TableCloth.app" />
+  <assemblyIdentity version="1.13.0.0" name="TableCloth.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		If you wish to use the source code of this project for commercial purposes, you must consult with the main developer of this project, Jung Hyun, Nam.

		He can be reached at rkttu at rkttu dot com. His time zone is GMT+9 Asia/Seoul.