diff --git a/bitwarden-core.sln b/bitwarden-core.sln
index 4f452b5c3..112f14c38 100644
--- a/bitwarden-core.sln
+++ b/bitwarden-core.sln
@@ -1,25 +1,24 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{458155D3-BCBC-481D-B37A-40D2ED10F0A4}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
- global.json = global.json
NuGet.Config = NuGet.Config
README.md = README.md
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Core", "src\Core\Core.xproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Api", "src\Api\Api.xproj", "{E8548AD6-7FB0-439A-8EB5-549A10336D2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj", "{E8548AD6-7FB0-439A-8EB5-549A10336D2D}"
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Sql", "src\Sql\Sql.sqlproj", "{58554E52-FDEC-4832-AFF9-302B01E08DCA}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mail", "src\Mail\Mail.xproj", "{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mail", "src\Mail\Mail.csproj", "{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/global.json b/global.json
deleted file mode 100644
index 9d09ab54c..000000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": [ "src", "test" ],
- "sdk": {
- "version": "1.0.0-preview2-003131"
- }
-}
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
new file mode 100644
index 000000000..ce52be740
--- /dev/null
+++ b/src/Api/Api.csproj
@@ -0,0 +1,55 @@
+
+
+
+ 1.3.4
+ net461
+ true
+ Api
+ Exe
+ Api
+ aspnet5-bitwarden-Api
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Api/Api.xproj b/src/Api/Api.xproj
deleted file mode 100644
index 687ab808a..000000000
--- a/src/Api/Api.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- e8548ad6-7fb0-439a-8eb5-549a10336d2d
- Bit.Api
- .\obj
- .\bin\
- v4.6
-
-
- 2.0
- 4000
-
-
-
\ No newline at end of file
diff --git a/src/Api/project.json b/src/Api/project.json
deleted file mode 100644
index 5ac8b0cdd..000000000
--- a/src/Api/project.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "userSecretsId": "aspnet5-bitwarden-Api",
- "version": "1.3.4",
-
- "dependencies": {
- "Core": {
- "target": "project"
- },
- "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
- "Microsoft.AspNetCore.Mvc": "1.1.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
- "Microsoft.AspNetCore.StaticFiles": "1.1.0",
- "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0",
- "Microsoft.Extensions.Logging": "1.1.0",
- "Microsoft.Extensions.Logging.Console": "1.1.0",
- "Microsoft.Extensions.Logging.Debug": "1.1.0",
- "Microsoft.AspNetCore.Cors": "1.1.0",
- "Microsoft.AspNetCore.Diagnostics": "1.1.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
- "Microsoft.Extensions.Configuration.Binder": "1.1.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
- "AspNetCoreRateLimit": "1.0.5",
- "Serilog.Extensions.Logging": "1.3.1",
- "Serilog.Sinks.AzureDocumentDb": "3.5.17",
- "IdentityServer4": "1.0.1",
- "IdentityServer4.AccessTokenValidation": "1.0.2"
- },
-
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
- "version": "1.0.0-preview2-final",
- "imports": "portable-net45+win8+dnxcore50"
- }
- },
-
- "frameworks": {
- "net461": {}
- },
-
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "runtimeOptions": {
- "gcServer": false,
- "gcConcurrent": true
- },
-
- "publishOptions": {
- "include": [
- "wwwroot",
- "Views",
- "settings.json",
- "settings.Production.json",
- "settings.Staging.json",
- "web.config"
- ]
- },
-
- "scripts": {
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
diff --git a/src/Api/runtimeconfig.template.json b/src/Api/runtimeconfig.template.json
new file mode 100644
index 000000000..ba2b29ab7
--- /dev/null
+++ b/src/Api/runtimeconfig.template.json
@@ -0,0 +1,4 @@
+{
+ "gcServer": false,
+ "gcConcurrent": true
+}
\ No newline at end of file
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
new file mode 100644
index 000000000..488e66c35
--- /dev/null
+++ b/src/Core/Core.csproj
@@ -0,0 +1,34 @@
+
+
+
+ net461
+ Core
+ Core
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Core/Core.xproj b/src/Core/Core.xproj
deleted file mode 100644
index 428cf0e84..000000000
--- a/src/Core/Core.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 3973d21b-a692-4b60-9b70-3631c057423a
- Bit.Core
- .\obj
- .\bin\
- v4.6
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Core/project.json b/src/Core/project.json
deleted file mode 100644
index 9aca94a67..000000000
--- a/src/Core/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "dependencies": {
- "Microsoft.AspNetCore.Identity": "1.1.0",
- "Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.0",
- "Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0",
- "Dapper": "1.50.2",
- "DataTableProxy": "1.2.0",
- "Sendgrid": "6.3.4",
- "PushSharp": "4.0.10",
- "WindowsAzure.Storage": "8.0.0",
- "Otp.NET": "1.0.1"
- },
-
- "frameworks": {
- "net461": {
- "frameworkAssemblies": {
- "System.ComponentModel.DataAnnotations": "4.0.0.0",
- "System.Data": "4.0.0.0"
- }
- }
- }
-}
diff --git a/src/Mail/Mail.csproj b/src/Mail/Mail.csproj
new file mode 100644
index 000000000..8087f3afd
--- /dev/null
+++ b/src/Mail/Mail.csproj
@@ -0,0 +1,26 @@
+
+
+
+ netcoreapp1.1
+ true
+ Mail
+ Exe
+ Mail
+ 1.1.1
+ $(PackageTargetFallback);dotnet5.6;portable-net45+win8
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mail/Mail.xproj b/src/Mail/Mail.xproj
deleted file mode 100644
index 78614f383..000000000
--- a/src/Mail/Mail.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- b78a6c74-1a24-48c6-802a-13be3e4daff1
- Bit.Mail
- .\obj
- .\bin\
- v4.6.1
-
-
- 2.0
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Mail/project.json b/src/Mail/project.json
deleted file mode 100644
index f659a5310..000000000
--- a/src/Mail/project.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.1.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
- "Microsoft.AspNetCore.StaticFiles": "1.1.0",
- "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0"
- },
-
- "tools": {
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
- },
-
- "frameworks": {
- "netcoreapp1.1": {
- "imports": [
- "dotnet5.6",
- "portable-net45+win8"
- ]
- }
- },
-
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true,
- "define": [ "DEBUG" ]
- },
-
- "runtimeOptions": {
- "configProperties": {
- "System.GC.Server": true
- }
- },
-
- "publishOptions": {
- "include": [
- "wwwroot",
- "web.config"
- ]
- },
-
- "scripts": {
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}