Merge pull request #3086 from gkhanna79/CIMscorlib

Update CI to no longer request mscorlib build for osx/ubuntu on Windows.

Author: ellismg

build.sh

@@ -192,15 +192,21 @@ restoreBuildTools()
 
 isMSBuildOnNETCoreSupported()
 {
+    # This needs to be updated alongwith corresponding changes to netci.groovy.
     __isMSBuildOnNETCoreSupported=0
 
-    if [ "$__BuildOS" == "Linux" ]; then
-        if [ "$__DistroName" == "ubuntu" ]; then
+    if [ "$__BuildArch" == "x64" ]; then
+        if [ "$__BuildOS" == "Linux" ]; then
+            if [ "$__DistroName" == "ubuntu" ]; then
+                __OSVersion=$(lsb_release -sr)
+                if [ "$__OSVersion" == "14.04" ]; then
+                    __isMSBuildOnNETCoreSupported=1
+                fi 
+            fi
+        elif [ "$__BuildOS" == "OSX" ]; then
             __isMSBuildOnNETCoreSupported=1
-        fi
-    elif [ "$__BuildOS" == "OSX" ]; then
-        __isMSBuildOnNETCoreSupported=1
-    fi 
+        fi 
+    fi
 }
 
 build_mscorlib()
@@ -211,12 +217,10 @@ build_mscorlib()
         return
     fi
 
-    # CI_TODO: Until we switch CI to stop building mscorlib for platforms supported by isMSBuildOnNETCoreSupported function,
-    # we should ignore skipping building mscorlib.
-    # if [ $__SkipMSCorLib == 1 ]; then
-    #    echo "Skipping building mscorlib."
-    #    return
-    # fi
+    if [ $__SkipMSCorLib == 1 ]; then
+       echo "Skipping building mscorlib."
+       return
+    fi
 
     # Restore buildTools
 
@@ -256,12 +260,10 @@ generate_NugetPackages()
         return
     fi
 
-    # CI_TODO: Until we switch CI to stop building mscorlib for platforms supported by isMSBuildOnNETCoreSupported function,
-    # we should ignore skipping building mscorlib.
-    # if [ $__SkipMSCorLib == 1 ]; then
-    #    echo "Unable to generate Microsoft.NETCore.Runtime.CoreCLR nuget package since mscorlib was not built."
-    #    return
-    # fi
+    if [ $__SkipMSCorLib == 1 ]; then
+       echo "Unable to generate Microsoft.NETCore.Runtime.CoreCLR nuget package since mscorlib was not built."
+       return
+    fi
 
     echo "Generating nuget packages for "$__BuildOS
 

netci.groovy

@@ -666,11 +666,13 @@ combinedScenarios.each { scenario ->
                                     }
 
                                     // Run the rest of the build    
-                                    // Build the mscorlib for the other OS's
+                                    
+                                    // Remove this command step once we can build mscorlib on CentOS/OpenSuse
                                     buildCommands += "build.cmd ${lowerConfiguration} ${architecture} linuxmscorlib"
+
+                                    // Remove this command step once we can build mscorlib on FreeBSD
                                     buildCommands += "build.cmd ${lowerConfiguration} ${architecture} freebsdmscorlib"
-                                    buildCommands += "build.cmd ${lowerConfiguration} ${architecture} osxmscorlib"
-                                
+                                    
                                     if (!enableCorefxTesting) {
                                         // Zip up the tests directory so that we don't use so much space/time copying
                                         // 10s of thousands of files around.
@@ -719,10 +721,15 @@ combinedScenarios.each { scenario ->
                             switch (architecture) {
                                 case 'x64':
                                 case 'x86':
-                                    // Build commands are the same regardless of scenario on non-Windows other OS's.
-                                    
                                     // On other OS's we skipmscorlib but run the pal tests
-                                    buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture}"
+                                    if ((architecture == 'x64') && ((os == 'Ubuntu') || (os == 'OSX')))
+                                    {
+                                        buildCommands += "./build.sh verbose ${lowerConfiguration} ${architecture}"
+                                    }
+                                    else
+                                    {
+                                        buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture}"
+                                    }
                                     buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration} \${WORKSPACE}/bin/paltestout"
 
                                     // Basic archiving of the build