Skip to content

Commit

Permalink
Merge pull request #60 from r-koubou/refactor/rename_application
Browse files Browse the repository at this point in the history
ディレクトリ名を Core→Standalone.Core へリネーム
  • Loading branch information
r-koubou authored Nov 14, 2023
2 parents 6668dc1 + eca0c15 commit b220150
Show file tree
Hide file tree
Showing 56 changed files with 145 additions and 108 deletions.
11 changes: 7 additions & 4 deletions KeySwitchManager/KeySwitchManager.sln
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{6DACDCA0-D
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{43EB4457-4958-43C4-80A0-5279D3D7EE6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Applications.Core", "Sources\Runtime\Applications\Core\Applications.Core.csproj", "{46F780BE-6786-43D4-BD6D-524C86CE2101}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Applications.Standalone.Core", "Sources\Runtime\Applications\Standalone.Core\Applications.Standalone.Core.csproj", "{46F780BE-6786-43D4-BD6D-524C86CE2101}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{4F7FDAC2-788F-437D-8498-7EA665B4B1CA}"
EndProject
Expand All @@ -54,6 +54,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Spreadsheet.ClosedX
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Applications.Blazor", "Sources\Runtime\Applications\Blazor\Applications.Blazor.csproj", "{30D5B2F8-59A6-408D-9697-1339B3943BA5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Standalone", "Standalone", "{929A1972-7C22-4700-A758-E99DF592BEBF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -155,17 +157,18 @@ Global
{B1FC3859-B078-471F-81F2-FBB0A25C974B} = {6DACDCA0-D8E1-4B58-ADEF-B4CE163B4483}
{D023CB3F-71C6-4925-9651-5FBA3BEF4404} = {6DACDCA0-D8E1-4B58-ADEF-B4CE163B4483}
{43EB4457-4958-43C4-80A0-5279D3D7EE6D} = {D67D4BCC-4359-4C74-9DBA-CB17BF358263}
{46F780BE-6786-43D4-BD6D-524C86CE2101} = {43EB4457-4958-43C4-80A0-5279D3D7EE6D}
{4F7FDAC2-788F-437D-8498-7EA665B4B1CA} = {D67D4BCC-4359-4C74-9DBA-CB17BF358263}
{505E86DD-3A59-4038-B109-22B3678D035E} = {4F7FDAC2-788F-437D-8498-7EA665B4B1CA}
{A5BA7AC2-8B16-440C-8EEB-2585187B3992} = {4F7FDAC2-788F-437D-8498-7EA665B4B1CA}
{978FDC47-DB1D-4B49-926E-0C8598044673} = {4F7FDAC2-788F-437D-8498-7EA665B4B1CA}
{8CAA9A5D-B054-42F7-8589-300866F8223A} = {4F7FDAC2-788F-437D-8498-7EA665B4B1CA}
{A934DE9A-C119-4069-BC70-1B355593ADD5} = {4F7FDAC2-788F-437D-8498-7EA665B4B1CA}
{634AFB40-DAF4-4A06-8C2C-95880D514C28} = {43EB4457-4958-43C4-80A0-5279D3D7EE6D}
{D35DCF05-CE3B-4258-AF17-5D73C2A9EE86} = {43EB4457-4958-43C4-80A0-5279D3D7EE6D}
{61CEC52E-8F9F-4A98-87B8-9AC0E764A3D9} = {B1FC3859-B078-471F-81F2-FBB0A25C974B}
{7ABC44B5-2B89-44C1-8B6C-951D3169E05B} = {B1FC3859-B078-471F-81F2-FBB0A25C974B}
{30D5B2F8-59A6-408D-9697-1339B3943BA5} = {43EB4457-4958-43C4-80A0-5279D3D7EE6D}
{929A1972-7C22-4700-A758-E99DF592BEBF} = {43EB4457-4958-43C4-80A0-5279D3D7EE6D}
{D35DCF05-CE3B-4258-AF17-5D73C2A9EE86} = {929A1972-7C22-4700-A758-E99DF592BEBF}
{46F780BE-6786-43D4-BD6D-524C86CE2101} = {929A1972-7C22-4700-A758-E99DF592BEBF}
{634AFB40-DAF4-4A06-8C2C-95880D514C28} = {929A1972-7C22-4700-A758-E99DF592BEBF}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Core\Applications.Core.csproj" />
<ProjectReference Include="..\Standalone.Core\Applications.Standalone.Core.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
@page "/create_db"

@inject FileDownloadService DownloadService

@using KeySwitchManager.Applications.Core.Controllers.Create
@using KeySwitchManager.Applications.Core.Controllers.Export
@using KeySwitchManager.Applications.Core.Views.LogView
@using KeySwitchManager.Applications.Blazor.Services
@using KeySwitchManager.Applications.Standalone.Core.Controllers.Create
@using KeySwitchManager.Applications.Standalone.Core.Controllers.Export
@using KeySwitchManager.Applications.Standalone.Core.Views.LogView

<PageTitle>Create Database File</PageTitle>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Core\Applications.Core.csproj" />
<ProjectReference Include="..\Standalone.Core\Applications.Standalone.Core.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Delete;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Delete;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Dump;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Dump;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Domain.KeySwitches.Models.Values;

namespace KeySwitchManager.Applications.CLI.Commands
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Find;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Find;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Domain.KeySwitches.Models.Values;

namespace KeySwitchManager.Applications.CLI.Commands
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Import;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Import;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommandLine;

using KeySwitchManager.Applications.Core.Controllers.Create;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Create;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.CLI.Commands
{
Expand Down
10 changes: 10 additions & 0 deletions KeySwitchManager/Sources/Runtime/Applications/CLI/VERSION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
KeySwitchManager CLI Application
==============================

## Assembly Version

0.5.3.0

## Build At

2023-11-15 02:17:29 +09:00

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>KeySwitchManager.Applications.Core</AssemblyName>
<Product>KeySwitchManager Application Core Library</Product>
<Nullable>enable</Nullable>
<RootNamespace>KeySwitchManager.Applications.Core</RootNamespace>
<RootNamespace>KeySwitchManager.Applications.Standalone.Core</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Threading;
using System.Threading.Tasks;

using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.Core.Controllers
namespace KeySwitchManager.Applications.Standalone.Core.Controllers
{
public static class ControlExecutor
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using KeySwitchManager.UseCase.KeySwitches.Create;
using KeySwitchManager.UseCase.KeySwitches.Export;

namespace KeySwitchManager.Applications.Core.Controllers.Create
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Create
{
public class CreateFileController : IController
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System;
using System.IO;

using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Commons.Data;
using KeySwitchManager.Infrastructures.Storage.KeySwitches;
using KeySwitchManager.Infrastructures.Storage.Spreadsheet.ClosedXml.KeySwitches.Export;
using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches.Export;
using KeySwitchManager.UseCase.KeySwitches.Export;

namespace KeySwitchManager.Applications.Core.Controllers.Create
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Create
{
public interface ICreateControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.UseCase.KeySwitches.Create;

namespace KeySwitchManager.Applications.Core.Controllers.Create
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Create
{
public class CreatePresenter : ICreatePresenter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.IO;

using KeySwitchManager.Applications.Core.Controllers.Export;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Infrastructures.Storage.KeySwitches;
using KeySwitchManager.Infrastructures.Storage.Spreadsheet.ClosedXml.KeySwitches.Export;
using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches.Export;
using KeySwitchManager.UseCase.KeySwitches.Create;
using KeySwitchManager.UseCase.KeySwitches.Export;

namespace KeySwitchManager.Applications.Core.Controllers.Create
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Create
{
public class CreateToStreamControllerFactory : ICreateToStreamControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System.IO;

using KeySwitchManager.Applications.Standalone.Core.Controllers.Export;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Create
{
public interface ICreateToStreamControllerFactory
{
IController Create( Stream targetStream, ExportSupportedFormat format, ILogTextView logTextView );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using KeySwitchManager.Interactors.KeySwitches;
using KeySwitchManager.UseCase.KeySwitches.Delete;

namespace KeySwitchManager.Applications.Core.Controllers.Delete
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Delete
{
public class DeleteController : IController
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using KeySwitchManager.Applications.Core.Helpers;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Helpers;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.Core.Controllers.Delete
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Delete
{
public static class DeleteControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.UseCase.KeySwitches.Delete;

namespace KeySwitchManager.Applications.Core.Controllers.Delete
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Delete
{
public class DeletePresenter : IDeletePresenter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

using RkHelper.System;

namespace KeySwitchManager.Applications.Core.Controllers.Dump
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Dump
{
public class DumpFileController : IController
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.IO;

using KeySwitchManager.Applications.Core.Helpers;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Helpers;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Commons.Data;
using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches.Export;
using KeySwitchManager.UseCase.KeySwitches.Dump;
using KeySwitchManager.UseCase.KeySwitches.Export;

namespace KeySwitchManager.Applications.Core.Controllers.Dump
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Dump
{
public class DumpFileControllerFactory : IDumpControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.UseCase.KeySwitches.Dump;

namespace KeySwitchManager.Applications.Core.Controllers.Dump
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Dump
{
public class DumpFilePresenter : IDumpFilePresenter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;

namespace KeySwitchManager.Applications.Core.Controllers.Dump
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Dump
{
public interface IDumpControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

using RkHelper.System;

namespace KeySwitchManager.Applications.Core.Controllers.Export
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Export
{
public class ExportFileController : IController
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;

using KeySwitchManager.Applications.Core.Helpers;
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Helpers;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.Commons.Data;
using KeySwitchManager.Domain.KeySwitches.Models.Values;
using KeySwitchManager.Infrastructures.Storage.Json.KeySwitches.Cakewalk;
Expand All @@ -13,7 +13,7 @@

using RkHelper.System;

namespace KeySwitchManager.Applications.Core.Controllers.Export
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Export
{
public class ExportFileControllerFactory : IExportControllerFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using KeySwitchManager.Applications.Core.Views.LogView;
using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
using KeySwitchManager.UseCase.KeySwitches.Export;

namespace KeySwitchManager.Applications.Core.Controllers.Export
namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Export
{
public class ExportFilePresenter : IExportFilePresenter
{
Expand Down
Loading

0 comments on commit b220150

Please sign in to comment.