Merge branch 'main' into darc-main-38dd31c9-7830-422f-b0e7-575195bbe9bc

2022-01-24 14:45:03 -08:00 · 2022-01-24 14:45:03 -08:00 · 8fc39593e3
commit 8fc39593e3
parent 56ae7c4d7b 7abd046866
42 changed files with 314 additions and 420 deletions
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@ -46,6 +46,13 @@ stages:
 - stage: build
  jobs:
  - job: Publish_Build_Configuration
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCore1ESPool-Public
+        demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals build.windows.10.amd64.vs2019
    steps:
    - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
      artifact: BuildConfiguration
@ -371,8 +378,6 @@ stages:
          - Source_Build_Managed
          - Source_Build_Create_Tarball
        publishUsingPipelines: true
-        pool:
-          vmImage: vs2017-win2016

 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
  - template: eng\common\templates\post-build\post-build.yml
--- a/NuGet.config
+++ b/NuGet.config
@ -20,5 +20,14 @@
    <!-- Temporary feed for Xamarin workload manifest -->
    <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
  </packageSources>
-  <disabledPackageSources />
+  <disabledPackageSources>
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+  </disabledPackageSources>
 </configuration>
--- a/README.md
+++ b/README.md
@ -58,9 +58,10 @@ This repo also contains code to help you build the entire .NET product end-to-en

 # Build status

