Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

update projects to net47

Browse Source
This commit is contained in:
Kyle Spearrin 2017-11-16 11:01:49 -05:00
parent f18e517b1a
commit f2e2db52a1
6 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Api/Api.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.14.2</Version>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
<RootNamespace>Bit.Api</RootNamespace>
<UserSecretsId>bitwarden-Api</UserSecretsId>
</PropertyGroup>
@ -15,7 +15,6 @@
<PackageReference Include="jsreport.AspNetCore" Version="1.0.0" />
<PackageReference Include="jsreport.Binary" Version="1.8.2" />
<PackageReference Include="jsreport.Local" Version="1.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
@ -25,11 +24,6 @@
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />

8
src/Core/Core.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
<RootNamespace>Bit.Core</RootNamespace>
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
</PropertyGroup>
@ -75,11 +75,7 @@
<PackageReference Include="YubicoDotNetClient" Version="1.2.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">
<PackageReference Include="Microsoft.Azure.NotificationHubs" Version="1.0.9" />
</ItemGroup>

2
src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
View File

@ -1,4 +1,4 @@
#if NET461
#if NET47
using System;
using System.Threading.Tasks;
using Bit.Core.Models.Table;

2
src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
View File

@ -1,4 +1,4 @@
#if NET461
#if NET47
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Azure.NotificationHubs;

2
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -78,7 +78,7 @@ namespace Bit.Core.Utilities
services.AddSingleton<IPushNotificationService, RelayPushNotificationService>();
services.AddSingleton<IPushRegistrationService, RelayPushRegistrationService>();
}
#if NET461
#if NET47
else if(!globalSettings.SelfHosted)
{
services.AddSingleton<IPushNotificationService, NotificationHubPushNotificationService>();

2
src/Identity/Identity.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.14.2</Version>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;net47</TargetFrameworks>
<RootNamespace>Bit.Identity</RootNamespace>
<UserSecretsId>bitwarden-Identity</UserSecretsId>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>