Reactivate google storage

This commit is contained in:
nicolas.dorier
2020-01-12 13:39:42 +09:00
parent d94b016e63
commit 3449bba4b3
3 changed files with 5 additions and 5 deletions

View File

@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Build\**" /> <Compile Remove="Build\**" />
<Compile Remove="Storage\Services\Providers\GoogleCloudStorage\**" Condition="'$(SupportGoogleStorage)' == 'true'" /> <Compile Remove="Storage\Services\Providers\GoogleCloudStorage\**" Condition="'$(SupportGoogleStorage)' == 'false'" />
<Compile Remove="wwwroot\bundles\jqueryvalidate\**" /> <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
<Compile Remove="wwwroot\vendor\jquery-nice-select\**" /> <Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
<Content Remove="Build\**" /> <Content Remove="Build\**" />

View File

@@ -10,7 +10,7 @@ using BTCPayServer.Storage.Services.Providers.AzureBlobStorage;
using BTCPayServer.Storage.Services.Providers.AzureBlobStorage.Configuration; using BTCPayServer.Storage.Services.Providers.AzureBlobStorage.Configuration;
using BTCPayServer.Storage.Services.Providers.FileSystemStorage; using BTCPayServer.Storage.Services.Providers.FileSystemStorage;
using BTCPayServer.Storage.Services.Providers.FileSystemStorage.Configuration; using BTCPayServer.Storage.Services.Providers.FileSystemStorage.Configuration;
#if SupportGoogleStorage #if SUPPORT_GOOGLE_STORAGE
using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage; using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage;
using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage.Configuration; using BTCPayServer.Storage.Services.Providers.GoogleCloudStorage.Configuration;
#endif #endif
@@ -221,7 +221,7 @@ namespace BTCPayServer.Controllers
case AmazonS3FileProviderService fileProviderService: case AmazonS3FileProviderService fileProviderService:
return View(nameof(EditAmazonS3StorageProvider), return View(nameof(EditAmazonS3StorageProvider),
fileProviderService.GetProviderConfiguration(data)); fileProviderService.GetProviderConfiguration(data));
#if SupportGoogleStorage #if SUPPORT_GOOGLE_STORAGE
case GoogleCloudStorageFileProviderService fileProviderService: case GoogleCloudStorageFileProviderService fileProviderService:
return View(nameof(EditGoogleCloudStorageStorageProvider), return View(nameof(EditGoogleCloudStorageStorageProvider),
fileProviderService.GetProviderConfiguration(data)); fileProviderService.GetProviderConfiguration(data));
@@ -252,7 +252,7 @@ namespace BTCPayServer.Controllers
{ {
return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.AmazonS3); return await SaveStorageProvider(viewModel, BTCPayServer.Storage.Models.StorageProvider.AmazonS3);
} }
#if SupportGoogleStorage #if SUPPORT_GOOGLE_STORAGE
[HttpPost("server/storage/GoogleCloudStorage")] [HttpPost("server/storage/GoogleCloudStorage")]
public async Task<IActionResult> EditGoogleCloudStorageStorageProvider( public async Task<IActionResult> EditGoogleCloudStorageStorageProvider(
GoogleCloudStorageConfiguration viewModel) GoogleCloudStorageConfiguration viewModel)

View File

@@ -4,7 +4,7 @@
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework> <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
<NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn> <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<SupportGoogleStorage>false</SupportGoogleStorage> <SupportGoogleStorage>true</SupportGoogleStorage>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(SupportGoogleStorage)' == 'true'"> <PropertyGroup Condition="'$(SupportGoogleStorage)' == 'true'">
<DefineConstants>$(DefineConstants);SUPPORT_GOOGLE_STORAGE</DefineConstants> <DefineConstants>$(DefineConstants);SUPPORT_GOOGLE_STORAGE</DefineConstants>