-|All legs|
-|:------:|
-|[![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)|
+Visibility|All legs|
+|:------|:------|
+|Public|[![Status](https://dev.azure.com/dnceng/public/_apis/build/status/176)](https://dev.azure.com/dnceng/public/_build?definitionId=176)|
+|Microsoft Internal|[![Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)|

 Installers and Binaries
 -----------------------
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -177,19 +177,19 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22063.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22068.3">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
+      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22063.6">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22068.3">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
+      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22063.6">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22068.3">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecf92bbdc4354adc1960fa53808e87d91624f9b5</Sha>
+      <Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
    </Dependency>
    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22055.1">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@ -201,9 +201,9 @@
      <Sha>04c1b6d4da38e8e47593f4f98c3a620715e375ea</Sha>
      <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22057.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22065.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>9eccf0f490397043a39454d810b82a0474687226</Sha>
+      <Sha>59c4d4a3a4e9a375387686727d6f96df6f7ef471</Sha>
      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
    </Dependency>
  </ToolsetDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -10,8 +10,8 @@
    <VersionSDKMinor>1</VersionSDKMinor>
    <VersionFeature>00</VersionFeature>
    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
-    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
    <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
    <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
    <!-- Enable to remove prerelease label. -->
@ -26,7 +26,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22063.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@ -23,7 +23,7 @@ steps:
    # In addition, add an msbuild argument to copy the WIP from the repo to the target build location.
    # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those
    # changes.
-    $internalRestoreArgs=
+    internalRestoreArgs=
    if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then
      # Temporarily work around https://github.com/dotnet/arcade/issues/7709
      chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
--- a/global.json
+++ b/global.json
@ -11,7 +11,7 @@
    "cmake": "3.16.4"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.6",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22063.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22068.3",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22068.3"
  }
 }
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
@ -12,7 +12,11 @@ jobs:
      name: NetCore1ESPool-Internal
      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
  variables:
-    _BuildConfig: Release
+  - name: _BuildConfig
+    value: Release
+
+  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    - group: DotNet-Source-Build-All-Orgs-Source-Access
  workspace:
    clean: all

@ -50,10 +54,26 @@ jobs:
        $officialBuildArgs \
        $internalRuntimeDownloadArgs \
        /p:DotNetPublishUsingPipelines=true \
-        /p:ArcadeBuildTarball=true
+        /p:ArcadeBuildTarball=true \
+        /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
    displayName: Create Tarball

-  - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
+  - task: CopyFiles@2
+    displayName: Prepare BuildLogs staging directory
+    inputs:
+      Contents: |
+        **/*.log
+        **/*.binlog
+      TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
+      CleanTargetFolder: true
+    continueOnError: true
+    condition: succeededOrFailed()
+
+  - publish: '$(Build.StagingDirectory)/BuildLogs'
+    artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
+    displayName: Publish BuildLogs
+    continueOnError: true
+    condition: succeededOrFailed()

  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
    # Check if the tarball should be built now so the result can be used in the build tarball job condition.
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
@ -12,7 +12,11 @@ parameters:

  # The following parameters aren't expected to be passed in rather they are used for encapsulation
  # -----------------------------------------------------------------------------------------------
+  centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80
+  centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b
+  debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
  fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
+  ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
  poolInternal:
    name: NetCore1ESPool-Svc-Internal
    demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
@ -35,15 +39,38 @@ jobs:
      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
  strategy:
    matrix:
-      Fedora33-Online:
+      CentOS7-Online:
+        _BootstrapPrep: true
        _BuildArch: x64
-        _Container: ${{ parameters.fedora33Container }}
+        _Container: ${{ parameters.centOS7Container }}
+        _ExcludeOmniSharpTests: true
        _RunOnline: true
-      Fedora33-Offline:
-        _BuildArch: x64
-        _Container: ${{ parameters.fedora33Container }}
-        _RunOnline: false
-  timeoutInMinutes: 240
+      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        CentOS7-Offline:
+          _BootstrapPrep: true
+          _BuildArch: x64
+          _Container: ${{ parameters.centOS7Container }}
+          _ExcludeOmniSharpTests: true
+          _RunOnline: false
+        CentOS8-Offline:
+          _BootstrapPrep: true
+          _BuildArch: x64
+          _Container: ${{ parameters.centOS8Container }}
+          _ExcludeOmniSharpTests: false
+          _RunOnline: false
+        Fedora33-Offline:
+          _BootstrapPrep: false
+          _BuildArch: x64
+          _Container: ${{ parameters.fedora33Container }}
+          _ExcludeOmniSharpTests: false
+          _RunOnline: false
+        Ubuntu1804-Offline:
+          _BootstrapPrep: true
+          _BuildArch: x64
+          _Container: ${{ parameters.ubuntu1804Container }}
+          _ExcludeOmniSharpTests: false
+          _RunOnline: false
+  timeoutInMinutes: 300
  workspace:
    clean: all

@ -54,10 +81,16 @@ jobs:
    parameters:
      buildArch: $(_BuildArch)
      container: $(_Container)
+      excludeOmniSharpTests: $(_ExcludeOmniSharpTests)
      prepScript: |
        set -x

-        docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh
+        customPrepArgs=
+        if [ '$(_BootstrapPrep)' = 'true' ]; then
+          customPrepArgs='--bootstrap'
+        fi
+
+        docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh  ${customPrepArgs}
      runOnline: $(_RunOnline)
      tarballDir: ${{ parameters.tarballDir }}
      tarballResourceId: ${{ parameters.tarballResourceId }}
--- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
@ -10,6 +10,9 @@ parameters:
  # Container image to build within
  container: null

+  # Skip running the OmniSharp smoke-tests
+  excludeOmniSharpTests: false
+
  # Script logic to prep the tarball for building
  prepScript: null

@ -63,12 +66,32 @@ steps:
  - script: |
      set -x

-      docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
+      docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e excludeOmniSharpTests=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
    displayName: Run Tests

-  - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
-    parameters:
-      sourceFolder: ${{ parameters.tarballDir }}
+  # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.
+  - script: |
+      set -x
+
+      targetFolder=$(Build.StagingDirectory)/BuildLogs/
+      mkdir -p ${targetFolder}
+
+      cd "${{ parameters.tarballDir }}"
+      find artifacts/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
+      find artifacts/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \;
+      find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \;
+      find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
+      find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \;
+      find testing-smoke/logs -exec cp {} --parents -t ${targetFolder} \;
+    displayName: Prepare BuildLogs staging directory
+    continueOnError: true
+    condition: succeededOrFailed()
+
+  - publish: '$(Build.StagingDirectory)/BuildLogs'
+    artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
+    displayName: Publish BuildLogs
+    continueOnError: true
+    condition: succeededOrFailed()

  - publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/'
    artifact: $(Agent.JobName)_Artifacts
--- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
@ -1,25 +0,0 @@
-# Gathers and publishes the build logs for a source-build
-
-parameters:
-  # Folder to scan for source-build logs from
-  sourceFolder: $(Build.SourcesDirectory)
-
-steps:
- task: CopyFiles@2
-  displayName: Prepare BuildLogs staging directory
-  inputs:
-    SourceFolder: '${{ parameters.sourceFolder }}'
-    Contents: |
-      **/*.log
-      **/*.binlog
-      artifacts/prebuilt-report/*
-    TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
-    CleanTargetFolder: true
-  continueOnError: true
-  condition: succeededOrFailed()
-
- publish: '$(Build.StagingDirectory)/BuildLogs'
-  artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt)
-  displayName: Publish BuildLogs
-  continueOnError: true
-  condition: succeededOrFailed()
--- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
@ -3,6 +3,7 @@

 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
@ -21,6 +22,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks
        [Required]
        public string SourceBuildIntermediateNupkgPrefix { get; set; }

+        /// <summary>
+        /// Convert any internal repo references to the public GitHub repos.
+        /// </summary>
+        public bool ConvertInternalRepos { get; set; }
+
        /// <summary>
        /// The intermediate nupkg RID to use if any RID-specific intermediate nupkgs are required.
        /// If this parameter isn't specified, RID-specific intermediate nupkgs can't be used and
@ -88,6 +94,11 @@ namespace Microsoft.DotNet.SourceBuild.Tasks
                    string dependencyVersion = d.Attribute("Version")?.Value;

                    string uri = d.Element(CreateQualifiedName("Uri"))?.Value;
+                    if (ConvertInternalRepos)
+                    {
+                        uri = ConvertInternalRepo(uri);
+                    }
+
                    string sha = d.Element(CreateQualifiedName("Sha"))?.Value;
                    string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value;

@ -137,5 +148,33 @@ namespace Microsoft.DotNet.SourceBuild.Tasks

            return !Log.HasLoggedErrors;
        }
+
+        private string ConvertInternalRepo(string uri)
+        {
+            if (uri.StartsWith("https://dev.azure.com", StringComparison.OrdinalIgnoreCase))
+            {
+                string[] repoParts = uri.Substring(uri.LastIndexOf('/')).Split('-', 2);
+
+                if (repoParts.Length != 2)
+                {
+                    Log.LogError($"Repo '{uri}' does not end with the expected <GH organization>-<GH repo> format");
+                    return null;
+                }
+
+                string org = repoParts[0];
+                string repo = repoParts[1];
+
+                // The internal Nuget.Client repo has suffix which needs to be accounted for.
+                const string trustedSuffix = "-Trusted";
+                if (uri.EndsWith(trustedSuffix, StringComparison.OrdinalIgnoreCase))
+                {
+                    repo = repo.Substring(0, repo.Length - trustedSuffix.Length);
+                }
+
+                uri = $"https://github.com/{org}/{repo}";
+            }
+
+            return uri;
+        }
    }
 }
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@ -19,6 +19,7 @@
    <TarballSourceDir>$(TarballRootDir)src/</TarballSourceDir>
    <TarballGitInfoDir>$(TarballRootDir)git-info/</TarballGitInfoDir>
    <CloneVerbosity>quiet</CloneVerbosity> <!-- Support quiet and full -->
+    <ConvertInternalRepos Condition="'$(ConvertInternalRepos)' == '' and '$(VSS_NUGET_EXTERNAL_FEED_ENDPOINTS)' == '' ">true</ConvertInternalRepos>
  </PropertyGroup>

  <Target Name="CreateSourceTarball"
@ -123,6 +124,7 @@
      <TarballRepoSourceEngDir>$(TarballSourceDir)$(SourceDir)eng/</TarballRepoSourceEngDir>
      <TarballVersionDetailsFile>$(TarballRepoSourceEngDir)Version.Details.xml</TarballVersionDetailsFile>
      <CloneParam Condition=" '$(CloneVerbosity)' == 'quiet' ">-q</CloneParam>
+      <RepoUri Condition=" '$(AzDoPat)' != '' ">$(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com'))</RepoUri>
    </PropertyGroup>

    <!-- Perform a local clone of the root repo, it's faster and doesn't require the RepoSha to be a tree. -->
@ -202,7 +204,8 @@
    <Tarball_ReadSourceBuildIntermediateNupkgDependencies
      VersionDetailsXmlFile="$([MSBuild]::NormalizePath($(TarballVersionDetailsFile)))"
      SourceBuildIntermediateNupkgPrefix="$(SourceBuildIntermediateNupkgPrefix)"
-      SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)">
+      SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)"
+      ConvertInternalRepos="$(ConvertInternalRepos)">
      <Output TaskParameter="Dependencies" ItemName="SourceBuildRepos" />
    </Tarball_ReadSourceBuildIntermediateNupkgDependencies>

--- a/src/SourceBuild/tarball/content/build.sh
+++ b/src/SourceBuild/tarball/content/build.sh
@ -155,11 +155,12 @@ echo "Found bootstrap SDK $SDK_VERSION, bootstrap Arcade $ARCADE_BOOTSTRAP_VERSI
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export NUGET_PACKAGES=$restoredPackagesDir/

-if [ "$alternateTarget" == "true" ]; then
-  "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:source-build-test.binlog /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
-else
-  LogDateStamp=$(date +"%m%d%H%M%S")
-  $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
+LogDateStamp=$(date +"%m%d%H%M%S")

-  $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
+if [ "$alternateTarget" == "true" ]; then
+  "$CLI_ROOT/dotnet" $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll "$SCRIPT_ROOT/build.proj" /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log /clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
+else
+  $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log $SCRIPT_ROOT/tools-local/init-build.proj /t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
+
+  $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:$SCRIPT_ROOT/artifacts/log/Debug/Build_$LogDateStamp.binlog /fileLoggerParameters:LogFile=$SCRIPT_ROOT/artifacts/logs/Build_$LogDateStamp.log $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
 fi
--- a/src/SourceBuild/tarball/content/eng/Versions.props
+++ b/src/SourceBuild/tarball/content/eng/Versions.props
@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- SDK/Runtime Version Information -->
-  <PropertyGroup>
-    <MajorVersion>6</MajorVersion>
-    <MinorVersion>0</MinorVersion>
-    <RuntimePatchVersion>0-preview.6</RuntimePatchVersion>
-    <SdkPatchVersion>100-preview.6</SdkPatchVersion>
-    <RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
-    <AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
-    <SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
-  </PropertyGroup>
  <!-- Repo Version Information -->
  <PropertyGroup>
    <VersionPrefix>0.1.0</VersionPrefix>
--- a/src/SourceBuild/tarball/content/prep.sh
+++ b/src/SourceBuild/tarball/content/prep.sh
@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then
    fi

    # Run restore on project to initiate download of bootstrap packages
-    $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/"
+    $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/"

    # Remove working directory
    rm -rf $workingDir
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
@ -758,7 +758,7 @@

    <ItemGroup>
      <!-- This file is a resource tracked by Git, not generated by restore. Ignore false positive. -->
-      <IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)nuget.client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json"/>
+      <IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)*nuget-client*/**/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json"/>
    </ItemGroup>

    <WritePackageUsageData
--- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj
+++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
@ -50,24 +50,5 @@

  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceRegexInFiles" />

-  <Target Name="FixAspNetCoreVersion"
-          BeforeTargets="RepoBuild">
-
-    <ItemGroup>
-      <MinifiedJavascriptFile Include="$(ProjectDirectory)**\blazor.server.js" />
-    </ItemGroup>
-
-    <!--
-        Patch the version embedded in minified js files. Because they are
-        minified files, git patch doesn't work too well and produces unreadable
-        binary patches.
-    -->
-    <ReplaceRegexInFiles
-      InputFiles="@(MinifiedJavascriptFile)"
-      OldTextRegex=",l=&quot;5\.0\.\d+&quot;}]\);"
-      NewText=",l=&quot;$(AspNetCoreProductVersion)&quot;}]);" />
-
-  </Target>
-
  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
--- a/src/SourceBuild/tarball/content/smoke-test.sh
+++ b/src/SourceBuild/tarball/content/smoke-test.sh
@ -51,10 +51,13 @@ excludeWebNoHttpsTests=false
 excludeWebHttpsTests=false
 excludeLocalTests=false
 excludeOnlineTests=false
+excludeOmniSharpTests=${excludeOmniSharpTests:-false}
 devCertsVersion="$DEV_CERTS_VERSION_DEFAULT"
 testingDir="$SCRIPT_ROOT/testing-smoke"
 cliDir="$testingDir/builtCli"
-logFile="$testingDir/smoke-test.log"
+logsDir="$testingDir/logs"
+logFile="$logsDir/smoke-test.log"
+omnisharpLogFile="$logsDir/omnisharp.log"
 restoredPackagesDir="$testingDir/packages"
 testingHome="$testingDir/home"
 archiveRestoredPackages=false
@ -78,6 +81,7 @@ function usage() {
    echo "  --excludeWebHttpsTests         don't run web project tests with https using dotnet-dev-certs"
    echo "  --excludeLocalTests            exclude tests that use local sources for nuget packages"
    echo "  --excludeOnlineTests           exclude test that use online sources for nuget packages"
+    echo "  --excludeOmniSharpTests        don't run the OmniSharp tests"
    echo "  --devCertsVersion <version>    use dotnet-dev-certs <version> instead of default $DEV_CERTS_VERSION_DEFAULT"
    echo "  --prodConBlobFeedUrl <url>     override the prodcon blob feed specified in ProdConFeed.txt, removing it if empty"
    echo "  --archiveRestoredPackages      capture all restored packages to $archivedPackagesDir"
@ -136,6 +140,9 @@ while :; do
        --excludeonlinetests)
            excludeOnlineTests=true
            ;;
+        --excludeomnisharptests)
+            excludeOmniSharpTests=true
+            ;;
        --devcertsversion)
            shift
            devCertsVersion="$1"
