From 260ae3740244ea09e01d11d8df268a7992e31bd9 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mlorbe@microsoft.com>
Date: Thu, 1 Dec 2016 11:28:39 -0800
Subject: [PATCH 1/2] Move GlobalExclude out of any conditions

---
 src/BaseTemplates/StarterWeb/StarterWeb.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/BaseTemplates/StarterWeb/StarterWeb.csproj b/src/BaseTemplates/StarterWeb/StarterWeb.csproj
index 095adb51..6f5086d1 100644
--- a/src/BaseTemplates/StarterWeb/StarterWeb.csproj
+++ b/src/BaseTemplates/StarterWeb/StarterWeb.csproj
@@ -9,13 +9,16 @@
 
   <PropertyGroup>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
-    <GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;jspm_packages\**;bower_components\**;**\*.user;**\*.*proj</GlobalExclude>
   </PropertyGroup>$endif$$if$ ($aspnet_useusersecrets$ == true)
 
   <PropertyGroup>
     <UserSecretsId>aspnet-$safeprojectname$-$guid2$</UserSecretsId>
   </PropertyGroup>$endif$
 
+  <PropertyGroup>
+    <GlobalExclude>$(GlobalExclude);bin\**;obj\**;node_modules\**;jspm_packages\**;bower_components\**;**\*.user;**\*.*proj</GlobalExclude>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="**\*" />
     <Compile Include="**\*.cs" />

From 909ae46760100cb21d7f1203ce58e6fa22ef4974 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mlorbe@microsoft.com>
Date: Thu, 1 Dec 2016 12:06:50 -0800
Subject: [PATCH 2/2] Fix casing of web sdk package

---
 src/BaseTemplates/EmptyWeb/EmptyWeb.csproj     | 2 +-
 src/BaseTemplates/StarterWeb/StarterWeb.csproj | 2 +-
 src/BaseTemplates/WebAPI/WebAPI.csproj         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BaseTemplates/EmptyWeb/EmptyWeb.csproj b/src/BaseTemplates/EmptyWeb/EmptyWeb.csproj
index 6309a929..f34fc7e0 100644
--- a/src/BaseTemplates/EmptyWeb/EmptyWeb.csproj
+++ b/src/BaseTemplates/EmptyWeb/EmptyWeb.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.Net.Sdk.Web">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
diff --git a/src/BaseTemplates/StarterWeb/StarterWeb.csproj b/src/BaseTemplates/StarterWeb/StarterWeb.csproj
index 6f5086d1..137f0ce3 100644
--- a/src/BaseTemplates/StarterWeb/StarterWeb.csproj
+++ b/src/BaseTemplates/StarterWeb/StarterWeb.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.Net.Sdk.Web">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
diff --git a/src/BaseTemplates/WebAPI/WebAPI.csproj b/src/BaseTemplates/WebAPI/WebAPI.csproj
index 2581edf2..ec5dbc8f 100644
--- a/src/BaseTemplates/WebAPI/WebAPI.csproj
+++ b/src/BaseTemplates/WebAPI/WebAPI.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.Net.Sdk.Web">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>