Skip to content

Commit

Permalink
backup.core: move backup.core
Browse files Browse the repository at this point in the history
  • Loading branch information
SuhorukovAnton committed Sep 2, 2021
1 parent b4c5edf commit 8171563
Show file tree
Hide file tree
Showing 86 changed files with 52 additions and 27 deletions.
20 changes: 10 additions & 10 deletions ASC.Web.sln
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.ClearEvents", "common\s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.CRM.BackgroundTasks", "products\ASC.CRM\BackgroundTasks\ASC.CRM.BackgroundTasks.csproj", "{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup", "common\services\ASC.Data.Backup\Backup\ASC.Data.Backup.csproj", "{F5CD54D4-E66F-461C-96E2-B617E3324E42}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup.Core", "common\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj", "{F5D9DE01-06CD-4881-9F41-46882E9ED45C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup.Core", "common\services\ASC.Data.Backup\Core\ASC.Data.Backup.Core.csproj", "{45117C68-5197-4AFF-9FC1-1E86E718B727}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup", "common\services\ASC.Data.Backup\ASC.Data.Backup.csproj", "{027EEE53-7491-48F4-B467-6404D68798A7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -267,14 +267,14 @@ Global
{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Release|Any CPU.Build.0 = Release|Any CPU
{F5CD54D4-E66F-461C-96E2-B617E3324E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5CD54D4-E66F-461C-96E2-B617E3324E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5CD54D4-E66F-461C-96E2-B617E3324E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5CD54D4-E66F-461C-96E2-B617E3324E42}.Release|Any CPU.Build.0 = Release|Any CPU
{45117C68-5197-4AFF-9FC1-1E86E718B727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45117C68-5197-4AFF-9FC1-1E86E718B727}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45117C68-5197-4AFF-9FC1-1E86E718B727}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45117C68-5197-4AFF-9FC1-1E86E718B727}.Release|Any CPU.Build.0 = Release|Any CPU
{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5D9DE01-06CD-4881-9F41-46882E9ED45C}.Release|Any CPU.Build.0 = Release|Any CPU
{027EEE53-7491-48F4-B467-6404D68798A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{027EEE53-7491-48F4-B467-6404D68798A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{027EEE53-7491-48F4-B467-6404D68798A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{027EEE53-7491-48F4-B467-6404D68798A7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<None Remove="protos\BackupProgress.proto" />
<None Remove="protos\DeleteSchedule.proto" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
<ProjectReference Include="..\..\..\ASC.Data.Storage\ASC.Data.Storage.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
Expand All @@ -32,6 +28,11 @@
<PackageReference Include="SharpZipLib" Version="1.3.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
<ProjectReference Include="..\ASC.Data.Storage\ASC.Data.Storage.csproj" />
</ItemGroup>

<ItemGroup>
<Protobuf Include="protos\BackupProgress.proto" />
<Protobuf Include="protos\DeleteSchedule.proto" />
Expand Down
27 changes: 27 additions & 0 deletions common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<RazorCompileOnBuild>false</RazorCompileOnBuild>
<GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
<ItemGroup>
<ReferencePath Condition="'%(FileName)' == 'MySqlConnector'">
<Aliases>MySqlConnectorAlias</Aliases>
</ReferencePath>
</ItemGroup>

</Target>
<ItemGroup>
<ProjectReference Include="..\..\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions common/services/ASC.Data.Backup/Backup/ASC.Data.Backup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Core\ASC.Data.Backup.Core.csproj" />
</ItemGroup>
<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
<ItemGroup>
<ReferencePath Condition="'%(FileName)' == 'MySqlConnector'">
Expand Down
3 changes: 0 additions & 3 deletions common/services/ASC.Data.Backup/Backup/appsettings.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"launchBrowser": false,
"launchUrl": "http://localhost:5012/api/2.0/backup/backuptmp",
"environmentVariables": {
"$STORAGE_ROOT": "../../../../Data",
"$STORAGE_ROOT": "../../../Data",
"log__name": "backup",
"log__dir": "../../../../Logs",
"core__products__folder": "../../../../products",
"log__dir": "../../../Logs",
"core__products__folder": "../../../products",
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_URLS": "http://localhost:5012"
}
Expand All @@ -18,10 +18,10 @@
"launchBrowser": false,
"launchUrl": "http://localhost:5012/api/2.0/backup/backuptmp",
"environmentVariables": {
"$STORAGE_ROOT": "../../../../Data",
"$STORAGE_ROOT": "../../../Data",
"log__name": "backup",
"log__dir": "../../../../Logs",
"core__products__folder": "../../../../products",
"log__dir": "../../../Logs",
"core__products__folder": "../../../products",
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_URLS": "http://localhost:5012"
},
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions common/services/ASC.Data.Backup/appsettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"pathToConf": "..\\..\\..\\config"
}
2 changes: 1 addition & 1 deletion web/ASC.Web.Api/ASC.Web.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<ItemGroup>
<ProjectReference Include="..\..\common\ASC.Core.Common\ASC.Core.Common.csproj" />
<ProjectReference Include="..\..\common\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj" />
<ProjectReference Include="..\..\common\services\ASC.AuditTrail\ASC.AuditTrail.csproj" />
<ProjectReference Include="..\..\common\services\ASC.Data.Backup\Core\ASC.Data.Backup.Core.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 8171563

Please sign in to comment.