@ -205,7 +212,7 @@ function doCommand() {
            binlogHttpsPart="https"
        fi

-        binlogPrefix="$testingDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_"
+        binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_"
        binlog="${binlogPrefix}$1.binlog"
        echo "    running $1" | tee -a "$logFile"

@ -618,7 +625,7 @@ function runOmniSharpTests() {
        "${dotnetCmd}" new $project
        popd

-        ./omnisharp/run -s "$(readlink -f hello-$project)" > omnisharp.log &
+        ./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" &

        sleep 5

@ -631,9 +638,9 @@ function runOmniSharpTests() {

        kill "$(pgrep -f "$(pwd)")"

-        cat omnisharp.log
+        cat "$omnisharpLogFile"

-        if grep ERROR omnisharp.log; then
+        if grep ERROR "$omnisharpLogFile"; then
            echo "test failed"
            exit 1
        else
@ -701,6 +708,7 @@ if [ -e "$testingDir"  ]; then
 fi

 mkdir -p "$testingDir"
+mkdir -p "$logsDir"
 cd "$testingDir"

 # Create blank Directory.Build files to avoid traversing to source-build infra.
@ -768,6 +776,8 @@ fi

 runXmlDocTests

-runOmniSharpTests
+if [ "$excludeOmniSharpTests" == "false" ]; then
+    runOmniSharpTests
+fi

 echo "ALL TESTS PASSED!"
--- a/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml
+++ b/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml
@ -1,168 +0,0 @@
-<UsageData>
-  <CreatedByRid>fedora.33-x64</CreatedByRid>
-  <ProjectDirectories>
-    <Dir>src/arcade.a3377cccde8639089f99107e2ba5df2c8cbe6394/</Dir>
-    <Dir>src/aspnetcore./</Dir>
-    <Dir>src/clicommandlineparser.3198bf5660cad3dab85f5475bf1fda9688146e3f/</Dir>
-    <Dir>src/command-line-api.5e855e911de7c56fe28400c4500e888fe2a3da8e/</Dir>
-    <Dir>src/diagnostics.6f48c2ae749c29b687af0353e6c2a9590d7e3d22/</Dir>
-    <Dir>src/fsharp./</Dir>
-    <Dir>src/installer.c6ec4363003b18d8e587620baa36205b80ee3074/</Dir>
-    <Dir>src/known-good-tests./</Dir>
-    <Dir>src/known-good./</Dir>
-    <Dir>src/linker.f2588193553431636b9853b0f87209fa395a72c5/</Dir>
-    <Dir>src/msbuild./</Dir>
-    <Dir>src/nuget.client./</Dir>
-    <Dir>src/package-source-build/</Dir>
-    <Dir>src/roslyn-analyzers./</Dir>
-    <Dir>src/roslyn./</Dir>
-    <Dir>src/runtime./</Dir>
-    <Dir>src/runtime./</Dir>
-    <Dir>src/sdk./</Dir>
-    <Dir>src/source-build-reference-packages.36fb56afdf0ee2fb2e0833bdef98dfde12a0837b/</Dir>
-    <Dir>src/source-build.3fb25b8db3bec654e37e71a5b2b7fde14444bc2f/</Dir>
-    <Dir>src/sourcelink.4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc/</Dir>
-    <Dir>src/symreader.1968a003d845d119a9d38ac4daaeea22897f7daf/</Dir>
-    <Dir>src/templating.3bc0d90f3e450f3e4ebda128081d091fb42968e3/</Dir>
-    <Dir>src/test-templates.6898c1c70c2d14e9725ddab6e1ebe8084c4d7e27/</Dir>
-    <Dir>src/vstest./</Dir>
-    <Dir>src/xdt.6a46e7c886cdf499ba3433f665ab417be814135e/</Dir>
-    <Dir>src/xliff-tasks.71c811561ad4dcf46825a5077fbcc668ab74754f/</Dir>
-    <Dir>Tools/</Dir>
-    <Dir>tools-local/tasks/</Dir>
-    <Dir>artifacts/obj/</Dir>
-    <Dir></Dir>
-  </ProjectDirectories>
-  <Usages>
-    <Usage Id="Microsoft.AspNetCore.App.Ref" Version="3.1.10" />
-    <Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
-    <Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Build" Version="16.7.0" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Build.Framework" Version="16.7.0" />
-    <Usage Id="Microsoft.Build.Framework" Version="17.0.0-preview-21267-01" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Build.Tasks.Core" Version="16.7.0" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Build.Utilities.Core" Version="16.7.0" />
-    <Usage Id="Microsoft.Build.Utilities.Core" Version="17.0.0-preview-21267-01" IsDirectDependency="true" />
-    <Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
-    <Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
-    <Usage Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
-    <Usage Id="Microsoft.CodeAnalysis.Common" Version="3.10.0-2.final" />
-    <Usage Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" IsDirectDependency="true" />
-    <Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.10.0-2.final" />
-    <Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.10.0-2.final" IsDirectDependency="true" />
-    <Usage Id="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0-2.final" IsDirectDependency="true" />
-    <Usage Id="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.10.0-2.final" />
-    <Usage Id="Microsoft.CodeCoverage" Version="16.7.1" />
-    <Usage Id="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21319.2" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Configuration" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Configuration.Binder" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.DependencyInjection" Version="2.1.1" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Logging" Version="2.1.1" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.Logging" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.Logging.Configuration" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.3.21164.3" IsDirectDependency="true" />
-    <Usage Id="Microsoft.Extensions.Options" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Options" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Extensions.Primitives" Version="2.1.1" />
-    <Usage Id="Microsoft.Extensions.Primitives" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="Microsoft.Net.Compilers.Toolset" Version="3.10.0-4.21310.5" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="Microsoft.NET.Sdk.WorkloadManifestReader" Version="6.0.100-preview.5.21254.11" IsDirectDependency="true" />
-    <Usage Id="Microsoft.NET.StringTools" Version="1.0.0-preview-21267-01" />
-    <Usage Id="Microsoft.NET.Test.Sdk" Version="16.7.1" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="5.0.5" />
-    <Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.0" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0-preview.1" IsDirectDependency="true" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0" />
-    <Usage Id="Microsoft.TestPlatform.ObjectModel" Version="16.7.1" />
-    <Usage Id="Microsoft.TestPlatform.TestHost" Version="16.7.1" />
-    <Usage Id="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
-    <Usage Id="Microsoft.Win32.SystemEvents" Version="4.7.0" />
-    <Usage Id="Mono.Cecil" Version="0.11.3" />
-    <Usage Id="NETStandard.Library" Version="1.6.0" />
-    <Usage Id="NETStandard.Library" Version="1.6.1" />
-    <Usage Id="Newtonsoft.Json" Version="13.0.1" />
-    <Usage Id="NuGet.Commands" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Common" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Common" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.Configuration" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Configuration" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.Credentials" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Credentials" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.DependencyResolver.Core" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Frameworks" Version="5.0.0+42a8779499c1d1ed2488c2e6b9e2ee6ff6107766" />
-    <Usage Id="NuGet.Frameworks" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Frameworks" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.LibraryModel" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Packaging" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Packaging" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.Packaging.Core" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.ProjectModel" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Protocol" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Protocol" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="NuGet.Versioning" Version="5.6.0-preview.2.6489+5433d816f748d4ad78b75fc320397d8117f57771" />
-    <Usage Id="NuGet.Versioning" Version="5.8.1+b257acfcdd76b32d4cddd549c177d99e800f4d83" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.4.20202.18" Rid="linux-x64" />
-    <Usage Id="runtime.native.System" Version="4.0.0" />
-    <Usage Id="runtime.native.System" Version="4.3.0" />
-    <Usage Id="runtime.native.System.IO.Compression" Version="4.3.0" />
-    <Usage Id="System.Collections.Immutable" Version="5.0.0" />
-    <Usage Id="System.Composition" Version="1.0.31" />
-    <Usage Id="System.Composition.AttributedModel" Version="1.0.31" />
-    <Usage Id="System.Composition.Convention" Version="1.0.31" />
-    <Usage Id="System.Composition.Hosting" Version="1.0.31" />
-    <Usage Id="System.Composition.Runtime" Version="1.0.31" />
-    <Usage Id="System.Composition.TypedParts" Version="1.0.31" />
-    <Usage Id="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <Usage Id="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="System.Drawing.Common" Version="4.7.0" />
-    <Usage Id="System.Formats.Asn1" Version="5.0.0" />
-    <Usage Id="System.IO.Pipelines" Version="5.0.1" />
-    <Usage Id="System.Memory" Version="4.5.0" IsDirectDependency="true" />
-    <Usage Id="System.Reflection.Metadata" Version="5.0.0" />
-    <Usage Id="System.Resources.Extensions" Version="4.6.0" />
-    <Usage Id="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" IsDirectDependency="true" />
-    <Usage Id="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
-    <Usage Id="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-    <Usage Id="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="System.Security.Cryptography.Cng" Version="4.4.0" IsDirectDependency="true" />
-    <Usage Id="System.Security.Cryptography.Cng" Version="5.0.0" />
-    <Usage Id="System.Security.Cryptography.Pkcs" Version="5.0.0" />
-    <Usage Id="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
-    <Usage Id="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
-    <Usage Id="System.Text.Encodings.Web" Version="4.7.1" />
-    <Usage Id="System.Text.Encodings.Web" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="System.Text.Json" Version="4.7.2" IsDirectDependency="true" />
-    <Usage Id="System.Text.Json" Version="6.0.0-preview.3.21164.3" />
-    <Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" IsDirectDependency="true" />
-    <Usage Id="System.ValueTuple" Version="4.3.0" />
-    <Usage Id="System.Windows.Extensions" Version="4.7.0" />
-    <Usage Id="WiX" Version="3.11.2" />
-    <Usage Id="xunit" Version="2.4.1" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="xunit.abstractions" Version="2.0.3" />
-    <Usage Id="xunit.analyzers" Version="0.10.0" />
-    <Usage Id="xunit.assert" Version="2.4.1" />
-    <Usage Id="xunit.core" Version="2.4.1" />
-    <Usage Id="xunit.extensibility.core" Version="2.4.1" />
-    <Usage Id="xunit.extensibility.execution" Version="2.4.1" />
-    <Usage Id="xunit.runner.console" Version="2.4.1" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="xunit.runner.visualstudio" Version="2.4.3" IsDirectDependency="true" IsAutoReferenced="true" />
-  </Usages>
-</UsageData>
--- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
+++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs
@ -17,9 +17,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
        [Required]
        public string DataFile { get; set; }

-        [Required]
-        public string BaselineDataFile { get; set; }
-
        [Required]
        public string OutputBaselineFile { get; set; }

@ -28,14 +25,25 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport

        public bool AllowTestProjectUsage { get; set; }

+        public string BaselineDataFile { get; set; }
+
        public override bool Execute()
        {
            var used = UsageData.Parse(XElement.Parse(File.ReadAllText(DataFile)));
-            var baseline = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile)));
+
+            IEnumerable<Usage> baselineUsages;
+            if (File.Exists(BaselineDataFile))
+            {
+                baselineUsages = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))).Usages;
+            }
+            else
+            {
+                baselineUsages = Enumerable.Empty<Usage>();
+            }

            Comparison<PackageIdentity> diff = Compare(
                used.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct(),
-                baseline.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct());
+                baselineUsages.Select(u => u.GetIdentityWithoutRid()).Distinct());

            var report = new XElement("BaselineComparison");

