benjaminramey/Twain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move some things around

Browse Source
This commit is contained in:
Benjamin Ramey
2024-04-05 08:58:32 -05:00
parent ff41d5203e
commit 653267744e
14 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Twain.sln
View File

@@ -14,22 +14,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownImport", "src\Modules\MarkdownImport\MarkdownImport.csproj", "{7B0477DA-BCD5-47ED-8B88-76D046524434}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRameyTheme", "src\BenRamey\BenRameyTheme\BenRameyTheme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRamey.Theme", "src\BenRamey\BenRameyTheme\BenRamey.Theme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3DA05917-02EA-4B04-9C48-B86C77A73584}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapTheme", "src\OAP\OapTheme\OapTheme.csproj", "{4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oap.Theme", "src\OAP\OapTheme\Oap.Theme.csproj", "{4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapApi.v1.Client", "src\OAP\OapApi.v1.Client\OapApi.v1.Client.csproj", "{5C30AB89-B3D4-468F-A029-3D26FECD0083}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OapApi.v1", "src\OAP\OapApi.v1\OapApi.v1.csproj", "{D414342C-EA8D-4115-BF22-DC8B62FB3CBF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverseasAutoProtection", "src\OAP\OverseasAutoProtection\OverseasAutoProtection.csproj", "{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oap.Content", "src\OAP\OverseasAutoProtection\Oap.Content.csproj", "{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAP", "OAP", "{E6EDFA50-6BFE-44C5-BEEB-18108A20F625}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BenRamey", "BenRamey", "{03C1520E-5ABF-4AF7-858B-8BE234ACE0FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oap", "src\OAP\Oap\Oap.csproj", "{E6BF474A-1186-496E-899E-2B7AA6180E30}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -68,6 +70,10 @@ Global
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F}.Release|Any CPU.Build.0 = Release|Any CPU
{E6BF474A-1186-496E-899E-2B7AA6180E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6BF474A-1186-496E-899E-2B7AA6180E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6BF474A-1186-496E-899E-2B7AA6180E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6BF474A-1186-496E-899E-2B7AA6180E30}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -80,6 +86,7 @@ Global
{5C30AB89-B3D4-468F-A029-3D26FECD0083} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
{D414342C-EA8D-4115-BF22-DC8B62FB3CBF} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
{D2827FDB-33A0-45E9-9F75-EB81BCE3833F} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
{E6BF474A-1186-496E-899E-2B7AA6180E30} = {E6EDFA50-6BFE-44C5-BEEB-18108A20F625}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0F7F9D4C-DF95-43AF-9E9A-DA09B5EE03C7}

0
src/BenRamey/BenRameyTheme/BenRameyTheme.csproj → src/BenRamey/BenRameyTheme/BenRamey.Theme.csproj
View File

14
src/OAP/Oap/Oap.csproj Normal file
View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
</ItemGroup>
</Project>

2
src/OAP/OverseasAutoProtection/OapApplication/OapApplicationPart.cs → src/OAP/Oap/OapApplication/OapApplicationPart.cs
View File

@@ -1,7 +1,7 @@
using OrchardCore.ContentFields.Fields;
using OrchardCore.ContentManagement;
namespace OverseasAutoProtection.OapApplication;
namespace Oap.OapApplication;
public class OapApplicationPart : ContentPart
{
public TextField ApplicationId { get; set; } = new();

2
src/OAP/OverseasAutoProtection/OapApplication/OapApplicationStatuses.cs → src/OAP/Oap/OapApplication/OapApplicationStatuses.cs
View File

@@ -1,4 +1,4 @@
namespace OverseasAutoProtection.OapApplication;
namespace Oap.OapApplication;
public static class OapApplicationStatuses
{

2
src/OAP/OapApi.v1/OapApi.v1.csproj
View File

@@ -18,7 +18,7 @@
<ItemGroup>
<ProjectReference Include="..\..\OapApi.v1.Client\OapApi.v1.Client.csproj" />
<ProjectReference Include="..\OapApi.v1.Client\OapApi.v1.Client.csproj" />
<ProjectReference Include="..\OverseasAutoProtection\OverseasAutoProtection.csproj" />
<ProjectReference Include="..\OverseasAutoProtection\Oap.Content.csproj" />
</ItemGroup>
</Project>

8
src/OAP/OapTheme/OapTheme.csproj → src/OAP/OapTheme/Oap.Theme.csproj
View File

@@ -7,12 +7,6 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Remove="Views\HtmlBodyPart.cshtml" />
<EmbeddedResource Remove="Views\Layout.cshtml" />
<EmbeddedResource Remove="Views\_ViewImports.cshtml" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
@@ -35,7 +29,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OverseasAutoProtection\OverseasAutoProtection.csproj" />
<ProjectReference Include="..\Oap\Oap.csproj" />
</ItemGroup>
</Project>

2
src/OAP/OapTheme/ResourceManagementOptionsConfiguration.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.Options;
using OrchardCore.ResourceManagement;
namespace OapTheme;
namespace Oap.Theme;
public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
{

2
src/OAP/OapTheme/Startup.cs
View File

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Options;
using OrchardCore.Modules;
using OrchardCore.ResourceManagement;
namespace OapTheme;
namespace Oap.Theme;
public class Startup : StartupBase
{

2
src/OAP/OverseasAutoProtection/ContentTypes.cs
View File

@@ -1,4 +1,4 @@
namespace OverseasAutoProtection;
namespace Oap.Content;
public static class ContentTypes
{
public const string OapApplication = nameof(OapApplication);

6
src/OAP/OverseasAutoProtection/Migrations.cs
View File

@@ -1,4 +1,5 @@
using OrchardCore.Autoroute.Models;
using Oap.OapApplication;
using OrchardCore.Autoroute.Models;
using OrchardCore.ContentFields.Fields;
using OrchardCore.ContentFields.Settings;
using OrchardCore.ContentManagement.Metadata;
@@ -10,9 +11,8 @@ using OrchardCore.Html.Settings;
using OrchardCore.Lists.Models;
using OrchardCore.Mvc.Utilities;
using OrchardCore.Title.Models;
using OverseasAutoProtection.OapApplication;
namespace OverseasAutoProtection;
namespace Oap.Content;
public class Migrations : DataMigration
{

4
src/OAP/OverseasAutoProtection/OverseasAutoProtection.csproj → src/OAP/OverseasAutoProtection/Oap.Content.csproj
View File

@@ -20,4 +20,8 @@
<PackageReference Include="OrchardCore.Title" Version="1.8.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Oap\Oap.csproj" />
</ItemGroup>
</Project>

4
src/OAP/OverseasAutoProtection/Startup.cs
View File

@@ -1,10 +1,10 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Oap.OapApplication;
using OrchardCore.Data.Migration;
using OverseasAutoProtection.OapApplication;
namespace OverseasAutoProtection;
namespace Oap.Content;
public class Startup : OrchardCore.Modules.StartupBase
{

6
src/Twain.Web/Twain.Web.csproj
View File

@@ -24,12 +24,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BenRamey\BenRameyTheme\BenRameyTheme.csproj" />
<ProjectReference Include="..\BenRamey\BenRameyTheme\BenRamey.Theme.csproj" />
<ProjectReference Include="..\Modules\MarkdownImport\MarkdownImport.csproj" />
<ProjectReference Include="..\OAP\OapApi.v1.Client\OapApi.v1.Client.csproj" />
<ProjectReference Include="..\OAP\OapApi.v1\OapApi.v1.csproj" />
<ProjectReference Include="..\OAP\OapTheme\OapTheme.csproj" />
<ProjectReference Include="..\OAP\OverseasAutoProtection\OverseasAutoProtection.csproj" />
<ProjectReference Include="..\OAP\OapTheme\Oap.Theme.csproj" />
<ProjectReference Include="..\OAP\OverseasAutoProtection\Oap.Content.csproj" />
</ItemGroup>
</Project>