Merge pull request #12594 from dotnet-maestro-bot/merge/release/6.0.1xx-to-main

[automated] Merge branch 'release/6.0.1xx' => 'main'

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,10 +27,9 @@ jobs:
       Fedora33-Online:
         _runOnline: true
         _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
-      # Disable until prebuilts are eliminated
-      # 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
@@ -82,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

@@ -601,6 +601,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"
@@ -683,10 +733,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
@@ -727,4 +774,6 @@ fi
 
 runXmlDocTests
 
+runOmniSharpTests
+
 echo "ALL TESTS PASSED!"

src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davis Goodin <dagood@microsoft.com>
-Date: Tue, 12 Oct 2021 18:14:59 -0500
-Subject: [PATCH] Disable BannedApiAnalyzers during source-build
-
-BannedApiAnalyzers has some intentional old dependencies and it's not feasible
-to build it during source-build. Remove this usage to remove a prebuilt.
-https://github.com/dotnet/msbuild/issues/6961
----
- eng/Packages.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eng/Packages.props b/eng/Packages.props
-index 0f478634f..3cc09a008 100644
---- a/eng/Packages.props
-+++ b/eng/Packages.props
-@@ -45,11 +45,11 @@
- 
-   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-     <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
-+    <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
-   </ItemGroup>
- 
-   <ItemGroup>
-     <GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
--    <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
-   </ItemGroup>
- 
- </Project>

src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch

@@ -20,8 +20,8 @@ index 2de607c5d..1668addc9 100644
 --- a/eng/Packages.props
 +++ b/eng/Packages.props
 @@ -46,9 +46,6 @@
+
    <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-     <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
      <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
 -  </ItemGroup>
 -