Still support Preview 4 and Preview 5.

514dc656 · Kevin Pilch · 8115c019 · 514dc656
隐藏空白更改
内联并排

Showing with 9 addition and 2 deletion

build/Targets/Settings.targets build/Targets/Settings.targets +9 -2

未找到文件。
--- a/build/Targets/Settings.targets
+++ b/build/Targets/Settings.targets
@@ -137,6 +137,8 @@
    <IsVSBeforeDev15Preview4 Condition="'$(OS)' == 'Windows_NT' AND '$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\15.0@InstallDir)' != ''">true</IsVSBeforeDev15Preview4>
    <IsVSBeforeDev15Preview4 Condition="'$(IsVSBeforeDev15Preview4)' == 'true' AND Exists('$(MSBuildBinPath)\..\..\..\Common7\IDE\devenv.isolation.ini')">false</IsVSBeforeDev15Preview4>
    <IsVSBeforeDev15Preview4 Condition="'$(IsVSBeforeDev15Preview4)' == 'true' AND Exists('$(MSBuildBinPath)\..\..\..\..\Common7\IDE\devenv.isolation.ini')">false</IsVSBeforeDev15Preview4>
+    <IsDev15RC Condition="Exists('$(MSBuildBinPath)\..\..\..\..\Microsoft.VisualStudio.ExtensionEngine.dll')">true</IsDev15RC>
+    <IsDev15RC Condition="Exists('$(MSBuildBinPath)\..\..\..\..\Microsoft.VisualStudio.ExtensionEngine.dll')">true</IsDev15RC>
  </PropertyGroup>

  <Choose>
@@ -148,11 +150,16 @@
          </PropertyGroup>
        </When>

-        <Otherwise>
+        <When Condition="'$(IsDev15RC)' == 'true'">
          <PropertyGroup>
-            <!-- TODO: Detect Preview 4/5 versus RC -->
            <VisualStudioBuildToolsNuGetPackagePath>$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\15.0.25825-RC</VisualStudioBuildToolsNuGetPackagePath>
          </PropertyGroup>
+        </When>
+
+        <Otherwise>
+          <PropertyGroup>
+            <VisualStudioBuildToolsNuGetPackagePath>$(NuGetPackageRoot)\Microsoft.VSSDK.BuildTools\15.0.25604-Preview4</VisualStudioBuildToolsNuGetPackagePath>
+          </PropertyGroup>
        </Otherwise>
      </Choose>
    </When>