From f2e2db52a1b2768624c1facf7deba90e5390d81d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 16 Nov 2017 11:01:49 -0500
Subject: [PATCH] update projects to net47

---
 src/Api/Api.csproj                                        | 8 +-------
 src/Core/Core.csproj                                      | 8 ++------
 .../NotificationHubPushNotificationService.cs             | 2 +-
 .../NotificationHubPushRegistrationService.cs             | 2 +-
 src/Core/Utilities/ServiceCollectionExtensions.cs         | 2 +-
 src/Identity/Identity.csproj                              | 2 +-
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 7798110c0c..cbd862e923 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -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" />
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index a183f69ec9..a9b70e6aca 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -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>
 
diff --git a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
index 9bf1229389..4e42c20267 100644
--- a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
@@ -1,4 +1,4 @@
-#if NET461
+#if NET47
 using System;
 using System.Threading.Tasks;
 using Bit.Core.Models.Table;
diff --git a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
index 9a9c61b962..be776725bf 100644
--- a/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushRegistrationService.cs
@@ -1,4 +1,4 @@
-#if NET461
+#if NET47
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Azure.NotificationHubs;
diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs
index b93958fcab..fbb184c9f1 100644
--- a/src/Core/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Core/Utilities/ServiceCollectionExtensions.cs
@@ -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>();
diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj
index 853fcaf9ea..94b0a54a46 100644
--- a/src/Identity/Identity.csproj
+++ b/src/Identity/Identity.csproj
@@ -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>