diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8b0311e91..ff04a8a6f 100644 --- a/.vsts-ci.yml +++ b/.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 - value: true -- ${{ if eq(variables['System.TeamProject'], 'public') }}: - - name: "skipComponentGovernanceDetection" - value: "true" +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - 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 diff --git a/NuGet.config b/NuGet.config index 2417daf60..d9926d9b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817f..7707ace1a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d87026d7..6b4ba4089 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,6 +174,10 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 + + https://github.com/dotnet/emsdk + 6736b00d7d23b40b8b6975439421cb2e41a781db + https://github.com/dotnet/emsdk 6736b00d7d23b40b8b6975439421cb2e41a781db @@ -183,11 +187,6 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/diagnostics - ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1 - - https://github.com/dotnet/source-build-externals 4663cca8b51b481bfd5e82695d2027d05688b5de diff --git a/eng/Versions.props b/eng/Versions.props index a86703c81..391229853 100644 --- a/eng/Versions.props +++ b/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. --> - 0.1.0-7.0.100-bootstrap.11 - 0.1.0-7.0.100-8 + 7.0.100-rc.1 + 0.1.0-7.0.100-9 - 6.0.312 - 32.0.301 - 15.4.303 - 15.4.303 - 12.3.303 - 15.4.303 + 7.0.100-rc.1 + 7.0.0-rc.1.6430 + 33.0.0-rc.1.136 + 15.4.1006-rc.1 + 15.4.1006-rc.1 + 12.3.1006-rc.1 + 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) + 8.0.0-alpha.1.22462.1 8.0.0-alpha.1.22462.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/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, diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index 9518a07d6..3de474133 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,12 +11,12 @@ should be added to source-build-reference-packages. --> - - - - - - + + + + + + diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 7164fb0e8..731e5665e 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/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)" /> diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 86dddeaa1..0d6bbb91e 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/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)" - if [ ! -d "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ]; then - echo "Custom prviously built packages directory '$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR' does not exist" + CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)" + if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then + 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 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 3cbdebc33..8d6aba31b 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/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", diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 7d907a9f1..937ab8f54 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -35,17 +35,17 @@ + - - + diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 29e53696f..51efdd92e 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -32,10 +32,6 @@ need to support VS. --> - - - - diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index fc077fb19..b2ed5661f 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/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"); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index a9361453e..ae5508aa4 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/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); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config index 78195779b..feac553a9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config @@ -3,5 +3,6 @@ + diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch new file mode 100644 index 000000000..d875d0aeb --- /dev/null +++ b/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 +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);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604 + MIT + 10.0 ++ net7.0 + + + +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 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + false + + +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 @@ + false + + +- net461;net5.0;net6.0; +- net5.0;net6.0; ++ net461;net5.0;net6.0;net7.0 ++ net5.0;net6.0;net7.0 + + + False +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 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + AutoGeneratedProgram + + true +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 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + true + true +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 @@ +  + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + false + +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 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + 10 + +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 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + false + + +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 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + + + +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 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + + + +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 @@ +  + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + true + true + dotnet-suggest +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 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + false + +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 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + + false + + + +- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll ++ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll + + + +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 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + enable + enable + true +@@ -10,7 +10,7 @@ + + + +- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll ++ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll + + + +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 @@ + + true + System.CommandLine +- net6.0;netstandard2.0 ++ $(TargetFrameworkForNETSDK);netstandard2.0 + enable + true + 10 +@@ -15,9 +15,12 @@ + * Test and debug support + + true ++ true ++ ++ ++ + true + true +- true + + + diff --git a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch b/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch deleted file mode 100644 index df105b15d..000000000 --- a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -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 @@ - 2.0.250401 - 16.9.0-beta1.21055.5 - 2.0.64 -- 2.1.1 -+ 2.1.1 - - 5.0.1 - 2.0.0-beta1.20468.1 -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 @@ - - - -- -+ - - - -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 @@ - - - -- -+ - - - -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 @@ - - - -- -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch new file mode 100644 index 000000000..bf87a65d5 --- /dev/null +++ b/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);NU1603;NU5105;1701;1702;SYSLIB0011 ++ $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044 + + + +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. --> + ++ DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net7.0" /> + + +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 ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) ++ public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) + where T : class + where RMock : MockLinkRemoter, new() + { + if (source == null) return null; + // Just copy ... +- Dictionary result = new Dictionary(); ++ Dictionary result = new Dictionary(); + foreach (var sRemoter in source) + { + var value = importer.Import(sRemoter.Value); +@@ -101,13 +101,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting + return result; + } + +- public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) ++ public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) + where T : class + where RMock : MockLinkRemoter, new() + { + if (source == null) return null; + // Just copy ... +- Dictionary result = new Dictionary(); ++ Dictionary result = new Dictionary(); + foreach (var s in source) + { + var valueRemoter = exporter.Export(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 @@ + + TargetFramework=$(FullFrameworkTFM) + TargetFramework=$(FullFrameworkTFM) +- TargetFramework=net6.0 ++ TargetFramework=net7.0 + + + + + TargetFramework=$(FullFrameworkTFM) + TargetFramework=$(FullFrameworkTFM) +- TargetFramework=net6.0 ++ TargetFramework=net7.0 + + + +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 @@ + + + +- $(FullFrameworkTFM);net6.0 ++ $(FullFrameworkTFM);net7.0 + $(RuntimeOutputTargetFrameworks) + Microsoft.Build + Microsoft.Build +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);FEATURE_SYMLINK_TARGET + + +- ++ + $(DefineConstants);FEATURE_PIPEOPTIONS_CURRENTUSERONLY + $(DefineConstants);FEATURE_NODE_REUSE + +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 @@ + AnyCPU;x64;arm64 + + +- $(FullFrameworkTFM);net6.0;netstandard2.0 +- net6.0;netstandard2.0 ++ $(FullFrameworkTFM);net7.0;netstandard2.0 ++ net7.0;netstandard2.0 + $(FullFrameworkTFM);netstandard2.0 + AnyCPU + + +- net6.0 ++ net7.0 + $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + +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 @@ + + + +- ++ + + + +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 @@ +  + +- net6.0 ++ net7.0 + net472 + Microsoft.Build.Localization.nuspec + false +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 @@ + false + false + +- net6.0 +- $(FullFrameworkTFM);net6.0 ++ net7.0 ++ $(FullFrameworkTFM);net7.0 + $(RuntimeOutputTargetFrameworks) + + +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 @@ + + + +- ++ + + + +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 diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch new file mode 100644 index 000000000..7a7d5bf8f --- /dev/null +++ b/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 +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 + /// + private int _charIndex; + +- internal Enumerator(ref InternableString str) ++ internal Enumerator(InternableString str) + { + _string = str; + _spanIndex = -1; +@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools + /// The enumerator. + public Enumerator GetEnumerator() + { +- return new Enumerator(ref this); ++ return new Enumerator(this); + } + + /// diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch new file mode 100644 index 000000000..054c48eb5 --- /dev/null +++ b/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 +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 @@ + v4.7.2 + net472 + netcoreapp3.1 +- net6.0 ++ net7.0 + net6.0 + netstandard2.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) + $(TargetFrameworksExe);netcoreapp5.0 + $(NETCoreTargetFramework);netcoreapp5.0 +- $(TargetFrameworksExe);net6.0 ++ $(TargetFrameworksExe);net7.0 + $(NETFXTargetFramework);$(NetStandardVersion) + $(NETCoreTargetFramework);$(NETFXTargetFramework);$(NetStandardVersion) + $(TargetFrameworksLibrary);netcoreapp5.0 +- $(TargetFrameworksLibrary);net6.0 ++ $(TargetFrameworksLibrary);net7.0 + $(NETFXTargetFramework);net6.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ + $(RepositoryRootDirectory)build\ +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 @@ + true + + +- ++ + $(DefineConstants);IS_CORECLR + true + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch deleted file mode 100644 index 722a34526..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch +++ /dev/null @@ -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 @@ - - - -+ -+ -+ -+ - - -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch b/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch index 5611ac154..3d7ba1e1f 100644 --- a/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch +++ b/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 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 diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch similarity index 95% rename from src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch rename to src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch index 5325b7a93..f88b9fdf3 100644 --- a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch +++ b/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 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 diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch b/src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch new file mode 100644 index 000000000..883a61e0e --- /dev/null +++ b/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 +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 @@ + .NET $(NetCoreAppCurrentVersion) + net$(NetCoreAppCurrentVersion) + net6.0 ++ $(NetCoreAppCurrent) + + 7.0 + net$(NetCoreAppToolCurrentVersion) +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) /p:PortableBuild=$(SourceBuildPortable) + $(InnerBuildArgs) /p:BuildDebPackage=false + $(InnerBuildArgs) /p:EnableNgenOptimization=false ++ $(InnerBuildArgs) /p:EnablePackageValidation=false + + + +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);SA1205;CA1845 + false + true +- +- 10 + true + 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 @@ + + + Exe +- net6.0 ++ $(NetCoreAppToolCurrent) + latest + enable + diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch similarity index 94% rename from src/SourceBuild/tarball/patches/sdk/0002-Disable-CA1420.patch rename to src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index d95cf8479..f49d2ed95 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MichaelSimons 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 @@ diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch new file mode 100644 index 000000000..bb3c2b80f --- /dev/null +++ b/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 +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 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + true + true + Open +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 @@ + + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.Task.dll +- $(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.DotNet.ApiCompat.Task.dll ++ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.ApiCompat.Task.dll + true + + true +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 @@ +  + + +- net6.0 ++ net7.0 + Exe + enable + true +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 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + Open + enable + +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 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + Open + enable + +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 @@ +  + + +- net6.0 ++ net7.0 + MicrosoftAspNetCore + + false +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 @@ + + + +- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll ++ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll + + + +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"> + + netcoreapp3.1 +- net6.0 ++ net7.0 + $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ + + +@@ -196,7 +196,7 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 6192133e3..85af8880c 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,11 +1,11 @@ - - - - - - + + + + + + @@ -56,9 +56,8 @@ - + Exclude="Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7" /> + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index c40a67137..6eea3744a 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1013,11 +1013,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d..f9fe2c166 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + +