Merge branch 'release/6.0.1xx' into update-ulimit

build.sh

@@ -53,7 +53,7 @@ dockerbuild()
 if [ ! -z "$BUILD_IN_DOCKER" ]; then
     dockerbuild $args
 else
-   # Run under sudo so we can set ulimit
+    # Run under sudo so we can set ulimit
     # See https://github.com/dotnet/core-eng/issues/14808
     sudo $DIR/run-build.sh $args
 fi

eng/Versions.props

@@ -8,9 +8,9 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
-    <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->

eng/source-build-tarball-build.yml

@@ -3,8 +3,11 @@ pr: none
 resources:
   pipelines:
   - pipeline: installer-build-resource
-    source: dotnet-installer-official-ci
-    trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes
+    ${{ if eq(variables['System.TeamProject'], 'public') }}:
+      source: installer
+    ${{ if ne(variables['System.TeamProject'], 'public') }}:
+      source: dotnet-installer-official-ci
+    trigger: true # Run pipeline when any run of installer CI completes
 
 stages:
 - stage: build

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

@@ -27,13 +27,9 @@ jobs:
       Fedora33-Online:
         _runOnline: true
         _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
-
-      # TODO: Don't run offline in Pr validation until prebuilts are stabilized/removed, otherwise dependency flow continuously breaks PR validation.
-      # https://github.com/dotnet/source-build/issues/2490
-      ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-        Fedora33-Offline:
-          _runOnline: false
-          _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
+      Fedora33-Offline:
+        _runOnline: false
+        _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
   timeoutInMinutes: 210
   variables:
     _TarballDir: $(Build.StagingDirectory)/tarball
@@ -85,10 +81,9 @@ jobs:
       docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true
     displayName: Build Tarball
 
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/'
-      artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
-      displayName: Publish Source Build Artifacts
+  - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/'
+    artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
+    displayName: Publish Source Build Artifacts
 
   - script: |
       set -x

src/SourceBuild/tarball/content/smoke-test.sh

@@ -602,6 +602,56 @@ function runXmlDocTests() {
     fi
 }
 
+function runOmniSharpTests() {
+    dotnetCmd=${dotnetDir}/dotnet
+
+    rm -rf workdir
+    mkdir workdir
+    pushd workdir
+
+    curl -sSLO "https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/omnisharp-linux-x64.tar.gz"
+
+    mkdir omnisharp
+    pushd omnisharp
+    tar xf "../omnisharp-linux-x64.tar.gz"
+    popd
+
+    # 'blazorwasm' requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550
+    for project in blazorserver classlib console mstest mvc nunit web webapp webapi worker xunit ; do
+
+        mkdir hello-$project
+        pushd hello-$project
+
+        "${dotnetCmd}" new $project
+        popd
+
+        ./omnisharp/run -s "$(readlink -f hello-$project)" > omnisharp.log &
+
+        sleep 5
+
+        pkill -P $$
+
+        # Omnisharp spawns off a number of processes. They all include the
+        # current directory as a process argument, so use that to identify and
+        # kill them.
+        pgrep -f "$(pwd)"
+
+        kill "$(pgrep -f "$(pwd)")"
+
+        cat omnisharp.log
+
+        if grep ERROR omnisharp.log; then
+            echo "test failed"
+            exit 1
+        else
+            echo "OK"
+        fi
+
+    done
+
+    popd
+}
+
 function resetCaches() {
     rm -rf "$testingHome"
     mkdir "$testingHome"
@@ -684,10 +734,7 @@ echo SDK under test is:
 export NUGET_PACKAGES="$restoredPackagesDir"
 SOURCE_BUILT_PKGS_PATH="$SCRIPT_ROOT/artifacts/obj/$buildArch/$configuration/blob-feed/packages/"
 export DOTNET_ROOT="$dotnetDir"
-# OSX also requires DOTNET_ROOT to be on the PATH
-if [ "$(uname)" == 'Darwin' ]; then
-    export PATH="$dotnetDir:$PATH"
-fi
+export PATH="$dotnetDir:$PATH"
 
 # Run all tests, local restore sources first, online restore sources second
 if [ "$excludeLocalTests" == "false" ]; then
@@ -728,4 +775,6 @@ fi
 
 runXmlDocTests
 
+runOmniSharpTests
+
 echo "ALL TESTS PASSED!"

src/redist/targets/GenerateBundledVersions.targets

@@ -26,8 +26,8 @@
 
   <PropertyGroup>
       <VersionFeature21>30</VersionFeature21>
-      <VersionFeature31>21</VersionFeature31>
-      <VersionFeature50>12</VersionFeature50>
+      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 21))</VersionFeature31>
+      <VersionFeature50>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature50>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">