Merge pull request #44 from pauldotknopf/revert-43-master

Revert "upgrade to vstudio 2017, project.json is deprecated"
pauldotknopf · Feb 2, 2018 · 89f3243 · 89f3243
2 parents 60584d9 + 71113d9
commit 89f3243
Show file tree

Hide file tree

Showing 17 changed files with 377 additions and 11,306 deletions.
diff --git a/README.md b/README.md
@@ -16,15 +16,6 @@ This approach is great for front-end developers because it gives them complete c
 
 ## Getting started
 
-### Note: Windows
-Requires python due to usage of node-gyp to compile sass libs.
-Elevated command prompt: 
-```bash
-npm install --global --production windows-build-tools
-```
-That should be done before proceeding with loading Visual Studio, if you want to use VStudio to automatically install dependencies. 
-
-### Yeoman
 The best way to get started with this project is to use the Yeoman generator.
 
 ```bash

diff --git a/ReactBoilerplate.sln b/ReactBoilerplate.sln
@@ -1,12 +1,16 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2024
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C23ABA50-98BF-4132-B6F6-43605AD05B0F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BCDEFAE7-02D5-49F6-9054-511C7B472A27}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactBoilerplate", "src\ReactBoilerplate\ReactBoilerplate.csproj", "{A9424E07-13A1-49AF-BE65-EBCE6B4F343A}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactBoilerplate", "src\ReactBoilerplate\ReactBoilerplate.xproj", "{A9424E07-13A1-49AF-BE65-EBCE6B4F343A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,7 +29,4 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{A9424E07-13A1-49AF-BE65-EBCE6B4F343A} = {C23ABA50-98BF-4132-B6F6-43605AD05B0F}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {966BFC76-8207-4754-A98E-B42C395FEB04}
-	EndGlobalSection
 EndGlobal
diff --git a/global.json b/global.json
@@ -0,0 +1,3 @@
+{
+  "projects": [ "src", "test" ]
+}
diff --git a/src/ReactBoilerplate/.editorconfig b/src/ReactBoilerplate/.editorconfig
@@ -2,11 +2,8 @@
 root = true
 
 [*]
-indent_style = tab
-
-[*.js]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
diff --git a/src/ReactBoilerplate/Controllers/Account/ServerController.cs b/src/ReactBoilerplate/Controllers/Account/ServerController.cs
@@ -127,8 +127,8 @@ public async Task<IActionResult> ExternalLoginCallback(bool autoLogin = true)
             if (string.IsNullOrEmpty(info.ProviderDisplayName))
             {
                 info.ProviderDisplayName =
-                    (await _signInManager.GetExternalAuthenticationSchemesAsync())
-                        .SingleOrDefault(x => x.Name.Equals(info.LoginProvider))?
+                    _signInManager.GetExternalAuthenticationSchemes()
+                        .SingleOrDefault(x => x.AuthenticationScheme.Equals(info.LoginProvider))?
                         .DisplayName;
                 if (string.IsNullOrEmpty(info.ProviderDisplayName))
                 {

diff --git a/src/ReactBoilerplate/Controllers/BaseController.cs b/src/ReactBoilerplate/Controllers/BaseController.cs
@@ -32,14 +32,12 @@ protected async Task<GlobalState> BuildState()
             }
 
             state.ExternalLogin.LoginProviders
-                .AddRange(
-                  (await _signInManager.GetExternalAuthenticationSchemesAsync())
-                  .Select(x => new ExternalLoginState.ExternalLoginProvider
-                  {
-                      Scheme = x.Name,
-                      DisplayName = x.DisplayName
-                  })
-                );
+                .AddRange(_signInManager.GetExternalAuthenticationSchemes()
+                .Select(x => new ExternalLoginState.ExternalLoginProvider
+                {
+                    Scheme = x.AuthenticationScheme,
+                    DisplayName = x.DisplayName
+                }));
 
             return state;
         }

diff --git a/src/ReactBoilerplate/Controllers/Manage/ApiController.cs b/src/ReactBoilerplate/Controllers/Manage/ApiController.cs
@@ -232,16 +232,15 @@ private async Task<ExternalLoginsState> GetExternalLoginsState()
             foreach (var userLogin in userLogins.Where(userLogin => string.IsNullOrEmpty(userLogin.ProviderDisplayName)))
             {
                 userLogin.ProviderDisplayName =
-                    (await _signInManager.GetExternalAuthenticationSchemesAsync())
-                        .SingleOrDefault(x => x.Name.Equals(userLogin.LoginProvider))?
+                    _signInManager.GetExternalAuthenticationSchemes()
+                        .SingleOrDefault(x => x.AuthenticationScheme.Equals(userLogin.LoginProvider))?
                         .DisplayName;
                 if (string.IsNullOrEmpty(userLogin.ProviderDisplayName))
                 {
                     userLogin.ProviderDisplayName = userLogin.LoginProvider;
                 }
             }
-            var otherLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync())
-              .Where(auth => userLogins.All(ul => auth.Name != ul.LoginProvider)).ToList();
+            var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList();
 
             return new ExternalLoginsState
             {
@@ -254,7 +253,7 @@ private async Task<ExternalLoginsState> GetExternalLoginsState()
                 OtherLogins = otherLogins.Select(x => new ExternalLoginState.ExternalLoginProvider
                 {
                     DisplayName = x.DisplayName,
-                    Scheme = x.Name
+                    Scheme = x.AuthenticationScheme
                 }).ToList()
             };
         }

diff --git a/src/ReactBoilerplate/Models/ApplicationUser.cs b/src/ReactBoilerplate/Models/ApplicationUser.cs
@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 
 namespace ReactBoilerplate.Models

diff --git a/src/ReactBoilerplate/ReactBoilerplate.csproj b/src/ReactBoilerplate/ReactBoilerplate.csproj
diff --git a/src/ReactBoilerplate/ReactBoilerplate.xproj b/src/ReactBoilerplate/ReactBoilerplate.xproj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>a9424e07-13a1-49af-be65-ebce6b4f343a</ProjectGuid>
+    <RootNamespace>ReactBoilerplate</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <DnxInvisibleContent Include="bower.json" />
+    <DnxInvisibleContent Include=".bowerrc" />
+    <DnxInvisibleContent Include="package.json" />
+    <DnxInvisibleContent Include=".npmrc" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>