Merge in 'release/7.0.1xx' changes

.vsts-ci.yml

@@ -332,10 +332,10 @@ stages:
 
   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
 
-  - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
-    parameters:
-      dependsOn: Source_Build_Create_Tarball
-      condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
+  - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+    - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+      parameters:
+        dependsOn: Source_Build_Create_Tarball
 
   # https://github.com/dotnet/core-sdk/issues/248
   # - template: /eng/build.yml

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

@@ -74,15 +74,3 @@ jobs:
     displayName: Publish BuildLogs
     continueOnError: true
     condition: succeededOrFailed()
-
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-    # Check if the tarball should be built now so the result can be used in the build tarball job condition.
-    # This prevents allocation of additional agents if the tarball build legs should be skipped.
-    # Only build the tarball if the PR touches source-build source.
-    - script: |
-        if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
-        then
-          echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
-        fi
-      displayName: Tarball Build Check
-      name: Tarball_Build_Check

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

@@ -42,13 +42,13 @@ jobs:
         _EnablePoison: false
         _ExcludeOmniSharpTests: true
         _RunOnline: true
+      CentOSStream8-Offline:
+        _BootstrapPrep: false
+        _Container: ${{ parameters.centOSStream8Container }}
+        _EnablePoison: false
+        _ExcludeOmniSharpTests: true
+        _RunOnline: false
       ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        CentOSStream8-Offline:
-          _BootstrapPrep: false
-          _Container: ${{ parameters.centOSStream8Container }}
-          _EnablePoison: false
-          _ExcludeOmniSharpTests: true
-          _RunOnline: false
         CentOSStream9-Offline:
           _BootstrapPrep: false
           _Container: ${{ parameters.centOSStream9Container }}

src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Mon, 25 Jul 2022 19:15:47 +0000
-Subject: [PATCH 1/2] Disable CA1420
-
-Workaround until NuGet updates to build with latest .NET toolset.
----
- Directory.Build.props | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 1353696a29..4e7463a453 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -14,9 +14,11 @@
-     <!-- Source build does not need to worry about running on VS for Mac -->
-     <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
- 
--    <!-- Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed for
--         Microsoft.ApplicationInsights) -->
--    <NoWarn>$(NoWarn);NU1701</NoWarn>
-+    <!--
-+      NU1701 - Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed forMicrosoft.ApplicationInsights)
-+      CA1420 - Temporarily disable for source-build until SDK builds with latest toolset.
-+    -->
-+    <NoWarn>$(NoWarn);NU1701;CA1420</NoWarn>
-     <!-- do not enable analyzers on source build-->
-     <EnforceCodeStyleInBuild Condition="'$(DotNetBuildFromSource)' != 'true'">true</EnforceCodeStyleInBuild>
-     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>