A few more Buildtweaks (#2759)

* Remove comment ifdefs

* More build fixes

* Delete replaced line

build.cmd

@@ -246,6 +246,7 @@ if /i "%ARG%" == "ci_part4" (
 )
 
 if /i "%ARG%" == "proto" (
+    set _autoselect=0
     set BUILD_PROTO=1
 )
 

src/update.cmd

@@ -66,6 +66,7 @@ rem Disable strong-name validation for F# binaries built from open source that a
 %SN32% -q -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a
 %SN32% -q -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a
 %SN32% -q -Vr FSharp.Compiler.Unittests,b03f5f7f11d50a3a
+%SN32% -q -Vr Microsoft.VisualStudio.Shell.UI.Internal,b03f5f7f11d50a3a
 
 if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     %SN64% -q -Vr FSharp.Core,b03f5f7f11d50a3a
@@ -90,6 +91,7 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     %SN64% -q -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a
     %SN64% -q -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a
     %SN64% -q -Vr FSharp.Compiler.Unittests,b03f5f7f11d50a3a
+		%SN32% -q -Vr Microsoft.VisualStudio.Shell.UI.Internal,b03f5f7f11d50a3a
 )
 
 if /i "%1" == "signonly" goto :eof

vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj

@@ -109,7 +109,7 @@
       <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.Internal, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Internal.15.0.26201-alpha\lib\net46\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
+      <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Internal.$(RoslynVSPackagesVersion)-alpha\lib\net46\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj

@@ -270,6 +270,10 @@
       <HintPath>$(FSharpSourcesRoot)\..\packages\VSSDK.VSHelp.7.0.4\lib\net20\Microsoft.VisualStudio.VSHelp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Telemetry">
+      <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Telemetry.15.0.777-rtm6FAA2C78\lib\Microsoft.VisualStudio.Telemetry.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
     <Reference Include="nunit.framework">
       <Private>True</Private>
       <HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>