Win2D.proj now detects which command prompt it is being run from

Tidied up build.cmd to not try and override the nuget package name (as this no longer works)

Win2D.proj

@@ -26,7 +26,7 @@
   <PropertyGroup>
     <Has81Sdk Condition="'$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)' != ''">true</Has81Sdk>
     <Has10Sdk Condition="'$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)' != ''">true</Has10Sdk>
-
+    <RunningFrom2015Prompt Condition="'$(VisualStudioVersion)' &gt;= '14.0'">true</RunningFrom2015Prompt>
     <ShouldRunUAPTests>false</ShouldRunUAPTests>
     <ShouldRunUAPTests Condition="'$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@CurrentBuildNumber)' &gt;= '10000'">true</ShouldRunUAPTests>
   </PropertyGroup>
@@ -43,7 +43,7 @@
     <SkippedBuildPhone>true</SkippedBuildPhone>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Has10Sdk)' != 'true' and $(BuildUAP)">
+  <PropertyGroup Condition="('$(Has10Sdk)' != 'true' or '$(RunningFrom2015Prompt)' != 'true') and $(BuildUAP)">
     <BuildUAP>false</BuildUAP>
     <SkippedBuildUAP>true</SkippedBuildUAP>
   </PropertyGroup>
@@ -363,8 +363,11 @@
     <Warning Condition="'$(SkippedBuildPhone)' == 'true'"
              Text="Skipped building for Windows Phone 8.1 since Windows 8.1 SDK is not installed." />
 
-    <Warning Condition="'$(SkippedBuildUAP)' == 'true'"
+    <Warning Condition="'$(SkippedBuildUAP)' == 'true' and '$(Has10Sdk)' != 'true'"
              Text="Skipped building for Windows 10 UAP since Windows 10 SDK is not installed." />
+
+    <Warning Condition="'$(SkippedBuildUAP)' == 'true' and '$(Has10Sdk)' == 'true' and '$(RunningFrom2015Prompt)' != 'true'"
+             Text="Skipped building for Windows 10 UAP since not running from a MSBuild Command Prompt for VS2015" />
   </Target>
 
   <Import Project="$(MsBuildThisFileDirectory)build\nuget-restore.targets" />

build.cmd

@@ -54,12 +54,6 @@ IF %ERRORLEVEL% NEQ 0 (
 
 ECHO.
 
-SET OVERRIDE_NUGET_PACKAGE=
-
-IF "%NOUAP%" == "1" (
-    SET OVERRIDE_NUGET_PACKAGE=Win2D-NoUAP
-)
-
 CALL "%~dp0build\nuget\build-nupkg.cmd" local
 GOTO END