Merge branch 'release/7.0.1xx'

.vsts-ci.yml

@@ -8,15 +8,17 @@ trigger:
     - internal/release/3.*
     - internal/release/5.*
     - internal/release/6.*
+    - internal/release/7.*
 
 variables:
 - name: _PublishUsingPipelines
   value: false
-- name: PostBuildSign
+- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
-  value: true
+  - name: PostBuildSign
-- ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    value: false
-   - name: "skipComponentGovernanceDetection"
+- ${{ else }}:
-     value: "true"
+  - name: PostBuildSign
+    value: true
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-Installer-SDLValidation-Params

NuGet.config

@@ -7,6 +7,7 @@
     <clear />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />

eng/ManualVersions.props

@@ -9,11 +9,11 @@
      Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.26</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.27</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.26</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.27</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.26</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.27</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.26</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.27</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.26</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.27</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.26</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.27</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
   </PropertyGroup>
 </Project>

eng/Version.Details.xml

@@ -174,6 +174,10 @@
       <Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
       <SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="8.0.0-alpha.1.22462.1">
+      <Uri>https://github.com/dotnet/emsdk</Uri>
+      <Sha>6736b00d7d23b40b8b6975439421cb2e41a781db</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22462.1">
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>6736b00d7d23b40b8b6975439421cb2e41a781db</Sha>
@@ -183,11 +187,6 @@
       <Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
       <SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="5.0.0-preview.21506.1">
-      <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1</Sha>
-      <SourceBuild RepoName="diagnostics" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.22463.4">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
       <Sha>4663cca8b51b481bfd5e82695d2027d05688b5de</Sha>

eng/Versions.props

@@ -208,18 +208,20 @@
       or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
       necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-7.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>7.0.100-rc.1</PrivateSourceBuiltArtifactsPackageVersion>
-    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-7.0.100-8</PrivateSourceBuiltPrebuiltsPackageVersion>
+    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-7.0.100-9</PrivateSourceBuiltPrebuiltsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
-    <MauiWorkloadManifestVersion>6.0.312</MauiWorkloadManifestVersion>
+    <MauiFeatureBand>7.0.100-rc.1</MauiFeatureBand>
-    <XamarinAndroidWorkloadManifestVersion>32.0.301</XamarinAndroidWorkloadManifestVersion>
+    <MauiWorkloadManifestVersion>7.0.0-rc.1.6430</MauiWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>15.4.303</XamarinIOSWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>33.0.0-rc.1.136</XamarinAndroidWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>15.4.303</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>15.4.1006-rc.1</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>15.4.1006-rc.1</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>12.3.1006-rc.1</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>15.4.1006-rc.1</XamarinTvOSWorkloadManifestVersion>
     <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
+    <MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>8.0.0-alpha.1.22462.1</MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>
     <MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22462.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</EmscriptenWorkloadManifestVersion>
   </PropertyGroup>

eng/common/templates/jobs/source-build.yml

@@ -14,7 +14,7 @@ parameters:
   # This is the default platform provided by Arcade, intended for use by a managed-only repo.
   defaultManagedPlatform:
     name: 'Managed'
-    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
 
   # Defines the platforms on which to run build jobs. One job is created for each platform, and the
   # object in this array is sent to the job template as 'platform'. If no platforms are specified,

src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj

@@ -11,12 +11,12 @@
     should be added to source-build-reference-packages.
   -->
   <ItemGroup>