--- a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch
+++ b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch
@ -1,24 +0,0 @@
-From 3610fdc1ac6437973d539177c1427ed7f4f65c2e Mon Sep 17 00:00:00 2001
-From: Michael Simons <msimons@microsoft.com>
-Date: Fri, 27 Aug 2021 13:34:55 +0000
-Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0
-
---
- .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj         | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
-index ae34705a..bda5d581 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
-+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
-@@ -2,6 +2,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
-     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-     <LangVersion>Latest</LangVersion>
-     <IsPackable>true</IsPackable>
-- 
-2.29.2
-
--- a/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch
+++ b/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch
@ -1,26 +0,0 @@
-From 676bb5aa455dcf877c78792e4e5a62ca6a1d72c1 Mon Sep 17 00:00:00 2001
-From: Michael Simons <msimons@microsoft.com>
-Date: Wed, 8 Sep 2021 16:43:11 +0000
-Subject: [PATCH] Patch sdk.props to target net6.0
-
-Workaround for https://github.com/dotnet/arcade/issues/7413
---
- src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-index e3c50582..a577f923 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
-@@ -8,7 +8,7 @@
-   -->
- 
-   <PropertyGroup Condition="'$(DotNetSharedFrameworkTaskDir)' == ''">
-    <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</DotNetSharedFrameworkTaskDir>
-+    <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/net6.0/</DotNetSharedFrameworkTaskDir>
-     <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</DotNetSharedFrameworkTaskDir>
-   </PropertyGroup>
- 
-- 
-2.29.2
-
--- a/src/finalizer/finalizer.cpp
+++ b/src/finalizer/finalizer.cpp
@ -10,7 +10,7 @@ extern "C" HRESULT Initialize(int argc, wchar_t* argv[])
    // We're not going to do any clever parsing. This is intended to be called from
    // the standalone bundle only and there will only be a fixed set of parameters:
    // 1. The path of the log file, created by the bundle.
-    // 2. The full SDK version, e.g. 6.0.105 or 6.0.398-preview19
+    // 2. The full SDK version, e.g. 6.0.105 or 6.0.398-preview.19
    // 3. Target platform to search under the registry key to locate installed SDKs.
    if (4 != argc)
    {
@ -53,7 +53,7 @@ extern "C" HRESULT DeleteWorkloadRecords(LPWSTR sczSdkFeatureBandVersion, LPWSTR
    DWORD cbValues = 0;
    BOOL bDeleteKey = FALSE;

-    hr = StrAllocConcatFormatted(&sczKeyName, L"SOFTWARE\\Microsoft\\dotnet\\InstalledWorkloads\\Standalone\\%ls", sczArchitecture);
+    hr = StrAllocFormatted(&sczKeyName, L"SOFTWARE\\Microsoft\\dotnet\\InstalledWorkloads\\Standalone\\%ls", sczArchitecture);
    ExitOnFailure(hr, "Failed to allocate string for workload records registry path.");

    hr = RegOpen(HKEY_LOCAL_MACHINE, sczKeyName, KEY_READ | KEY_WRITE, &hkWorkloadRecordsKey);
@ -295,14 +295,56 @@ LExit:
    return hr;
 }

-extern "C" HRESULT ParseSdkVersion(LPWSTR sczSdkVersion, INT * piMajor, INT * piMinor, INT * piFeatureBand)
+extern "C" HRESULT ParseSdkVersion(LPWSTR sczSdkVersion, LPWSTR * ppwzSdkFeatureBandVersion)
 {
    HRESULT hr = S_OK;
    UINT cVersionParts = 0;
+    UINT cSemanticParts = 0;
+    UINT cPrereleaseParts = 0;
+    DWORD cchPatch = 0;
    LPWSTR* rgsczVersionParts = NULL;
+    LPWSTR* rgsczSemanticParts = NULL;
+    LPWSTR* rgsczPrereleaseParts = NULL;
+    LPWSTR sczPrereleaseLabel = NULL;
+    int iMajor = 0;
+    int iMinor = 0;
+    int iFeatureBand = 0;
    int iPatch = 0;

-    hr = StrSplitAllocArray(&rgsczVersionParts, &cVersionParts, sczSdkVersion, L".");
+    LogStringLine(REPORT_STANDARD, "Parsing SDK version: %ls", sczSdkVersion);
+
+    // Split the version to separate potential prerelease labels from the core version
+    hr = StrSplitAllocArray(&rgsczSemanticParts, &cSemanticParts, sczSdkVersion, L"-");
+    ExitOnFailure(hr, "Failed to split version.");
+
+    if (2 == cSemanticParts)
+    {
+        LogStringLine(REPORT_STANDARD, "Semantic version component: %ls", rgsczSemanticParts[1]);
+
+        hr = StrSplitAllocArray(&rgsczPrereleaseParts, &cPrereleaseParts, rgsczSemanticParts[1], L".");
+        ExitOnFailure(hr, "Failed to split prerelease labels.");
+
+        // SDK versions for CI/DEV builds map to pure feature band versions, e.g. 6.0.108-ci maps to 6.0.100.
+        if ((CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, rgsczPrereleaseParts[0], -1, L"dev", -1)) &&
+            (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, rgsczPrereleaseParts[0], -1, L"ci", -1)))
+        {
+            if (1 <= cPrereleaseParts)
+            {
+                hr = StrAllocFormatted(&sczPrereleaseLabel, L"%ls.%ls", rgsczPrereleaseParts[0], rgsczPrereleaseParts[1]);
+                ExitOnFailure(hr, "Failed to allocate string for prerelease label.");
+            }
+            else
+            {
+                hr = StrAllocFormatted(&sczPrereleaseLabel, L"%ls", rgsczPrereleaseParts[0]);
+                ExitOnFailure(hr, "Failed to allocate string for prerelease label.");
+            }
+
+            LogStringLine(REPORT_STANDARD, "Prerelease label: %ls", sczPrereleaseLabel);
+        }
+    }
+
+    // Split the core version
+    hr = StrSplitAllocArray(&rgsczVersionParts, &cVersionParts, rgsczSemanticParts[0], L".");
    ExitOnFailure(hr, "Failed to split version.");

    // We only care about the major.minor.patch values
@ -313,15 +355,15 @@ extern "C" HRESULT ParseSdkVersion(LPWSTR sczSdkVersion, INT * piMajor, INT * pi
        ExitOnFailure(E_INVALIDARG, "Invalid SDK version: %ls %li", sczSdkVersion, cVersionParts);
    }

-    hr = StrStringToInt32(rgsczVersionParts[0], 0, piMajor);
+    hr = StrStringToInt32(rgsczVersionParts[0], 0, &iMajor);
    ExitOnFailure(hr, "Invalid major version.");
-    hr = StrStringToInt32(rgsczVersionParts[1], 0, piMinor);
+    hr = StrStringToInt32(rgsczVersionParts[1], 0, &iMinor);
    ExitOnFailure(hr, "Invalid minor version.");

    // If this is a valid SDK version the 'patch' should be a 3 digit field
    // containing the feature band and patch level, e.g. 100 or 207. We 
    // can discard any prerelease labels from the semantic version.
-    hr = StrStringToInt32(rgsczVersionParts[2], 3, &iPatch);
+    hr = StrStringToInt32(rgsczVersionParts[2], 0, &iPatch);
    ExitOnFailure(hr, "Invalid patch version.");

    if (100 > iPatch)
@ -330,10 +372,26 @@ extern "C" HRESULT ParseSdkVersion(LPWSTR sczSdkVersion, INT * piMajor, INT * pi
        ExitOnFailure(hr, "Invalid SDK feature band and patch level.");
    }

-    *piFeatureBand = iPatch - (iPatch % 100);
+    iFeatureBand = iPatch - (iPatch % 100);
+
+    if (NULL == sczPrereleaseLabel)
+    {
+        hr = StrAllocFormatted(ppwzSdkFeatureBandVersion, L"%li.%li.%li", iMajor, iMinor, iFeatureBand);
+        ExitOnFailure(hr, "Failed to allocate string for SDK feature band version.");
+    }
+    else
+    {
+        hr = StrAllocFormatted(ppwzSdkFeatureBandVersion, L"%li.%li.%li-%ls", iMajor, iMinor, iFeatureBand, sczPrereleaseLabel);
+        ExitOnFailure(hr, "Failed to allocate string for SDK feature band version.");
+    }
+
+    LogStringLine(REPORT_STANDARD, "SDK feature band version: %ls", *ppwzSdkFeatureBandVersion);

 LExit:
    ReleaseStrArray(rgsczVersionParts, cVersionParts);
+    ReleaseStrArray(rgsczSemanticParts, cSemanticParts);
+    ReleaseStrArray(rgsczPrereleaseParts, cPrereleaseParts);
+    ReleaseStr(sczPrereleaseLabel);
    return hr;
 }

@ -343,22 +401,15 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec
    HKEY hkInstalledSdkVersionsKey = NULL;
    LPWSTR sczInstalledSdkVersionsKeyName = NULL;
    LPWSTR sczSdkVersion = NULL;
+    LPWSTR sczInstalledFeatureBand = NULL;
    DWORD dwSdkVersionValueType = 0;
-    int iInstalledMajor = 0;
-    int iInstalledMinor = 0;
-    int iInstalledFeatureBand = 0;
-    int iExpectedMajor = 0;
-    int iExpectedMinor = 0;
-    int iExpectedFeatureBand = 0;
-
-    hr = ParseSdkVersion(sczSdkFeatureBandVersion, &iExpectedMajor, &iExpectedMinor, &iExpectedFeatureBand);

    LogStringLine(REPORT_STANDARD, "Detecting installed SDK versions for %ls", sczSdkFeatureBandVersion);

    // Scan the registry to see if any SDK matching the feature band we're trying to
    // clean up is still installed. All the installation keys reside in the 32-bit hive.   
-    hr = StrAllocConcatFormatted(&sczInstalledSdkVersionsKeyName, L"SOFTWARE\\WOW6432Node\\dotnet\\Setup\\InstalledVersions\\%ls\\sdk", sczArchitecture);
-    ExitOnFailure(hr, "Failed to allocate string for installed SDK versions.");
+    hr = StrAllocFormatted(&sczInstalledSdkVersionsKeyName, L"SOFTWARE\\WOW6432Node\\dotnet\\Setup\\InstalledVersions\\%ls\\sdk", sczArchitecture);
+    ExitOnFailure(hr, "Failed to allocate string for installed SDK versions key name.");

    LogStringLine(REPORT_STANDARD, "Scanning %ls", sczInstalledSdkVersionsKeyName);

@ -377,13 +428,13 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec

        ExitOnFailure(hr, "Failed to read SDK version values from registry.");

-        hr = ParseSdkVersion(sczSdkVersion, &iInstalledMajor, &iInstalledMinor, &iInstalledFeatureBand);
+        hr = ParseSdkVersion(sczSdkVersion, &sczInstalledFeatureBand);
        ExitOnFailure(hr, "Failed to parse %ls", sczSdkVersion);

-        LogStringLine(REPORT_STANDARD, "SDK version detected: %ls, mapping to %li.%li.%li.", sczSdkVersion, iInstalledMajor, iInstalledMinor, iInstalledFeatureBand);
+        LogStringLine(REPORT_STANDARD, "SDK version detected: %ls, mapping to %ls.", sczSdkVersion, sczInstalledFeatureBand);

        // Bail out on the first match.
-        if ((iInstalledMajor == iExpectedMajor) && (iInstalledMinor == iExpectedMinor) && (iInstalledFeatureBand == iExpectedFeatureBand))
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczInstalledFeatureBand, -1, sczSdkFeatureBandVersion, -1))
        {
            *pbInstalled = TRUE;
            break;
@ -394,6 +445,7 @@ LExit:
    ReleaseRegKey(hkInstalledSdkVersionsKey);
    ReleaseStr(sczInstalledSdkVersionsKeyName);
    ReleaseStr(sczSdkVersion);
+    ReleaseStr(sczInstalledFeatureBand);
    return hr;
 }

@ -413,14 +465,11 @@ int wmain(int argc, wchar_t* argv[])
    ExitOnFailure(hr, "Failed to initialize.");

    // Convert the full SDK version to a feature band version
-    hr = ParseSdkVersion(argv[2], &iMajor, &iMinor, &iFeatureBand);
+    hr = ParseSdkVersion(argv[2], &sczFeatureBandVersion);
    ExitOnFailure(hr, "Failed to parse version, %ls.", argv[2]);

-    hr = StrAllocConcatFormatted(&sczFeatureBandVersion, L"%li.%li.%li", iMajor, iMinor, iFeatureBand);
-    ExitOnFailure(hr, "Failed to create feature band version.");
-
    // Create the dependent value, e.g., Microsoft.NET.Sdk,6.0.300,arm64
-    hr = StrAllocConcatFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, argv[3]);
+    hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, argv[3]);
    ExitOnFailure(hr, "Failed to create dependent.");
    LogStringLine(REPORT_STANDARD, "Setting target dependent to %ls.", sczDependent);

--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -31,7 +31,7 @@
    <Bundled70Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates70PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
    
    <!-- NUnit templates are shipped in Test.ProjectTemplates -->
-    <Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.6.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates60PackageVersion)" />
+    <Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates70PackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -164,7 +164,7 @@
                      '$(SdkMSIInstallerFile)' ^
                      '$(WixRoot)' ^
                      '$(ToolsetBrandName)' ^
-                      '$(VersionPrefix)' ^
+                      '$(CliProductBandVersion)00' ^
                      '$(MsiVersion)' ^
                      '$(SDKBundleVersion)' ^
                      '$(Version)' ^
@ -320,11 +320,8 @@

    <!-- Choose "latest" template MSI to go in bundle. -->
    <ItemGroup>
-      <!-- While we don't have 7.0 templates available (need SDK update, choose the 6.0 templates -->
-      <!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
-                                        Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
      <LatestTemplateInstallerComponent Include="@(TemplatesMsiComponent)"
-                                        Condition="'%(TemplatesMajorMinorVersion)' == '6.0'"/>
+                                        Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
    </ItemGroup>
    <PropertyGroup>
      <LatestTemplateMsiInstallerFile>@(LatestTemplateInstallerComponent->'%(MSIInstallerFile)')</LatestTemplateMsiInstallerFile>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
@ -61,7 +61,7 @@
 資源
    • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
    • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs
-    • 如需版本資訊，請前往 https://aka.ms/dotnet6-release-notes
+    • 如需版本資訊，請前往 https://aka.ms/dotnet7-release-notes
    • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@
  <String Id="InstallationNoteTitle">安裝附註</String>
  <String Id="InstallationNote">安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。
  </String>
-  <String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。&lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;深入了解&lt;/A&gt;.
+  <String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.0 或更新版本。&lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;深入了解&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">按一下 [\[]安裝[\[] 即表示您同意下列條款。</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
@ -61,7 +61,7 @@ Tento produkt shromažďuje data o využití.
 Zdroje informací
    • Dokumentace k .NET : https://aka.ms/dotnet-docs
    • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs
-    • Zpráva k vydání verze: https://aka.ms/dotnet6-release-notes
+    • Zpráva k vydání verze: https://aka.ms/dotnet7-release-notes
    • Kurzy: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">Sada .NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Zdroje informací
  <String Id="InstallationNoteTitle">Poznámka k instalaci</String>
  <String Id="InstallationNote">Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu.
  </String>
-  <String Id="VisualStudioWarning">Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Další informace&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Pokud se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Další informace&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
@ -61,7 +61,7 @@ Dieses Produkt erfasst Nutzungsdaten.
 Ressourcen
    • .NET-Dokumentation: https://aka.ms/dotnet-docs
    • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs
-    • Versionshinweise: https://aka.ms/dotnet6-release-notes
+    • Versionshinweise: https://aka.ms/dotnet7-release-notes
    • Tutorials: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Ressourcen
  <String Id="InstallationNoteTitle">Installationshinweis</String>
  <String Id="InstallationNote">Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute.
  </String>
-  <String Id="VisualStudioWarning">Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Weitere Informationen&lt;/A&gt;
+  <String Id="VisualStudioWarning">Wenn Sie .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Weitere Informationen&lt;/A&gt;
  </String>
  <String Id="LicenseAssent">Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
@ -61,7 +61,7 @@ This product collects usage data
 Resources
    • .NET Documentation https://aka.ms/dotnet-docs
    • SDK Documentation https://aka.ms/dotnet-sdk-docs
-    • Release Notes https://aka.ms/dotnet6-release-notes
+    • Release Notes https://aka.ms/dotnet7-release-notes
    • Tutorials https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Resources
  <String Id="InstallationNoteTitle">Installation note</String>
  <String Id="InstallationNote">A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
  </String>
-  <String Id="VisualStudioWarning">If you plan to use .NET 6.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. &lt;A HREF=&quot;https://aka.ms/dotnet6-release-notes&quot;&gt;Learn more&lt;/A&gt;.
+  <String Id="VisualStudioWarning">If you plan to use .NET 7.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. &lt;A HREF=&quot;https://aka.ms/dotnet7-release-notes&quot;&gt;Learn more&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">By clicking Install, you agree to the following terms:</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
@ -61,7 +61,7 @@ Ce produit collecte des données d'utilisation
 Ressources
    • Documentation .NET sur https://aka.ms/dotnet-docs
    • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs
-    • Notes de publication sur https://aka.ms/dotnet6-release-notes
+    • Notes de publication sur https://aka.ms/dotnet7-release-notes
    • Tutoriels sur https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">SDK .NET</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Ressources
  <String Id="InstallationNoteTitle">Note d'installation</String>
  <String Id="InstallationNote">Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute.
  </String>
-  <String Id="VisualStudioWarning">Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;En savoir plus&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Si vous comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;En savoir plus&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">En cliquant sur Installer, vous acceptez les conditions suivantes.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
@ -61,7 +61,7 @@ Questo prodotto consente di raccogliere i dati sull'utilizzo
 Risorse
    • Documentazione di .NET https://aka.ms/dotnet-docs
    • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs
-    • Note sulla versione https://aka.ms/dotnet6-release-notes
+    • Note sulla versione https://aka.ms/dotnet7-release-notes
    • Esercitazioni https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Risorse
  <String Id="InstallationNoteTitle">Nota sull'installazione</String>
  <String Id="InstallationNote">Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto.
  </String>
-  <String Id="VisualStudioWarning">Se si intende usare .NET 6.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Altre informazioni&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Se si intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Altre informazioni&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Facendo clic su Installa, si accettano le condizioni seguenti.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
@ -61,7 +61,7 @@
 リソース
    • .NET ドキュメント https://aka.ms/dotnet-docs
    • SDK ドキュメント https://aka.ms/dotnet-sdk-docs
-    • リリース ノート https://aka.ms/dotnet6-release-notes
+    • リリース ノート https://aka.ms/dotnet7-release-notes
    • チュートリアル https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@
  <String Id="InstallationNoteTitle">インストール メモ</String>
  <String Id="InstallationNote">コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。
  </String>
-  <String Id="VisualStudioWarning">.NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。&lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;詳細情報&lt;/A&gt;。
+  <String Id="VisualStudioWarning">.NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。&lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;詳細情報&lt;/A&gt;。
  </String>
  <String Id="LicenseAssent">[インストール] をクリックすると、次の条項に同意したものと見なされます。</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
