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/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch

@@ -1,106 +0,0 @@
-From 827f1e036db2082b56b003f870f5ff8dabc9b1ed Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Tue, 12 Oct 2021 14:04:27 -0500
-Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs.
-
-Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default.  This patch adds net46 to the relevant projects.  The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360.
-
----
- src/libraries/Directory.Build.props                         | 2 +-
- .../ref/System.Resources.Extensions.csproj                  | 4 ++--
- .../src/System.Resources.Extensions.csproj                  | 2 +-
- .../ref/System.Runtime.CompilerServices.Unsafe.csproj       | 4 ++--
- .../src/System.Runtime.CompilerServices.Unsafe.ilproj       | 6 +++++-
- 5 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
-index a03b334346a..30418e38a2a 100644
---- a/src/libraries/Directory.Build.props
-+++ b/src/libraries/Directory.Build.props
-@@ -20,7 +20,7 @@
-     <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
-     <GeneratePlatformNotSupportedAssemblyHeaderFile>$(RepositoryEngineeringDir)LicenseHeader.txt</GeneratePlatformNotSupportedAssemblyHeaderFile>
-     <!-- Build all .NET Framework configurations when net48 is passed in. This is for convenience. -->
--    <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
-+    <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net46;net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
-   </PropertyGroup>
- 
-   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.props" Condition="'$(UseTargetFrameworkSDK)' != 'false'" />
-diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
-index 99037ae459c..848be41690c 100644
---- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
-+++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
-@@ -1,6 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
-+    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
-     <Nullable>enable</Nullable>
-   </PropertyGroup>
- 
-@@ -11,4 +11,4 @@
-   <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
-     <ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Writer\ref\System.Resources.Writer.csproj" />
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
-index a0a79e45adf..29c9b123ce5 100644
---- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
-+++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
--    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
-+    <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
-     <DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants>
-     <Nullable>enable</Nullable>
-     <IsPackable>true</IsPackable>
-diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
-index 766ea9a8ae7..5324c85404b 100644
---- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
-+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
-@@ -3,7 +3,7 @@
-     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-     <CLSCompliant>false</CLSCompliant>
-     <Nullable>enable</Nullable>
--    <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
-+    <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net46;net461</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <Compile Include="System.Runtime.CompilerServices.Unsafe.cs" />
-@@ -14,4 +14,4 @@
-   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-     <Reference Include="System.Runtime" />
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
-index a9e3de0c454..75467734292 100644
---- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
-+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
-@@ -1,6 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk.IL">
-   <PropertyGroup>
--    <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
-+    <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net46;net461</TargetFrameworks>
-     <!-- Make sure that the DebuggableAttribute is set properly. -->
-     <DebugOptimization>IMPL</DebugOptimization>
-     <DebugOptimization Condition="'$(Configuration)' == 'Release'">OPT</DebugOptimization>
-@@ -20,6 +20,10 @@ System.Runtime.CompilerServices.Unsafe</PackageDescription>
-   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-     <CoreAssembly>netstandard</CoreAssembly>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
-+    <CoreAssembly>mscorlib</CoreAssembly>
-+    <ExtraMacros>#define $(TargetFramework)</ExtraMacros>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-     <CoreAssembly>mscorlib</CoreAssembly>
-     <ExtraMacros>#define $(TargetFramework)</ExtraMacros>
--- 
-2.18.0
-

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">