-    <PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-6.0.300" Version="[$(XamarinAndroidWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(MauiFeatureBand)" Version="[$(XamarinAndroidWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-6.0.300" Version="[$(XamarinIOSWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(MauiFeatureBand)" Version="[$(XamarinIOSWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.300" Version="[$(XamarinMacCatalystWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(MauiFeatureBand)" Version="[$(XamarinMacCatalystWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.300" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-$(MauiFeatureBand)" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.300" Version="[$(MauiWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-$(MauiFeatureBand)" Version="[$(MauiWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.300" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-$(MauiFeatureBand)" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-8.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />

src/SourceBuild/tarball/content/build.proj

@@ -107,6 +107,7 @@
             SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath);
             SMOKE_TESTS_TARGET_RID=$(TargetRid);
             SMOKE_TESTS_PORTABLE_RID=$(PortableRid);
+            SMOKE_TESTS_CUSTOM_PACKAGES_PATH=$(CustomSourceBuiltPackagesPath);
             $(CustomTestEnvVars)" />
   </Target>
 

src/SourceBuild/tarball/content/build.sh

@@ -19,8 +19,9 @@ SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)"
 
 MSBUILD_ARGUMENTS=("/flp:v=detailed")
 CUSTOM_REF_PACKAGES_DIR=''
-CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR=''
+CUSTOM_PACKAGES_DIR=''
 alternateTarget=false
+runningSmokeTests=false
 CUSTOM_SDK_DIR=''
 
 while :; do
@@ -41,15 +42,15 @@ while :; do
             ;;
         --run-smoke-test)
             alternateTarget=true
+            runningSmokeTests=true
             MSBUILD_ARGUMENTS+=( "/t:RunSmokeTest" )
             ;;
         --with-packages)
-            CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR="$(cd -P "$2" && pwd)"
+            CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)"
-            if [ ! -d "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ]; then
+            if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then
-                echo "Custom prviously built packages directory '$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR' does not exist"
+                echo "Custom prviously built packages directory '$CUSTOM_PACKAGES_DIR' does not exist"
                 exit 1
             fi
-            MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" )
             shift
             ;;
         --with-sdk)
@@ -82,13 +83,21 @@ while :; do
     shift
 done
 
+if [ "$CUSTOM_PACKAGES_DIR" != "" ]; then
+  if [ "$runningSmokeTests" == "true" ]; then
+    MSBUILD_ARGUMENTS+=( "/p:CustomSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" )
+  else
+    MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" )
+  fi
+fi
+
 if [ -f "$SCRIPT_ROOT/packages/archive/archiveArtifacts.txt" ]; then
   ARCHIVE_ERROR=0
   if [ ! -d "$SCRIPT_ROOT/.dotnet" ] && [ "$CUSTOM_SDK_DIR" == "" ]; then
     echo "ERROR: SDK not found at $SCRIPT_ROOT/.dotnet"
     ARCHIVE_ERROR=1
   fi
-  if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" == "" ]; then
+  if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PACKAGES_DIR" == "" ]; then
     echo "ERROR: Private.SourceBuilt.Artifacts artifact not found at $SCRIPT_ROOT/packages/archive/ - Either run prep.sh or pass --with-packages parameter"
     ARCHIVE_ERROR=1
   fi
@@ -120,7 +129,9 @@ fi
 packageVersionsPath=''
 restoredPackagesDir="$SCRIPT_ROOT/packages/restored"
 
-if [ -d "$SCRIPT_ROOT/packages/archive" ]; then
+if [[ "$CUSTOM_PACKAGES_DIR" != "" && -f "$CUSTOM_PACKAGES_DIR/PackageVersions.props" ]]; then
+  packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props"
+elif [ -d "$SCRIPT_ROOT/packages/archive" ]; then
   sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'`
   if [ -f "$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props" ]; then
     packageVersionsPath=$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props
@@ -128,14 +139,12 @@ if [ -d "$SCRIPT_ROOT/packages/archive" ]; then
     tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props
     packageVersionsPath=/tmp/PackageVersions.props
   fi
-elif [ -f "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" ]; then
-  packageVersionsPath="$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props"
 fi
 
 if [ ! -f "$packageVersionsPath" ]; then
   echo "Cannot find PackagesVersions.props.  Debugging info:"
   echo "  Attempted archive path: $SCRIPT_ROOT/packages/archive"
-  echo "  Attempted custom PVP path: $CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props"
+  echo "  Attempted custom PVP path: $CUSTOM_PACKAGES_DIR/PackageVersions.props"
   exit 1
 fi
 

src/SourceBuild/tarball/content/global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.100-rc.1.22410.15"
+    "dotnet": "7.0.100-rc.1.22431.12"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

src/SourceBuild/tarball/content/repos/known-good.proj

@@ -35,17 +35,17 @@
         <RepositoryReference Include="diagnostics" />
         <RepositoryReference Include="llvm-project" />
         <RepositoryReference Include="razor-compiler" />
+        <RepositoryReference Include="xliff-tasks" />
         <RepositoryReference Include="roslyn" />
         <RepositoryReference Include="source-build-externals" />
         <RepositoryReference Include="symreader" />
         <RepositoryReference Include="xdt" />
-        <RepositoryReference Include="xliff-tasks" />
 
         <!-- Tier 2 -->
         <RepositoryReference Include="linker" />
-        <RepositoryReference Include="msbuild" />
         <RepositoryReference Include="runtime-portable" />
         <RepositoryReference Include="runtime" />
+        <RepositoryReference Include="msbuild" />
 
         <!-- Tier 3 -->
         <RepositoryReference Include="roslyn-analyzers" />

src/SourceBuild/tarball/content/repos/roslyn.proj

@@ -32,10 +32,6 @@
       need to support VS.
     -->
     <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemCollectionsImmutableVersion" Version="%24(SystemCollectionsImmutableVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemReflectionMetadataVersion" Version="%24(SystemReflectionMetadataVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion" Version="%24(SystemRuntimeCompilerServicesUnsafeVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemTextEncodingCodePagesVersion" Version="%24(SystemTextEncodingCodePagesVersion)" />
   </ItemGroup>
 
   <ItemGroup>

src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs

@@ -15,6 +15,7 @@ internal static class Config
     public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH";
     public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID";
     public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH";
+    public const string CustomPackagesPathEnv = "SMOKE_TESTS_CUSTOM_PACKAGES_PATH";
     public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH";
     public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID";
     public const string WarnPoisonDiffsEnv = "SMOKE_TESTS_WARN_POISON_DIFFS";
@@ -27,6 +28,7 @@ internal static class Config
     public static string PortableRid { get; } = Environment.GetEnvironmentVariable(PortableRidEnv) ??
         throw new InvalidOperationException($"'{Config.PortableRidEnv}' must be specified");
     public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv);
+    public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv);
     public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv);
     public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ??
         throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified");

src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Xunit.Abstractions;
 
 namespace Microsoft.DotNet.SourceBuild.SmokeTests;
@@ -66,6 +67,8 @@ internal class DotNetHelper
 
         if (useLocalPackages)
         {
+            // When using local packages this feed is always required.  It contains packages that are
+            // not produced by source-build but are required by the various project templates.
             if (!Directory.Exists(Config.PrereqsPath))
             {
                 throw new InvalidOperationException(
@@ -74,6 +77,21 @@ internal class DotNetHelper
 
             string nugetConfig = File.ReadAllText(nugetConfigPath);
             nugetConfig = nugetConfig.Replace("SMOKE_TEST_PACKAGE_FEED", Config.PrereqsPath);
+
+            // This package feed is optional.  You can use an additional feed of source-built packages to run the
+            // smoke-tests as offline as possible.
+            if (Config.CustomPackagesPath != null)
+            {
+                if (!Directory.Exists(Config.CustomPackagesPath))
+                {
+                    throw new ArgumentException($"Specified --with-packages {Config.CustomPackagesPath} does not exist.");
+                }
+                nugetConfig = nugetConfig.Replace("CUSTOM_PACKAGE_FEED", Config.CustomPackagesPath);
+            }
+            else
+            {
+                nugetConfig = string.Join(Environment.NewLine, nugetConfig.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Where(s => !s.Contains("CUSTOM_PACKAGE_FEED")).ToArray());
+            }
             File.WriteAllText(nugetConfigPath, nugetConfig);
         }
     }

src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config

@@ -3,5 +3,6 @@
   <packageSources>
     <clear />
     <add key="smoke-test-prereqs" value="SMOKE_TEST_PACKAGE_FEED" />
+    <add key="custom-packages" value="CUSTOM_PACKAGE_FEED" />
   </packageSources>
 </configuration>

src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch

@@ -0,0 +1,268 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Tue, 19 Jul 2022 14:47:28 -0700
+Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core
+
+Backport PR: https://github.com/dotnet/command-line-api/pull/1803
+---
+ Directory.Build.props                                      | 1 +
+ global.json                                                | 7 ++++---
+ .../System.CommandLine.ApiCompatibility.Tests.csproj       | 2 +-
+ .../System.CommandLine.Benchmarks.csproj                   | 4 ++--
+ .../System.CommandLine.DragonFruit.Tests.csproj            | 2 +-
+ .../System.CommandLine.Generator.Tests.csproj              | 2 +-
+ .../System.CommandLine.Hosting.Tests.csproj                | 2 +-
+ .../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +-
+ .../System.CommandLine.Rendering.Tests.csproj              | 2 +-
+ .../EndToEndTestApp/EndToEndTestApp.csproj                 | 2 +-
+ .../dotnet-suggest.Tests.csproj                            | 2 +-
+ src/System.CommandLine.Suggest/dotnet-suggest.csproj       | 2 +-
+ .../System.CommandLine.Tests.csproj                        | 2 +-
+ .../TestApps/NativeAOT/NativeAOT.csproj                    | 4 ++--
+ .../TestApps/Trimming/Trimming.csproj                      | 4 ++--
+ src/System.CommandLine/System.CommandLine.csproj           | 7 +++++--
+ 16 files changed, 26 insertions(+), 21 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index c0c5f79a..901c57c7 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -9,6 +9,7 @@
+     <NoWarn Condition=" '$(DotnetBuildFromSource)' == 'true' ">$(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604</NoWarn>
+     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+     <LangVersion>10.0</LangVersion>
++    <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+diff --git a/global.json b/global.json
+index 1c6fd268..f5bec611 100644
+--- a/global.json
++++ b/global.json
+@@ -1,12 +1,13 @@
+ {
+   "tools": {
+-    "dotnet": "6.0.100",
++    "dotnet": "7.0.100-preview.6.22352.1",
+     "runtimes": {
+       "dotnet": [
+-        "5.0.10"
++        "5.0.17",
++        "6.0.7"
+       ]
+     },
+-    "xcopy-msbuild": "16.10.0-preview2"
++    "xcopy-msbuild": "17.1.0"
+   },
+   "msbuild-sdks": {
+     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2"
+diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
+index 30bcd139..4cc48fde 100644
+--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
++++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+     <IsPackable>false</IsPackable>
+   </PropertyGroup>
+ 
+diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
+index e54aabc4..185ba62a 100644
+--- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
++++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
+@@ -9,8 +9,8 @@
+     <UseSharedCompilation>false</UseSharedCompilation>
+ 
+     <!-- Supported target frameworks -->
+-    <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;net5.0;net6.0;</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net5.0;net6.0;</TargetFrameworks>
++    <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;net5.0;net6.0;net7.0</TargetFrameworks>
++    <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net5.0;net6.0;net7.0</TargetFrameworks>
+ 
+     <!-- This repo does not produce any libraries, therefore generating docs is disabled -->
+     <GenerateDocumentationFile>False</GenerateDocumentationFile>
+diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj
+index 7eee0b38..e504f7e8 100644
+--- a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj
++++ b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+     <StartupObject>AutoGeneratedProgram</StartupObject>
+     <!-- Ensure that an XML doc file is emitted to supply command line help -->
+     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
+index a423eb1e..20f0f410 100644
+--- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
++++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0</TargetFrameworks>
++    <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
+     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj
+index 328b4e12..8e2cd6ea 100644
+--- a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj
++++ b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0</TargetFrameworks>
++    <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
+     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+     <IsPackable>false</IsPackable>
+   </PropertyGroup>
+diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
+index 43eb7c29..7bff1796 100644
+--- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
++++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0</TargetFrameworks>
++    <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
+     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+     <LangVersion>10</LangVersion>
+   </PropertyGroup>
+diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj
+index 1c116508..afd6dc6a 100644
+--- a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj
++++ b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+     <IsPackable>false</IsPackable>
+   </PropertyGroup>
+ 
+diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
+index 9a3eb54d..76add0d5 100644
+--- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
++++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
+@@ -6,7 +6,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+   </PropertyGroup>
+ 
+ </Project>
+diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
+index da6abedf..f1711a10 100644
+--- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
++++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
+index fd825008..ce4bda1d 100644
+--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj
++++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+     <IsPackable>true</IsPackable>
+     <PackAsTool>true</PackAsTool>
+     <PackageId>dotnet-suggest</PackageId>
+diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
+index c1988ec4..44b5c9fc 100644
+--- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
++++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0</TargetFrameworks>
++    <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
+     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+     <GenerateProgramFile>false</GenerateProgramFile>
+   </PropertyGroup>
+diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
+index b0036ed0..cc306fea 100644
+--- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
++++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
+@@ -2,13 +2,13 @@
+ 	
+ 	<PropertyGroup>
+ 		<OutputType>Exe</OutputType>
+-		<TargetFramework>net6.0</TargetFramework>
++		<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+ 		<!-- producing more detailed log output -->
+ 		<TrimmerSingleWarn>false</TrimmerSingleWarn>
+ 	</PropertyGroup>
+ 
+ 	<PropertyGroup>
+-		<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll</SystemCommandLineDllPath>
++		<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
+ 	</PropertyGroup>
+ 
+ 	<ItemGroup>
+diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
+index 6dcf8892..615b0764 100644
+--- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
++++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
+@@ -2,7 +2,7 @@
+ 	
+ 	<PropertyGroup>
+ 		<OutputType>Exe</OutputType>
+-		<TargetFramework>net6.0</TargetFramework>
++		<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+ 		<ImplicitUsings>enable</ImplicitUsings>
+ 		<Nullable>enable</Nullable>
+ 		<PublishTrimmed>true</PublishTrimmed>
+@@ -10,7 +10,7 @@
+ 	</PropertyGroup>
+ 
+ 	<PropertyGroup>
+-		<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll</SystemCommandLineDllPath>
++		<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
+ 	</PropertyGroup>
+ 
+ 	<ItemGroup>
+diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj
+index 424053a6..37115d70 100644
+--- a/src/System.CommandLine/System.CommandLine.csproj
++++ b/src/System.CommandLine/System.CommandLine.csproj
+@@ -3,7 +3,7 @@
+   <PropertyGroup>
+     <IsPackable>true</IsPackable>
+     <PackageId>System.CommandLine</PackageId>
+-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
++    <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
+     <Nullable>enable</Nullable>
+     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+     <LangVersion>10</LangVersion>
+@@ -15,9 +15,12 @@
+     * Test and debug support
+     </Description>
+     <GenerateDocumentationFile>true</GenerateDocumentationFile>
++    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
++  </PropertyGroup>
++
++  <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETSDK)'">
+     <IsTrimmable>true</IsTrimmable>
+     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+-    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
+   </PropertyGroup>
+    
+   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch

@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Thu, 2 Jun 2022 19:27:41 +0000
-Subject: [PATCH] Pin the Microsoft.Extensions.Logging version so that
- source-build does not pick up latest
-
-Backport: https://github.com/dotnet/diagnostics/pull/3121
----
- eng/Versions.props                                            | 2 +-
- .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj         | 2 +-
- .../Microsoft.Diagnostics.NETCore.Client.csproj               | 2 +-
- src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj              | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index b4edc421..17c6f9d3 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -48,7 +48,7 @@
-     <MicrosoftDiagnosticsRuntimeUtilitiesVersion>2.0.250401</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
-     <MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
-     <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
--    <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>
-+    <MicrosoftExtensionsLoggingPinnedVersion>2.1.1</MicrosoftExtensionsLoggingPinnedVersion>
-     <!-- Need version that understands UseAppFilters sentinel. -->
-     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
-     <SystemCommandLineVersion>2.0.0-beta1.20468.1</SystemCommandLineVersion>
-diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-index 733d18da..db90173d 100644
---- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-+++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-@@ -29,7 +29,7 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
-     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
-     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
-     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
-diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-index 929f82d0..5cb2d582 100644
---- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-@@ -20,7 +20,7 @@
- 
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-   </ItemGroup>
- 
-   <ItemGroup>
-diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-index 73fd6f82..3afa7132 100644
---- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-+++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-@@ -22,8 +22,8 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" GeneratePathProperty="true" />
-     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-   </ItemGroup>
- 
- </Project>

src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch

@@ -0,0 +1,313 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Villalobos <4691428+BenVillalobos@users.noreply.github.com>
+Date: Tue, 5 Jul 2022 16:33:56 -0500
+Subject: [PATCH] Change TargetFramework to net7.0
+
+Add nowarn for SYSLIB warnings
+Resolve CS8981: lowercase preserved types
+
+Backport PR: https://github.com/dotnet/msbuild/pull/7790
+---
+ Directory.Build.props                                     | 2 +-
+ eng/BootStrapMSBuild.targets                              | 2 +-
+ eng/cibuild_bootstrapped_msbuild.ps1                      | 2 +-
+ eng/cibuild_bootstrapped_msbuild.sh                       | 2 +-
+ global.json                                               | 2 +-
+ scripts/Deploy-MSBuild.ps1                                | 2 +-
+ .../RemoteProjectsProviderMock/CollectionsHelpers.cs      | 8 ++++----
+ .../Microsoft.Build.Engine.UnitTests.csproj               | 4 ++--
+ src/Build/Definition/ToolsetReader.cs                     | 4 ++--
+ src/Build/Microsoft.Build.csproj                          | 2 +-
+ src/Directory.BeforeCommon.targets                        | 2 +-
+ src/Directory.Build.props                                 | 6 +++---
+ src/Framework/README.md                                   | 2 +-
+ src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj            | 2 +-
+ src/Package/Localization/Localization.csproj              | 2 +-
+ src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj  | 4 ++--
+ src/Tasks/Microsoft.Build.Tasks.csproj                    | 2 +-
+ src/Utilities/README.md                                   | 2 +-
+ 18 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 0df28a5b8..3a959f894 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -38,7 +38,7 @@
+         SYSLIB0011: Removing binary formatter will happen as part of a larger .NET-wide effort.
+     -->
+ 
+-    <NoWarn>$(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011</NoWarn>
++    <NoWarn>$(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044</NoWarn>
+   </PropertyGroup>
+ 
+   <PropertyGroup Condition="'$(Configuration)' == 'Debug-MONO'">
+diff --git a/eng/BootStrapMSBuild.targets b/eng/BootStrapMSBuild.targets
+index 288c062da..4ba21444d 100644
+--- a/eng/BootStrapMSBuild.targets
++++ b/eng/BootStrapMSBuild.targets
+@@ -210,7 +210,7 @@
+          Copy it from "next to MSBuild" in the pre-bootstrap SDK to our little weirdo bootstrap
+          layout next to the SDK tasks, so it can get loaded by the SDK tasks that need it. -->
+     <Copy SourceFiles="$(DOTNET_INSTALL_DIR)\sdk\$(DotNetCliVersion)\Microsoft.Extensions.DependencyModel.dll"
+-          DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net6.0" />
++          DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net7.0" />
+ 
+     <Copy SourceFiles="@(InstalledExtensions)"
+           DestinationFolder="$(BootstrapDestination)Current\%(RecursiveDir)" />
+diff --git a/eng/cibuild_bootstrapped_msbuild.ps1 b/eng/cibuild_bootstrapped_msbuild.ps1
+index b9c1cf4fe..906a33dc1 100644
+--- a/eng/cibuild_bootstrapped_msbuild.ps1
++++ b/eng/cibuild_bootstrapped_msbuild.ps1
+@@ -91,7 +91,7 @@ try {
+   else
+   {
+     $buildToolPath = $dotnetExePath
+-    $buildToolCommand = Join-Path $bootstrapRoot "net6.0\MSBuild\MSBuild.dll"
++    $buildToolCommand = Join-Path $bootstrapRoot "net7.0\MSBuild\MSBuild.dll"
+     $buildToolFramework = "netcoreapp3.1"
+   }
+ 
+diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh
+index e5425507f..b4404b7e4 100755
+--- a/eng/cibuild_bootstrapped_msbuild.sh
++++ b/eng/cibuild_bootstrapped_msbuild.sh
+@@ -63,7 +63,7 @@ bootstrapRoot="$Stage1Dir/bin/bootstrap"
+ if [ $host_type = "core" ]
+ then
+   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
+-  _InitializeBuildToolCommand="$bootstrapRoot/net6.0/MSBuild/MSBuild.dll"
++  _InitializeBuildToolCommand="$bootstrapRoot/net7.0/MSBuild/MSBuild.dll"
+   _InitializeBuildToolFramework="netcoreapp3.1"
+ elif [ $host_type = "mono" ]
+ then
+diff --git a/global.json b/global.json
+index 471f88dbc..efd25efd1 100644
+--- a/global.json
++++ b/global.json
+@@ -3,7 +3,7 @@
+     "allowPrerelease": true
+   },
+   "tools": {
+-    "dotnet": "6.0.200",
++    "dotnet": "7.0.100-preview.5.22307.18",
+     "vs": {
+       "version": "17.0"
+     }
+diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1
+index ef1959fc3..8cfecb6a0 100644
+--- a/scripts/Deploy-MSBuild.ps1
++++ b/scripts/Deploy-MSBuild.ps1
+@@ -69,7 +69,7 @@ else {
+ if ($runtime -eq "Desktop") {
+     $targetFramework = "net472"
+ } else {
+-    $targetFramework = "net6.0"
++    $targetFramework = "net7.0"
+ }
+ 
+ $bootstrapBinDirectory = "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework"
+diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs
+index b6d935f41..83035cd50 100644
+--- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs
++++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs
+@@ -85,13 +85,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting
+         }
+ 
+ 
+-        public static IDictionary<key, T> ImportDictionary<key, T, RMock>(this ProjectCollectionLinker importer, IDictionary<key, RMock> source)
++        public static IDictionary<Key, T> ImportDictionary<Key, T, RMock>(this ProjectCollectionLinker importer, IDictionary<Key, RMock> source)
+             where T : class
+             where RMock : MockLinkRemoter<T>, new()
+         {
+             if (source == null) return null;
+             // Just copy ...
+-            Dictionary<key, T> result = new Dictionary<key, T>();
++            Dictionary<Key, T> result = new Dictionary<Key, T>();
+             foreach (var sRemoter in source)
+             {
+                 var value = importer.Import<T, RMock>(sRemoter.Value);
+@@ -101,13 +101,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting
+             return result;
+         }
+ 
+-        public static IDictionary<key, RMock> ExportDictionary<key, T, RMock>(this ProjectCollectionLinker exporter, IDictionary<key, T> source)
++        public static IDictionary<Key, RMock> ExportDictionary<Key, T, RMock>(this ProjectCollectionLinker exporter, IDictionary<Key, T> source)
+             where T : class
+             where RMock : MockLinkRemoter<T>, new()
+         {
+             if (source == null) return null;
+             // Just copy ...
+-            Dictionary<key, RMock> result = new Dictionary<key, RMock>();
++            Dictionary<Key, RMock> result = new Dictionary<Key, RMock>();
+             foreach (var s in source)
+             {
+                 var valueRemoter = exporter.Export<T, RMock>(s.Value);
+diff --git a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
+index 8ddca6108..83a4382d8 100644
+--- a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
++++ b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj
+@@ -36,14 +36,14 @@
+     <ProjectReference Include="..\Samples\TaskWithDependency\TaskWithDependency.csproj" Private="false" ReferenceOutputAssembly="false" OutputItemType="TaskWithDependencyResolvedProjectReferencePath">
+       <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">TargetFramework=$(FullFrameworkTFM)</SetTargetFramework>
+       <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(MonoBuild)' == 'true'">TargetFramework=$(FullFrameworkTFM)</SetTargetFramework>
+-      <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">TargetFramework=net6.0</SetTargetFramework>
++      <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">TargetFramework=net7.0</SetTargetFramework>
+     </ProjectReference>
+     <ProjectReference Include="..\Samples\PortableTask\PortableTask.csproj" Private="false" ReferenceOutputAssembly="false" OutputItemType="PortableTaskResolvedProjectReferencePath" />
+ 
+     <ProjectReference Include="..\Samples\ProjectCachePlugin\ProjectCachePlugin.csproj" Private="false" ReferenceOutputAssembly="false">
+       <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">TargetFramework=$(FullFrameworkTFM)</SetTargetFramework>
+       <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(MonoBuild)' == 'true'">TargetFramework=$(FullFrameworkTFM)</SetTargetFramework>
+-      <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">TargetFramework=net6.0</SetTargetFramework>
++      <SetTargetFramework Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">TargetFramework=net7.0</SetTargetFramework>
+     </ProjectReference>
+   </ItemGroup>
+ 
+diff --git a/src/Build/Definition/ToolsetReader.cs b/src/Build/Definition/ToolsetReader.cs
+index 8887b9cca..ddb164cb7 100644
+--- a/src/Build/Definition/ToolsetReader.cs
++++ b/src/Build/Definition/ToolsetReader.cs
+@@ -12,7 +12,7 @@ using Microsoft.Build.Execution;
+ using Microsoft.Build.Framework;
+ using Microsoft.Build.Internal;
+ using Microsoft.Build.Shared.FileSystem;
+-using error = Microsoft.Build.Shared.ErrorUtilities;
++using ErrorUtils = Microsoft.Build.Shared.ErrorUtilities;
+ using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
+ using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException;
+ using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames;
+@@ -366,7 +366,7 @@ namespace Microsoft.Build.Evaluation
+             out string defaultOverrideToolsVersion
+             )
+         {
+-            error.VerifyThrowArgumentNull(toolsets, "Toolsets");
++            ErrorUtils.VerifyThrowArgumentNull(toolsets, "Toolsets");
+ 
+             ReadEachToolset(toolsets, globalProperties, initialProperties, accumulateProperties);
+ 
+diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
+index 309d14bdc..c4eb0bce6 100644
+--- a/src/Build/Microsoft.Build.csproj
++++ b/src/Build/Microsoft.Build.csproj
+@@ -4,7 +4,7 @@
+   <Import Project="..\Shared\DebuggingSources.proj" />
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>$(FullFrameworkTFM);net6.0</TargetFrameworks>
++    <TargetFrameworks>$(FullFrameworkTFM);net7.0</TargetFrameworks>
+     <TargetFrameworks Condition="'$(MonoBuild)'=='true'">$(RuntimeOutputTargetFrameworks)</TargetFrameworks>
+     <RootNamespace>Microsoft.Build</RootNamespace>
+     <AssemblyName>Microsoft.Build</AssemblyName>
+diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets
+index 6696e3861..40bc57ecb 100644
+--- a/src/Directory.BeforeCommon.targets
++++ b/src/Directory.BeforeCommon.targets
+@@ -92,7 +92,7 @@
+     <DefineConstants>$(DefineConstants);FEATURE_SYMLINK_TARGET</DefineConstants>
+   </PropertyGroup>
+ 
+-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'net6.0'">
++  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'net7.0'">
+     <DefineConstants>$(DefineConstants);FEATURE_PIPEOPTIONS_CURRENTUSERONLY</DefineConstants>
+     <DefineConstants Condition="'$(MachineIndependentBuild)' != 'true'">$(DefineConstants);FEATURE_NODE_REUSE</DefineConstants>
+   </PropertyGroup>
+diff --git a/src/Directory.Build.props b/src/Directory.Build.props
+index ccffd9b5c..6e12f1557 100644
+--- a/src/Directory.Build.props
++++ b/src/Directory.Build.props
+@@ -30,13 +30,13 @@
+     <Platforms>AnyCPU;x64;arm64</Platforms>
+ 
+     <!-- Defaults for target frameworks and architecture -->
+-    <LibraryTargetFrameworks>$(FullFrameworkTFM);net6.0;netstandard2.0</LibraryTargetFrameworks>
+-    <LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0;netstandard2.0</LibraryTargetFrameworks>
++    <LibraryTargetFrameworks>$(FullFrameworkTFM);net7.0;netstandard2.0</LibraryTargetFrameworks>
++    <LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0;netstandard2.0</LibraryTargetFrameworks>
+     <LibraryTargetFrameworks Condition="'$(MonoBuild)'=='true'">$(FullFrameworkTFM);netstandard2.0</LibraryTargetFrameworks>
+     <PlatformTarget>AnyCPU</PlatformTarget>
+ 
+     <!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
+-    <RuntimeOutputTargetFrameworks>net6.0</RuntimeOutputTargetFrameworks>
++    <RuntimeOutputTargetFrameworks>net7.0</RuntimeOutputTargetFrameworks>
+     <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks>
+     <RuntimeOutputTargetFrameworks Condition="'$(MonoBuild)' == 'true'">$(FullFrameworkTFM)</RuntimeOutputTargetFrameworks>
+ 
+diff --git a/src/Framework/README.md b/src/Framework/README.md
+index 1b72454f5..8a86bc21c 100644
+--- a/src/Framework/README.md
++++ b/src/Framework/README.md
+@@ -6,6 +6,6 @@ The items in this namespace are primarily base-level classes and interfaces shar
+ [`ITask`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.itask), and [`ILogger`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.ilogger).
+ 
+ ### netstandard2.0 target
+-The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios.
++The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios.
+ 
+ For context, see https://github.com/dotnet/msbuild/pull/6148
+\ No newline at end of file
+diff --git a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj
+index 9bb2da049..4766c0418 100644
+--- a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj
++++ b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj
+@@ -43,7 +43,7 @@
+   <Target Name="UpdateMSBuildDepsFile" AfterTargets="Build" Condition="'$(MonoBuild)' != 'true' and ($([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp2.1')) or '$(TargetFramework)' == 'netstandard2.0')">
+     <Copy SourceFiles="$(OutputPath)$(AssemblyName).deps.json" DestinationFiles="$(OutputPath)MSBuild.deps.json" />
+   </Target>
+-  <Target Name="UpdatePublishedMSBuildDepsFile" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net6.0'">
++  <Target Name="UpdatePublishedMSBuildDepsFile" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net7.0'">
+     <Copy SourceFiles="$(PublishDir)$(AssemblyName).deps.json" DestinationFiles="$(PublishDir)MSBuild.deps.json" />
+   </Target>
+ 
+diff --git a/src/Package/Localization/Localization.csproj b/src/Package/Localization/Localization.csproj
+index e15af6ed0..e6c8a82ee 100644
+--- a/src/Package/Localization/Localization.csproj
++++ b/src/Package/Localization/Localization.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFramework Condition="$(MonoBuild) != 'true'">net6.0</TargetFramework>
++    <TargetFramework Condition="$(MonoBuild) != 'true'">net7.0</TargetFramework>
+     <TargetFramework Condition="$(MonoBuild) == 'true'">net472</TargetFramework>
+     <NuspecFile>Microsoft.Build.Localization.nuspec</NuspecFile>
+     <IsShipping>false</IsShipping>
+diff --git a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj
+index 6972b5e9a..0e37d41d9 100644
+--- a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj
++++ b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj
+@@ -4,8 +4,8 @@
+     <CopyNuGetImplementations>false</CopyNuGetImplementations>
+     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ 
+-    <TargetFrameworks>net6.0</TargetFrameworks>
+-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);net6.0</TargetFrameworks>
++    <TargetFrameworks>net7.0</TargetFrameworks>
++    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);net7.0</TargetFrameworks>
+     <TargetFrameworks Condition="'$(MonoBuild)'=='true'">$(RuntimeOutputTargetFrameworks)</TargetFrameworks>
+   </PropertyGroup>
+   <ItemGroup>
+diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj
+index 5bd98bfbe..547075939 100644
+--- a/src/Tasks/Microsoft.Build.Tasks.csproj
++++ b/src/Tasks/Microsoft.Build.Tasks.csproj
+@@ -1013,7 +1013,7 @@
+     <PackageReference Include="System.Security.Permissions" />
+     <PackageReference Include="System.Threading.Tasks.Dataflow" />
+ 
+-    <Content Include="$(NuGetPackageRoot)microsoft.net.compilers.toolset\$(MicrosoftNetCompilersToolsetVersion)\tasks\net6.0\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="Roslyn" />
++    <Content Include="$(NuGetPackageRoot)microsoft.net.compilers.toolset\$(MicrosoftNetCompilersToolsetVersion)\tasks\net7.0\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="Roslyn" />
+   </ItemGroup>
+ 
+   <ItemGroup Condition="'$(MonoBuild)' == 'true'">
+diff --git a/src/Utilities/README.md b/src/Utilities/README.md
+index a85d56e11..99a1651b5 100644
+--- a/src/Utilities/README.md
++++ b/src/Utilities/README.md
+@@ -7,6 +7,6 @@ This package contains `Microsoft.Build.Utilities.Core.dll`, which defines helper
+ * [`Logger`](https://docs.microsoft.com/dotnet/api/microsoft.build.utilities.logger), a base class for custom logging functionality.
+ 
+ ### netstandard2.0 target
+-The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios.
++The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios.
+ 
+ For context, see https://github.com/dotnet/msbuild/pull/6148
+\ No newline at end of file

src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Wed, 3 Aug 2022 10:37:03 -0700
+Subject: [PATCH] Don't use ref struct in Enumerator constructor
+
+---
+ src/StringTools/InternableString.cs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/StringTools/InternableString.cs b/src/StringTools/InternableString.cs
+index f04d2a9e9..dc788767a 100644
+--- a/src/StringTools/InternableString.cs
++++ b/src/StringTools/InternableString.cs
+@@ -33,7 +33,7 @@ namespace Microsoft.NET.StringTools
+             /// </summary>
+             private int _charIndex;
+ 
+-            internal Enumerator(ref InternableString str)
++            internal Enumerator(InternableString str)
+             {
+                 _string = str;
+                 _spanIndex = -1;
+@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools
+         /// <returns>The enumerator.</returns>
+         public Enumerator GetEnumerator()
+         {
+-            return new Enumerator(ref this);
++            return new Enumerator(this);
+         }
+ 
+         /// <summary>

src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch

@@ -0,0 +1,129 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 1 Aug 2022 15:31:27 -0700
+Subject: [PATCH] Update TFM to net7.0 for source-build
+
+---
+ build/common.project.props                                  | 6 +++---
+ build/common.targets                                        | 2 +-
+ eng/source-build/global.json                                | 2 +-
+ .../NuGet.Configuration/NuGet.Configuration.csproj          | 2 +-
+ src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs       | 2 ++
+ src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs    | 6 ++++++
+ .../NuGet.PackageManagement/NuGet.PackageManagement.csproj  | 2 +-
+ 7 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/build/common.project.props b/build/common.project.props
+index 93287fdde..059adfa51 100644
+--- a/build/common.project.props
++++ b/build/common.project.props
+@@ -14,18 +14,18 @@
+     <NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
+     <NETFXTargetFramework>net472</NETFXTargetFramework>
+     <NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
+-    <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NETCoreTargetFramework>
++    <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</NETCoreTargetFramework>
+     <NETCoreTestTargetFramework>net6.0</NETCoreTestTargetFramework>
+     <NetStandardVersion>netstandard2.0</NetStandardVersion>
+     <TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
+     <TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
+     <TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
+     <TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
+-    <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net6.0</TargetFrameworksExeForSigning>
++    <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
+     <TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
+     <TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
+     <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
+-    <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
++    <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net7.0</TargetFrameworksLibraryForSigning>
+     <TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);net6.0</TargetFrameworksLibraryForCrossVerificationTests>
+     <RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
+     <BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
+diff --git a/build/common.targets b/build/common.targets
+index 69c72499b..01ec1b568 100644
+--- a/build/common.targets
++++ b/build/common.targets
+@@ -6,7 +6,7 @@
+     <IsDesktop>true</IsDesktop>
+   </PropertyGroup>
+ 
+-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) ">
++  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) ">
+     <DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
+     <IsCore>true</IsCore>
+   </PropertyGroup>
+diff --git a/eng/source-build/global.json b/eng/source-build/global.json
+index 2b9604572..d4d319b20 100644
+--- a/eng/source-build/global.json
++++ b/eng/source-build/global.json
+@@ -1,6 +1,6 @@
+ {
+   "tools": {
+-    "dotnet": "6.0.100-preview.7.21379.14"
++    "dotnet": "7.0.100-preview.6.22352.1"
+   },
+   "msbuild-sdks": {
+     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.7"
+diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
+index 53e500248..5edbc8281 100644
+--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
+@@ -29,7 +29,7 @@
+     <Reference Include="System.Xml.Linq" />
+   </ItemGroup>
+ 
+-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net6.0' ">
++  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
+     <PackageReference Include="System.Security.Cryptography.ProtectedData" />
+   </ItemGroup>
+ 
+diff --git a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
+index 6ec51bdd2..4839a2952 100644
+--- a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
++++ b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
+@@ -12,6 +12,7 @@ public static class FrameworkConstants
+         public static readonly Version MaxVersion = new Version(int.MaxValue, 0, 0, 0);
+         public static readonly Version Version5 = new Version(5, 0, 0, 0);
+         public static readonly Version Version6 = new Version(6, 0, 0, 0);
++        public static readonly Version Version7 = new Version(7, 0, 0, 0);
+         public static readonly Version Version10 = new Version(10, 0, 0, 0);
+         public static readonly FrameworkRange DotNetAll = new FrameworkRange(
+                         new NuGetFramework(FrameworkIdentifiers.NetPlatform, FrameworkConstants.EmptyVersion),
+@@ -186,6 +187,7 @@ public static class CommonFrameworks
+             // .NET 5.0 and later has NetCoreApp identifier
+             public static readonly NuGetFramework Net50 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version5);
+             public static readonly NuGetFramework Net60 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6);
++            public static readonly NuGetFramework Net70 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7);
+ 
+             public static readonly NuGetFramework Native = new NuGetFramework(FrameworkIdentifiers.Native, new Version(0, 0, 0, 0));
+         }
+diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
+index cbbb3af0c..67a355cc8 100644
+--- a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
++++ b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
+@@ -686,6 +686,12 @@ private static bool TryParseCommonFramework(string frameworkString, out NuGetFra
+                 case "net60":
+                     framework = FrameworkConstants.CommonFrameworks.Net60;
+                     break;
++                case "netcoreapp7.0":
++                case "netcoreapp70":
++                case "net7.0":
++                case "net70":
++                    framework = FrameworkConstants.CommonFrameworks.Net70;
++                    break;
+             }
+ 
+             return framework != null;
+diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
+index 8a9bc1778..01e0a0221 100644
+--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
+@@ -35,7 +35,7 @@
+     <Reference Include="System.Net.Http" />
+   </ItemGroup>
+ 
+-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net6.0' ">
++  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
+     <PackageReference Include="System.ComponentModel.Composition" />
+   </ItemGroup>
+ 

src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
-Date: Thu, 21 Oct 2021 23:15:23 +0000
-Subject: [PATCH] lift version of Microsoft.CodeAnalysis.Common dependencies to
- previously source built versions
-
-Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch
----
- .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-index 7eae8afa275..a50822a6aeb 100644
---- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
-@@ -27,5 +27,9 @@
-     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs" Link="Grammar\SyntaxKindFacts.cs" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
- 
-     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(SourceGeneratorMicrosoftCodeAnalysisVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Collections.Immutable" Version="$(SourceBuildLiftedSystemCollectionsImmutableVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Reflection.Metadata" Version="$(SourceBuildLiftedSystemReflectionMetadataVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SourceBuildLiftedSystemTextEncodingCodePagesVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-   </ItemGroup>
- </Project>
-\ No newline at end of file

src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Wed, 1 Jun 2022 10:10:01 -0500
-Subject: [PATCH] Temporarily patch out native sourcelink file check in
+Subject: [PATCH 1/5] Temporarily patch out native sourcelink file check in
  source-build. This returns source-build to its old behavior.
 
 Backport: https://github.com/dotnet/source-build/issues/2883

src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Logan Bussell <loganbussell@microsoft.com>
 Date: Thu, 14 Jul 2022 14:53:35 -0700
-Subject: [PATCH] Fully qualify conflicting runtime and roslyn APIs
+Subject: [PATCH 3/5] Fully qualify conflicting runtime and roslyn APIs
 
 ---
  .../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs   | 2 +-
@@ -22,7 +22,7 @@ index 43a498b589a..1bad8f3753c 100644
              const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute";
  
 diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
-index 33dd18fc67f..13005b9d0a9 100644
+index 7a472a994c9..36dc7500bea 100644
 --- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
 +++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
 @@ -20,7 +20,7 @@ public partial class RegexGenerator

src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch

@@ -0,0 +1,65 @@
+From 01e9fdd1449324e547230530aea2532488e0b0ce Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 12 Sep 2022 09:50:31 -0700
+Subject: [PATCH] [release/7.0] Target only net7.0 during source-build (#75168)
+
+* Target net7.0 in additional projects
+
+Backport: https://github.com/dotnet/runtime/pull/75168
+---
+ Directory.Build.props                                           | 1 +
+ eng/SourceBuild.props                                           | 1 +
+ .../src/System.Diagnostics.DiagnosticSource.csproj              | 2 --
+ .../tools/GenerateRegexCasingTable.csproj                       | 2 +-
+ 4 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 60a661e66ca44..ce67527ff8ed1 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -54,6 +54,7 @@
+     <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
+     <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+     <NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
++    <NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
+ 
+     <NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
+     <NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index c17838918f8ce..9ca390c502f75 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -39,6 +39,7 @@
+       <InnerBuildArgs>$(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
++      <InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
+     </PropertyGroup>
+   </Target>
+ 
+diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+index 9c22bce30dae9..6d40be2f856b7 100644
+--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
++++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+@@ -6,8 +6,6 @@
+     <NoWarn>$(NoWarn);SA1205;CA1845</NoWarn>
+     <EnableTrimAnalyzer Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">false</EnableTrimAnalyzer>
+     <IsPackable>true</IsPackable>
+-    <!-- Lifetime rules introduced in C# 11 impact scenarios in net6 framework -->
+-    <LangVersion Condition="'$(TargetFramework)' == 'net6.0'">10</LangVersion>
+     <EnableAOTAnalyzer>true</EnableAOTAnalyzer>
+     <PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)
+ 
+diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
+index 26b5733684c3f..4df9075220402 100644
+--- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
++++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+       <OutputType>Exe</OutputType>
+-      <TargetFramework>net6.0</TargetFramework>
++      <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+       <LangVersion>latest</LangVersion>
+       <Nullable>enable</Nullable>
+   </PropertyGroup>

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

@@ -1,7 +1,7 @@
 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] Disable CA1420
+Subject: [PATCH 1/2] Disable CA1420
 
 Workaround until NuGet updates to build with latest .NET toolset.
 ---
@@ -9,7 +9,7 @@ Workaround until NuGet updates to build with latest .NET toolset.
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 8ee962ab1d..ce999a306f 100644
+index 1353696a29..4e7463a453 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -13,9 +13,11 @@

src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch

@@ -0,0 +1,143 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Fri, 22 Jul 2022 15:10:08 -0700
+Subject: [PATCH] Change TargetFramework to net7.0
+
+---
+ .../Microsoft.DotNet.ApiCompat.Task.csproj                    | 2 +-
+ .../build/Microsoft.DotNet.ApiCompat.Task.targets             | 2 +-
+ .../Microsoft.DotNet.ApiCompat.Tool.csproj                    | 2 +-
+ .../Microsoft.DotNet.ApiCompatibility.csproj                  | 2 +-
+ .../Microsoft.DotNet.PackageValidation.csproj                 | 2 +-
+ .../Microsoft.Extensions.DotNetDeltaApplier.csproj            | 2 +-
+ .../Microsoft.DotNet.Cli.Utils.csproj                         | 2 +-
+ src/Layout/redist/targets/GenerateLayout.targets              | 4 ++--
+ src/Layout/redist/targets/OverlaySdkOnLKG.targets             | 2 +-
+ 9 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
+index 8177095a90..0c1f7acebf 100644
+--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
++    <TargetFrameworks>net7.0;net472</TargetFrameworks>
+     <IsPackable>true</IsPackable>
+     <IsShippingPackage>true</IsShippingPackage>
+     <StrongNameKeyId>Open</StrongNameKeyId>
+diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
+index fb49a12fb4..2ce737c75d 100644
+--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
+@@ -2,7 +2,7 @@
+ <Project>
+   <PropertyGroup>
+     <DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
+-    <DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
++    <DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
+     <UseApiCompatPackage>true</UseApiCompatPackage>
+     <!-- TODO: Remove when the consumers of this package upgraded to a newer SDK with this change. -->
+     <UseCompatibilityPackage>true</UseCompatibilityPackage>
+diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
+index 2de17ce715..32e6580920 100644
+--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net7.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+     <Nullable>enable</Nullable>
+     <IsPackable>true</IsPackable>
+diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
+index 7b8569a72b..b1e1e4d53e 100644
+--- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
++    <TargetFrameworks>net7.0;net472</TargetFrameworks>
+     <StrongNameKeyId>Open</StrongNameKeyId>
+     <Nullable>enable</Nullable>
+     <!-- We need to compare ISymbols in a special way (by name) and roslyn symbol comparers take more heuristics into consideration.-->
+diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+index aa6de655f5..fca12f7f67 100644
+--- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
++++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
++    <TargetFrameworks>net7.0;net472</TargetFrameworks>
+     <StrongNameKeyId>Open</StrongNameKeyId>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
+diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
+index 40927ae1f2..3c2236e38d 100644
+--- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
++++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <!-- Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.-->
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net7.0</TargetFramework>
+     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
+ 
+     <IsPackable>false</IsPackable>
+diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+index 006f56939d..ddcfe2e362 100644
+--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
++++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+@@ -22,7 +22,7 @@
+ 
+   <Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'">
+     <PropertyGroup>
+-      <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage>
++      <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
+     </PropertyGroup>
+     <Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
+     <ItemGroup>
+diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
+index 85adb4ed8a..d399fe6f29 100644
+--- a/src/Layout/redist/targets/GenerateLayout.targets
++++ b/src/Layout/redist/targets/GenerateLayout.targets
+@@ -161,7 +161,7 @@
+           BeforeTargets="Build">
+     <PropertyGroup>
+       <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' != 'true'" >netcoreapp3.1</TestCliNuGetDirectoryTargetFramework>
+-      <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'" >net6.0</TestCliNuGetDirectoryTargetFramework>
++      <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'" >net7.0</TestCliNuGetDirectoryTargetFramework>
+       <TestCliNuGetDirectory>$(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/</TestCliNuGetDirectory>
+     </PropertyGroup>
+     <ItemGroup>
+@@ -196,7 +196,7 @@
+     <ItemGroup>
+       <DotNetWatchFile Include="$(ArtifactsDir)bin\dotnet-watch\$(Configuration)\$(SdkTargetFramework)\**" />
+       <DotNetWatchFile Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.Watch.BrowserRefresh\$(Configuration)\netcoreapp3.1\*.dll" DeploymentSubpath="middleware" />
+-      <DotNetWatchFile Include="$(ArtifactsDir)bin\Microsoft.Extensions.DotNetDeltaApplier\$(Configuration)\net6.0\*.dll" DeploymentSubpath="hotreload" />
++      <DotNetWatchFile Include="$(ArtifactsDir)bin\Microsoft.Extensions.DotNetDeltaApplier\$(Configuration)\net7.0\*.dll" DeploymentSubpath="hotreload" />
+       <DotNetWatchFile Include="$(ArtifactsDir)bin\DotNetWatchTasks\$(Configuration)\netstandard2.0\DotNetWatchTasks.dll" />
+     </ItemGroup>
+ 
+diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+index b31188d592..4052c1581b 100644
+--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
++++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+@@ -77,7 +77,7 @@
+       <DotNetWatchOverlay Remove="$(ArtifactsDir)bin\dotnet-watch\$(Configuration)\$(SdkTargetFramework)\Microsoft.CodeAnalysis.CSharp.dll" />
+       <DotNetWatchOverlay Remove="$(ArtifactsDir)bin\dotnet-watch\$(Configuration)\$(SdkTargetFramework)\Microsoft.CodeAnalysis.dll" />
+       <DotNetWatchOverlay Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.Watch.BrowserRefresh\$(Configuration)\netcoreapp3.1\*.dll" TargetDir="middleware" />
+-      <DotNetWatchOverlay Include="$(ArtifactsDir)bin\Microsoft.Extensions.DotNetDeltaApplier\$(Configuration)\net6.0\*.dll" TargetDir="hotreload" />
++      <DotNetWatchOverlay Include="$(ArtifactsDir)bin\Microsoft.Extensions.DotNetDeltaApplier\$(Configuration)\net7.0\*.dll" TargetDir="hotreload" />
+       <DotNetWatchOverlay Include="$(ArtifactsDir)bin\DotNetWatchTasks\$(Configuration)\netstandard2.0\DotNetWatchTasks.dll" />
+     </ItemGroup>
+ 

src/redist/targets/BundledManifests.targets

@@ -1,11 +1,11 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="6.0.300" Version="$(XamarinAndroidWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinAndroidWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="6.0.300" Version="$(XamarinIOSWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinIOSWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="6.0.300" Version="$(XamarinMacCatalystWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacCatalystWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="6.0.300" Version="$(XamarinMacOSWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacOSWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="6.0.300" Version="$(MauiWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="$(MauiFeatureBand)" Version="$(MauiWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="6.0.300" Version="$(XamarinTvOSWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinTvOSWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="8.0.100" Version="$(MonoWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Emscripten.net6" FeatureBand="8.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Emscripten.net7" FeatureBand="8.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
@@ -56,9 +56,8 @@
     <ItemGroup>
       <!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
       <BundledManifestsToValidateSigning Include="@(BundledManifests)"
-          Condition="!$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Mono.ToolChain')) and
+        Exclude="Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7" />
-                     !$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Emscripten'))" />
+      
-
       <SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
     </ItemGroup>
 

src/redist/targets/GenerateBundledVersions.targets

@@ -1013,11 +1013,18 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Supported Windows versions -->
     <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="6.0" />
-    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="6.0" />
-    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="6.0" />
-    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="6.0" />
-    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="6.0" />
-    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="6.0" />
+    
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="10.0.22000.26" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="10.0.20348.26" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="10.0.19041.26" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="10.0.18362.26" MinimumNETVersion="5.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="10.0.17763.26" MinimumNETVersion="5.0" />
+    
     <WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
 

test/SdkTests/TestsToSkipPortableLinux.xml

@@ -3,5 +3,9 @@
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_publishes_as_framework_dependent_by_default"
             Skip="true"
             Reason="https://github.com/NuGet/Home/issues/8571"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_framework_dependent_for_2x"
+            Skip="true"
+            Reason="https://github.com/NuGet/Home/issues/8571"/>
   </SkippedTests>
 </Tests>