@ -61,7 +61,7 @@
 리소스
    • .NET 설명서 https://aka.ms/dotnet-docs
    • SDK 설명서 https://aka.ms/dotnet-sdk-docs
-    • 릴리스 정보 https://aka.ms/dotnet6-release-notes
+    • 릴리스 정보 https://aka.ms/dotnet7-release-notes
    • 자습서 https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@
  <String Id="InstallationNoteTitle">설치 정보</String>
  <String Id="InstallationNote">프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다.
  </String>
-  <String Id="VisualStudioWarning">Visual Studio와 함께 .NET 6.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;자세한 정보&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;자세한 정보&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">[설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
@ -61,7 +61,7 @@ Ten produkt gromadzi dane dotyczące użycia
 Zasoby
    • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
    • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
-    • Informacje o wersji: https://aka.ms/dotnet6-release-notes
+    • Informacje o wersji: https://aka.ms/dotnet7-release-notes
    • Samouczki: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Zasoby
  <String Id="InstallationNoteTitle">Uwaga dotycząca instalacji</String>
  <String Id="InstallationNote">W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę.
  </String>
-  <String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 6.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Dowiedz się więcej&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Dowiedz się więcej&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@ -61,7 +61,7 @@ Este produto coleta dados de uso
 Recursos
    • Documentação do .NET: https://aka.ms/dotnet-docs
    • Documentação do SDK: https://aka.ms/dotnet-sdk-docs
-    • Notas sobre a Versão: https://aka.ms/dotnet6-release-notes
+    • Notas sobre a Versão: https://aka.ms/dotnet7-release-notes
    • Tutoriais: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">SDK do .NET</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Recursos
  <String Id="InstallationNoteTitle">Nota de instalação</String>
  <String Id="InstallationNote">Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído.
  </String>
-  <String Id="VisualStudioWarning">Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Saiba mais&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Se você planeja usar o .NET 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Saiba mais&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Ao clicar em instalar, você concorda com os termos a seguir.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
@ -61,7 +61,7 @@
 Ресурсы
    • Документация по .NET: https://aka.ms/dotnet-docs
    • Документация по SDK: https://aka.ms/dotnet-sdk-docs
-    • Заметки о выпуске: https://aka.ms/dotnet6-release-notes
+    • Заметки о выпуске: https://aka.ms/dotnet7-release-notes
    • Учебники: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">Пакет SDK для .NET</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@
  <String Id="InstallationNoteTitle">Примечание по установке</String>
  <String Id="InstallationNote">В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты.
  </String>
-  <String Id="VisualStudioWarning">Если вы планируете использовать .NET 6.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Дополнительные сведения&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Дополнительные сведения&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Нажимая кнопку "Установить", вы принимаете следующие условия.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
@ -61,7 +61,7 @@ Bu ürün, kullanım verilerini toplar
 Kaynaklar
    • .NET Belgeleri https://aka.ms/dotnet-docs
    • SDK Belgeleri https://aka.ms/dotnet-sdk-docs
-    • Sürüm Notları https://aka.ms/dotnet6-release-notes
+    • Sürüm Notları https://aka.ms/dotnet7-release-notes
    • Öğreticiler https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK'sı</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Kaynaklar
  <String Id="InstallationNoteTitle">Yükleme notu</String>
  <String Id="InstallationNote">Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır.
  </String>
-  <String Id="VisualStudioWarning">Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Daha Fazla Bilgi&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Visual Studio ile .NET 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Daha Fazla Bilgi&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
@ -61,7 +61,7 @@
 资源
    • .NET 文档: https://aka.ms/dotnet-docs
    • SDK 文档: https://aka.ms/dotnet-sdk-docs
-    • 发行说明: https://aka.ms/dotnet6-release-notes
+    • 发行说明: https://aka.ms/dotnet7-release-notes
    • 教程: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@
  <String Id="InstallationNoteTitle">安装说明</String>
  <String Id="InstallationNote">将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。
  </String>
-  <String Id="VisualStudioWarning">如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。&lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;了解详细信息&lt;/A&gt;。
+  <String Id="VisualStudioWarning">如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。&lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;了解详细信息&lt;/A&gt;。
  </String>
  <String Id="LicenseAssent">单击“安装”即表示你同意以下条款。</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
@ -61,7 +61,7 @@ Este producto recopila datos de uso
 Recursos
    • Documentación de .NET https://aka.ms/dotnet-docs
    • Documentación del SDK https://aka.ms/dotnet-sdk-docs
-    • Notas de la versión https://aka.ms/dotnet6-release-notes
+    • Notas de la versión https://aka.ms/dotnet7-release-notes
    • Tutoriales https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">SDK de .NET</String>
  <String Id="WelcomeDescription">
@ -76,7 +76,7 @@ Recursos
  <String Id="InstallationNoteTitle">Nota de instalación</String>
  <String Id="InstallationNote">Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse.
  </String>
-  <String Id="VisualStudioWarning">Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. &lt;A HREF="https://aka.ms/dotnet6-release-notes"&gt;Obtenga más información&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Si tiene previsto usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. &lt;A HREF="https://aka.ms/dotnet7-release-notes"&gt;Obtenga más información&lt;/A&gt;.
  </String>
  <String Id="LicenseAssent">Al hacer clic en Instalar, acepta los términos siguientes.</String>
  <String Id="InstallPathx64x86">The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;</String>
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@ -7,5 +7,6 @@
    <PackageReference Include="FluentAssertions" Version="4.18.0" />
    <PackageReference Include="xunit" Version="2.2.0" />
    <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
  </ItemGroup>
 </Project>
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@ -46,10 +46,6 @@
  </ItemGroup>

  <Target Name="GetRuntimesToInstall">
-    <PropertyGroup>
-      <Supports1xRuntimes>true</Supports1xRuntimes>
-    </PropertyGroup>
-
    <ReadLinesFromFile File="/etc/os-release"
                       Condition="'$(OS)' != 'Windows_NT'">
      <Output TaskParameter="Lines" PropertyName="OsReleaseContents"/>
@ -60,35 +56,6 @@
      <OsReleaseContents>Windows</OsReleaseContents>
    </PropertyGroup>

-    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Ubuntu%22'))">
-      <Supports1xRuntimes Condition="$(OsReleaseContents.Contains('VERSION_ID=%2218.04%22'))">false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=Fedora'))">
-      <Supports1xRuntimes>false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Debian'))">
-      <Supports1xRuntimes>false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22openSUSE%20Leap%22'))">
-      <Supports1xRuntimes>false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Alpine%20Linux%22'))">
-      <Supports1xRuntimes>false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <!-- RHEL 6 does not appear to have the os-release file -->
-    <PropertyGroup Condition="'$(OsReleaseContents)' == ''">
-      <Supports1xRuntimes>false</Supports1xRuntimes>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'$(Supports1xRuntimes)' == 'true'">
-      <RuntimeVersionToInstall Include="1.0.5" />
-      <RuntimeVersionToInstall Include="1.1.2" />      
-    </ItemGroup>
    <ItemGroup>
      <RuntimeVersionToInstall Include="2.1.0" />
      <RuntimeVersionToInstall Include="2.2.5" />