From 1296853983b1c739cab29454cf52a90e3ea51fd9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 18 Mar 2017 22:26:36 -0400
Subject: [PATCH] upadte package and move billing to full .net

---
 src/Api/Api.csproj                          | 12 +++--------
 src/Billing/Billing.csproj                  | 24 +++++++++++++++------
 src/Billing/Controllers/StripeController.cs |  2 +-
 src/Billing/Program.cs                      |  5 +----
 src/Billing/Properties/AssemblyInfo.cs      | 23 ++++++++++++++++++++
 src/Billing/Properties/launchSettings.json  |  4 ++--
 src/Billing/runtimeconfig.template.json     |  4 ++++
 7 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 src/Billing/Properties/AssemblyInfo.cs
 create mode 100644 src/Billing/runtimeconfig.template.json

diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index d20119f8c9..bfdcb676b5 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -17,12 +17,6 @@
     <RootNamespace>Bit.Api</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="Views">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
@@ -43,9 +37,9 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="1.0.5" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
-    <PackageReference Include="Serilog.Sinks.AzureDocumentDb" Version="3.5.18" />
-    <PackageReference Include="IdentityServer4" Version="1.2.1" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.5" />
+    <PackageReference Include="Serilog.Sinks.AzureDocumentDb" Version="3.6.1" />
+    <PackageReference Include="IdentityServer4" Version="1.3.1" />
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.1.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>
 
diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj
index bdad4df7d1..80848e4cd2 100644
--- a/src/Billing/Billing.csproj
+++ b/src/Billing/Billing.csproj
@@ -1,21 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>Billing</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Billing</PackageId>
+    <UserSecretsId>bitwarden-Billing</UserSecretsId>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <RootNamespace>Bit.Billing</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
   </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs
index 0e33d21353..a91dd9d1a7 100644
--- a/src/Billing/Controllers/StripeController.cs
+++ b/src/Billing/Controllers/StripeController.cs
@@ -6,7 +6,7 @@ namespace Bit.Billing.Controllers
     public class StripeController : Controller
     {
         [HttpPost("webhook")]
-        public void PostWebhook([FromBody]dynamic body)
+        public void PostWebhook([FromBody]dynamic body, [FromQuery] string key)
         {
 
         }
diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs
index 3881f4451a..9a3072e9e7 100644
--- a/src/Billing/Program.cs
+++ b/src/Billing/Program.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Builder;
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
 
 namespace Bit.Billing
@@ -14,7 +12,6 @@ namespace Bit.Billing
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
-                .UseApplicationInsights()
                 .Build();
 
             host.Run();
diff --git a/src/Billing/Properties/AssemblyInfo.cs b/src/Billing/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..fd565b5129
--- /dev/null
+++ b/src/Billing/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Bit.Billing")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("8bit Solutions LLC")]
+[assembly: AssemblyProduct("bitwarden")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("02bc2982-ed8d-4a6d-a41e-092b3daeb98a")]
diff --git a/src/Billing/Properties/launchSettings.json b/src/Billing/Properties/launchSettings.json
index 1e3b7b42dc..4771a24580 100644
--- a/src/Billing/Properties/launchSettings.json
+++ b/src/Billing/Properties/launchSettings.json
@@ -11,7 +11,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "/",
+      "launchUrl": "",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -19,7 +19,7 @@
     "Billing": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "/",
+      "launchUrl": "",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
diff --git a/src/Billing/runtimeconfig.template.json b/src/Billing/runtimeconfig.template.json
new file mode 100644
index 0000000000..ba2b29ab73
--- /dev/null
+++ b/src/Billing/runtimeconfig.template.json
@@ -0,0 +1,4 @@
+{
+  "gcServer": false,
+  "gcConcurrent": true
+}
\ No newline at end of file