Merge pull request #733 from mlorbetske/FixGlobalExcludesForStarterWeb

Move GlobalExclude out of any conditions
aspnet · Dec 1, 2016 · 1cfb89c · 1cfb89c
2 parents 18540fa + 909ae46
commit 1cfb89c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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>
@@ -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" />

diff --git 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>