Merge pull request #3879 from Microsoft/merges/dev15.5-to-dev15.6-20171103-070041

Merge dev15.5 to dev15.6

build.cmd

@@ -4,13 +4,13 @@ rem Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt
 setlocal enableDelayedExpansion
 
 :ARGUMENTS_VALIDATION
-
-if /I "%1" == "--help"   (goto :USAGE)
+if /I "%1" == "--help"  (goto :USAGE)
 if /I "%1" == "/help"   (goto :USAGE)
 if /I "%1" == "/h"      (goto :USAGE)
 if /I "%1" == "/?"      (goto :USAGE)
 goto :ARGUMENTS_OK
 
+
 :USAGE
 
 echo Build and run a subset of test suites
@@ -92,6 +92,10 @@ for %%i in (%BUILD_FSC_DEFAULT%) do ( call :PROCESS_ARG %%i )
 
 REM apply defaults
 
+if /i "%_buildexit%" == "1" (
+		exit /B %_buildexitvalue%
+)
+
 if /i "%_autoselect%" == "1" (
     set BUILD_NET40_FSHARP_CORE=1
     set BUILD_NET40=1
@@ -129,6 +133,12 @@ set ARG2=%~2
 if "%ARG%" == "1" if "%2" == "" (set ARG=default)
 if "%2" == "" if not "%ARG%" == "default" goto :EOF
 
+rem Do no work
+if /i "%ARG%" == "none" (
+    set _buildexit=1
+    set _buildexitvalue=0
+)
+
 if /i "%ARG%" == "net40-lib" (
     set _autoselect=0
     set BUILD_NET40_FSHARP_CORE=1

build.sh

@@ -138,6 +138,11 @@ do
         "nobuild")
             export BUILD_PHASE=0
             ;;
+        "none")
+            _autoselect=0
+            export _buildexit=1
+            export _buildexitVALUE=0
+            ;;
         "all")
             _autoselect=0
             export BUILD_PROTO=1
@@ -320,6 +325,10 @@ do
     esac
 done
 
+if [ $_buildexit -eq 1 ]; then
+    exit $_buildexitvalue
+fi
+
 # Apply defaults, if necessary.
 if [ $_autoselect -eq 1 ]; then
     export BUILD_NET40=1

netci.groovy

@@ -21,6 +21,7 @@ def static getBuildJobName(def configuration, def os) {
             // Linux
             configurations = ['Release', 'Release_fcs' ];
         }
+        
         configurations.each { configuration ->
 
             def lowerConfiguration = configuration.toLowerCase()
@@ -68,7 +69,7 @@ def static getBuildJobName(def configuration, def os) {
                     build_args = "net40"
                 }
                 else {
-                    build_args = "ci"
+                    build_args = "none"
                 }
             }
 
@@ -102,13 +103,14 @@ ${buildPath}build.cmd ${buildFlavor} ${build_args}""")
             Utilities.setMachineAffinity(newJob, os, affinity)
             Utilities.standardJobSetup(newJob, project, isPullRequest, "*/${branch}")
 
-            
-            Utilities.addArchival(newJob, "tests/TestResults/*.*", "", skipIfNoTestFiles, false)
-            if (configuration == "Release_fcs") {
-                Utilities.addArchival(newJob, "Release/**")
-            }
-            else {
-                Utilities.addArchival(newJob, "${buildFlavor}/**")
+						if (build_args != "none") {
+		            Utilities.addArchival(newJob, "tests/TestResults/*.*", "", skipIfNoTestFiles, false)
+		            if (configuration == "Release_fcs") {
+		                Utilities.addArchival(newJob, "Release/fcs/**")
+		            }
+		            else {
+		                Utilities.addArchival(newJob, "${buildFlavor}/**")
+		            }
             }
             if (isPullRequest) {
                 Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${configuration} Build")

vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj

@@ -67,6 +67,7 @@
       <GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
     </EmbeddedResource>
     <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="LanguageServiceConstants.fs" />
     <Compile Include="Error.fs" />
     <Compile Include="Vs.fs" />
     <Compile Include="Colorize.fs" />

vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace Microsoft.VisualStudio.FSharp.LanguageService
+
+[<RequireQualifiedAccess>]
+module internal LanguageServiceConstants =
+    
+    /// "F#"
+    [<Literal>]
+    let FSharpLanguageName = "F#"

vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs

@@ -274,7 +274,7 @@ type internal ProjectSitesAndFiles() =
                         if not (isNull project) then
                             for reference in project.ProjectReferences do
                                 let project = workspace.CurrentSolution.GetProject(reference.ProjectId)
-                                if not (isNull project) then
+                                if not (isNull project) && project.Language = LanguageServiceConstants.FSharpLanguageName then
                                     let siteProvider = provideProjectSiteProvider (workspace, project, serviceProvider, projectOptionsTable)
                                     let referenceProject = workspace.ProjectTracker.GetProject(reference.ProjectId)
                                     let outputPath = referenceProject.BinOutputPath