Merge pull request #80 from prplecake/reorganize-project

prplecake · Jul 5, 2023 · c9adf86 · c9adf86
2 parents 0e11747 + 8df2490
commit c9adf86
Show file tree

Hide file tree

Showing 40 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -70,8 +70,8 @@ jobs:
         run: dotnet nuget add source --username prplecake --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/CompostInTraining/index.json"
       - name: Publish CLI (${{matrix.rid}})
         run: |
-          dotnet publish BookmarkSync.CLI/BookmarkSync.CLI.csproj -c Release -r ${{matrix.rid}} --self-contained -p:PublishSingleFile=true -p:PublishReadyToRun=true
-          zip -j mastodon-bookmark-sync-${{ github.ref_name }}-${{matrix.rid}}.zip BookmarkSync.CLI/bin/Release/net7.0/${{matrix.rid}}/publish/* README.md LICENSE
+          dotnet publish src/BookmarkSync.CLI/BookmarkSync.CLI.csproj -c Release -r ${{matrix.rid}} --self-contained -p:PublishSingleFile=true -p:PublishReadyToRun=true
+          zip -j mastodon-bookmark-sync-${{ github.ref_name }}-${{matrix.rid}}.zip src/BookmarkSync.CLI/bin/Release/net7.0/${{matrix.rid}}/publish/* README.md LICENSE
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/mastodon-bookmark-sync.sln b/mastodon-bookmark-sync.sln
@@ -8,52 +8,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\dotnet-release.yml = .github\workflows\dotnet-release.yml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.CLI", "BookmarkSync.CLI\BookmarkSync.CLI.csproj", "{696935C2-0383-4409-A2B4-B80A8C905DD2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5EDB0DD2-A23F-410E-9355-B1521E273FF3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Core", "BookmarkSync.Core\BookmarkSync.Core.csproj", "{0391DE45-C449-4AEF-93A6-808261868807}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{737ABEA3-2510-4E53-9B5A-A258BE2AF721}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Infrastructure", "BookmarkSync.Infrastructure\BookmarkSync.Infrastructure.csproj", "{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.CLI", "src\BookmarkSync.CLI\BookmarkSync.CLI.csproj", "{E69D1FC7-D3C7-481F-B12F-E3C907014EE0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Core.Tests", "BookmarkSync.Core.Tests\BookmarkSync.Core.Tests.csproj", "{9B28E255-C1D4-43A6-861A-DD1752F31A0E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Core.Tests", "tests\BookmarkSync.Core.Tests\BookmarkSync.Core.Tests.csproj", "{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Infrastructure.Tests", "BookmarkSync.Infrastructure.Tests\BookmarkSync.Infrastructure.Tests.csproj", "{DA6C5B23-C780-479D-8D14-20307A5A91D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Infrastructure.Tests", "tests\BookmarkSync.Infrastructure.Tests\BookmarkSync.Infrastructure.Tests.csproj", "{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{5EDB0DD2-A23F-410E-9355-B1521E273FF3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Core", "src\BookmarkSync.Core\BookmarkSync.Core.csproj", "{857B7598-D226-40F7-807E-D11553DC1FED}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{737ABEA3-2510-4E53-9B5A-A258BE2AF721}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookmarkSync.Infrastructure", "src\BookmarkSync.Infrastructure\BookmarkSync.Infrastructure.csproj", "{C328709A-9063-438D-85B8-909CF14329F0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{696935C2-0383-4409-A2B4-B80A8C905DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{696935C2-0383-4409-A2B4-B80A8C905DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{696935C2-0383-4409-A2B4-B80A8C905DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{696935C2-0383-4409-A2B4-B80A8C905DD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0391DE45-C449-4AEF-93A6-808261868807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0391DE45-C449-4AEF-93A6-808261868807}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0391DE45-C449-4AEF-93A6-808261868807}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0391DE45-C449-4AEF-93A6-808261868807}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B28E255-C1D4-43A6-861A-DD1752F31A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B28E255-C1D4-43A6-861A-DD1752F31A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B28E255-C1D4-43A6-861A-DD1752F31A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B28E255-C1D4-43A6-861A-DD1752F31A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA6C5B23-C780-479D-8D14-20307A5A91D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA6C5B23-C780-479D-8D14-20307A5A91D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA6C5B23-C780-479D-8D14-20307A5A91D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA6C5B23-C780-479D-8D14-20307A5A91D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E69D1FC7-D3C7-481F-B12F-E3C907014EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E69D1FC7-D3C7-481F-B12F-E3C907014EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E69D1FC7-D3C7-481F-B12F-E3C907014EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E69D1FC7-D3C7-481F-B12F-E3C907014EE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062}.Release|Any CPU.Build.0 = Release|Any CPU
+		{857B7598-D226-40F7-807E-D11553DC1FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{857B7598-D226-40F7-807E-D11553DC1FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{857B7598-D226-40F7-807E-D11553DC1FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{857B7598-D226-40F7-807E-D11553DC1FED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C328709A-9063-438D-85B8-909CF14329F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C328709A-9063-438D-85B8-909CF14329F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C328709A-9063-438D-85B8-909CF14329F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C328709A-9063-438D-85B8-909CF14329F0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9B28E255-C1D4-43A6-861A-DD1752F31A0E} = {737ABEA3-2510-4E53-9B5A-A258BE2AF721}
-		{DA6C5B23-C780-479D-8D14-20307A5A91D8} = {737ABEA3-2510-4E53-9B5A-A258BE2AF721}
-		{696935C2-0383-4409-A2B4-B80A8C905DD2} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
-		{0391DE45-C449-4AEF-93A6-808261868807} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
-		{D11BD068-7AD0-4C9D-85A0-BD04A67AA7FC} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
+		{E69D1FC7-D3C7-481F-B12F-E3C907014EE0} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
+		{18CE5B2E-8DED-4B09-87D8-9DB28CA5C16D} = {737ABEA3-2510-4E53-9B5A-A258BE2AF721}
+		{97E7C240-93D5-4FCA-AEB8-5A2EA6B42062} = {737ABEA3-2510-4E53-9B5A-A258BE2AF721}
+		{857B7598-D226-40F7-807E-D11553DC1FED} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
+		{C328709A-9063-438D-85B8-909CF14329F0} = {5EDB0DD2-A23F-410E-9355-B1521E273FF3}
 	EndGlobalSection
 EndGlobal
diff --git a/BookmarkSync.CLI/BookmarkSync.CLI.csproj → src/BookmarkSync.CLI/BookmarkSync.CLI.csproj b/BookmarkSync.CLI/BookmarkSync.CLI.csproj → src/BookmarkSync.CLI/BookmarkSync.CLI.csproj
diff --git a/BookmarkSync.CLI/Program.cs → src/BookmarkSync.CLI/Program.cs b/BookmarkSync.CLI/Program.cs → src/BookmarkSync.CLI/Program.cs
diff --git a/BookmarkSync.CLI/appsettings.Example.json → ...BookmarkSync.CLI/appsettings.Example.json b/BookmarkSync.CLI/appsettings.Example.json → ...BookmarkSync.CLI/appsettings.Example.json
diff --git a/BookmarkSync.CLI/appsettings.json → src/BookmarkSync.CLI/appsettings.json b/BookmarkSync.CLI/appsettings.json → src/BookmarkSync.CLI/appsettings.json
diff --git a/BookmarkSync.Core/BookmarkSync.Core.csproj → ...ookmarkSync.Core/BookmarkSync.Core.csproj b/BookmarkSync.Core/BookmarkSync.Core.csproj → ...ookmarkSync.Core/BookmarkSync.Core.csproj
diff --git a/...kSync.Core/Configuration/ConfigManager.cs → ...kSync.Core/Configuration/ConfigManager.cs b/...kSync.Core/Configuration/ConfigManager.cs → ...kSync.Core/Configuration/ConfigManager.cs
diff --git a/BookmarkSync.Core/Entities/Account.cs → src/BookmarkSync.Core/Entities/Account.cs b/BookmarkSync.Core/Entities/Account.cs → src/BookmarkSync.Core/Entities/Account.cs
diff --git a/BookmarkSync.Core/Entities/Bookmark.cs → src/BookmarkSync.Core/Entities/Bookmark.cs b/BookmarkSync.Core/Entities/Bookmark.cs → src/BookmarkSync.Core/Entities/Bookmark.cs
diff --git a/BookmarkSync.Core/Entities/Config/App.cs → src/BookmarkSync.Core/Entities/Config/App.cs b/BookmarkSync.Core/Entities/Config/App.cs → src/BookmarkSync.Core/Entities/Config/App.cs
diff --git a/...kSync.Core/Entities/Config/Bookmarking.cs → ...kSync.Core/Entities/Config/Bookmarking.cs b/...kSync.Core/Entities/Config/Bookmarking.cs → ...kSync.Core/Entities/Config/Bookmarking.cs
diff --git a/...Core/Entities/Config/ConfigurationBase.cs → ...Core/Entities/Config/ConfigurationBase.cs b/...Core/Entities/Config/ConfigurationBase.cs → ...Core/Entities/Config/ConfigurationBase.cs
diff --git a/...markSync.Core/Entities/Config/Instance.cs → ...markSync.Core/Entities/Config/Instance.cs b/...markSync.Core/Entities/Config/Instance.cs → ...markSync.Core/Entities/Config/Instance.cs
diff --git a/BookmarkSync.Core/GlobalUsings.cs → src/BookmarkSync.Core/GlobalUsings.cs b/BookmarkSync.Core/GlobalUsings.cs → src/BookmarkSync.Core/GlobalUsings.cs
diff --git a/...nc.Core/Interfaces/IBookmarkingService.cs → ...nc.Core/Interfaces/IBookmarkingService.cs b/...nc.Core/Interfaces/IBookmarkingService.cs → ...nc.Core/Interfaces/IBookmarkingService.cs
diff --git a/BookmarkSync.Core/Meta.cs → src/BookmarkSync.Core/Meta.cs b/BookmarkSync.Core/Meta.cs → src/BookmarkSync.Core/Meta.cs
diff --git a/BookmarkSync.Core/Utilities/HtmlUtilities.cs → ...kmarkSync.Core/Utilities/HtmlUtilities.cs b/BookmarkSync.Core/Utilities/HtmlUtilities.cs → ...kmarkSync.Core/Utilities/HtmlUtilities.cs
diff --git a/BookmarkSync.Core/Utilities/UriUtilities.cs → ...okmarkSync.Core/Utilities/UriUtilities.cs b/BookmarkSync.Core/Utilities/UriUtilities.cs → ...okmarkSync.Core/Utilities/UriUtilities.cs
diff --git a/...ucture/BookmarkSync.Infrastructure.csproj → ...ucture/BookmarkSync.Infrastructure.csproj b/...ucture/BookmarkSync.Infrastructure.csproj → ...ucture/BookmarkSync.Infrastructure.csproj
diff --git a/BookmarkSync.Infrastructure/GlobalUsings.cs → ...okmarkSync.Infrastructure/GlobalUsings.cs b/BookmarkSync.Infrastructure/GlobalUsings.cs → ...okmarkSync.Infrastructure/GlobalUsings.cs
diff --git a/...rvices/Bookmarking/BookmarkSyncService.cs → ...rvices/Bookmarking/BookmarkSyncService.cs b/...rvices/Bookmarking/BookmarkSyncService.cs → ...rvices/Bookmarking/BookmarkSyncService.cs
diff --git a/...ervices/Bookmarking/BookmarkingService.cs → ...ervices/Bookmarking/BookmarkingService.cs b/...ervices/Bookmarking/BookmarkingService.cs → ...ervices/Bookmarking/BookmarkingService.cs
diff --git a/...king/LinkAce/LinkAceBookmarkingService.cs → ...king/LinkAce/LinkAceBookmarkingService.cs b/...king/LinkAce/LinkAceBookmarkingService.cs → ...king/LinkAce/LinkAceBookmarkingService.cs
diff --git a/...ng/Pinboard/PinboardBookmarkingService.cs → ...ng/Pinboard/PinboardBookmarkingService.cs b/...ng/Pinboard/PinboardBookmarkingService.cs → ...ng/Pinboard/PinboardBookmarkingService.cs
diff --git a/...astructure/Services/Mastodon/ApiClient.cs → ...astructure/Services/Mastodon/ApiClient.cs b/...astructure/Services/Mastodon/ApiClient.cs → ...astructure/Services/Mastodon/ApiClient.cs
diff --git a/...Core.Tests/BookmarkSync.Core.Tests.csproj → ...Core.Tests/BookmarkSync.Core.Tests.csproj b/...Core.Tests/BookmarkSync.Core.Tests.csproj → ...Core.Tests/BookmarkSync.Core.Tests.csproj
@@ -20,7 +20,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\BookmarkSync.Core\BookmarkSync.Core.csproj" />
+      <ProjectReference Include="..\..\src\BookmarkSync.Core\BookmarkSync.Core.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...Tests/Configuration/ConfigManagerTests.cs → ...Tests/Configuration/ConfigManagerTests.cs b/...Tests/Configuration/ConfigManagerTests.cs → ...Tests/Configuration/ConfigManagerTests.cs
diff --git a/...kSync.Core.Tests/Entities/AccountTests.cs → ...kSync.Core.Tests/Entities/AccountTests.cs b/...kSync.Core.Tests/Entities/AccountTests.cs → ...kSync.Core.Tests/Entities/AccountTests.cs
diff --git a/...Sync.Core.Tests/Entities/BookmarkTests.cs → ...Sync.Core.Tests/Entities/BookmarkTests.cs b/...Sync.Core.Tests/Entities/BookmarkTests.cs → ...Sync.Core.Tests/Entities/BookmarkTests.cs
diff --git a/...nc.Core.Tests/Entities/Config/AppTests.cs → ...nc.Core.Tests/Entities/Config/AppTests.cs b/...nc.Core.Tests/Entities/Config/AppTests.cs → ...nc.Core.Tests/Entities/Config/AppTests.cs
diff --git a/...Tests/Entities/Config/BookmarkingTests.cs → ...Tests/Entities/Config/BookmarkingTests.cs b/...Tests/Entities/Config/BookmarkingTests.cs → ...Tests/Entities/Config/BookmarkingTests.cs
diff --git a/...re.Tests/Entities/Config/InstanceTests.cs → ...re.Tests/Entities/Config/InstanceTests.cs b/...re.Tests/Entities/Config/InstanceTests.cs → ...re.Tests/Entities/Config/InstanceTests.cs
diff --git a/BookmarkSync.Core.Tests/GlobalUsings.cs → ...s/BookmarkSync.Core.Tests/GlobalUsings.cs b/BookmarkSync.Core.Tests/GlobalUsings.cs → ...s/BookmarkSync.Core.Tests/GlobalUsings.cs
diff --git a/...arkSync.Core.Tests/Helpers/TestHelpers.cs → ...arkSync.Core.Tests/Helpers/TestHelpers.cs b/...arkSync.Core.Tests/Helpers/TestHelpers.cs → ...arkSync.Core.Tests/Helpers/TestHelpers.cs
diff --git a/...ore.Tests/Utilities/HtmlUtilitiesTests.cs → ...ore.Tests/Utilities/HtmlUtilitiesTests.cs b/...ore.Tests/Utilities/HtmlUtilitiesTests.cs → ...ore.Tests/Utilities/HtmlUtilitiesTests.cs
diff --git a/...Core.Tests/Utilities/UriUtilitiesTests.cs → ...Core.Tests/Utilities/UriUtilitiesTests.cs b/...Core.Tests/Utilities/UriUtilitiesTests.cs → ...Core.Tests/Utilities/UriUtilitiesTests.cs
diff --git a/.../BookmarkSync.Infrastructure.Tests.csproj → .../BookmarkSync.Infrastructure.Tests.csproj b/.../BookmarkSync.Infrastructure.Tests.csproj → .../BookmarkSync.Infrastructure.Tests.csproj
@@ -20,7 +20,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\BookmarkSync.Core.Tests\BookmarkSync.Core.Tests.csproj" />
-      <ProjectReference Include="..\BookmarkSync.Infrastructure\BookmarkSync.Infrastructure.csproj" />
+      <ProjectReference Include="..\..\src\BookmarkSync.Infrastructure\BookmarkSync.Infrastructure.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...Sync.Infrastructure.Tests/GlobalUsings.cs → ...Sync.Infrastructure.Tests/GlobalUsings.cs b/...Sync.Infrastructure.Tests/GlobalUsings.cs → ...Sync.Infrastructure.Tests/GlobalUsings.cs
diff --git a/...Tests/Services/BookmarkingServiceTests.cs → ...Tests/Services/BookmarkingServiceTests.cs b/...Tests/Services/BookmarkingServiceTests.cs → ...Tests/Services/BookmarkingServiceTests.cs