Merged PR 38056: [internal/release/7.0.3xx] Merge from public

Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
2024-03-13 16:27:02 +00:00 · 2024-03-13 16:27:02 +00:00 · 26d171b756
commit 26d171b756
parent fadf699ea6 7617e00856
10 changed files with 430 additions and 127 deletions
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@ -0,0 +1,394 @@
+trigger:
+  batch: true
+  branches:
+    include:
+    - main
+    - master
+    - release/*
+    - internal/release/3.*
+    - internal/release/5.*
+    - internal/release/6.*
+    - internal/release/7.*
+
+variables:
+- name: _PublishUsingPipelines
+  value: false
+- ${{ 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')) }}:
+  - name: Codeql.Enabled
+    value: true
+  - group: DotNet-DotNetCli-Storage
+  - group: DotNet-Installer-SDLValidation-Params
+  - name: _PublishUsingPipelines
+    value: true
+
+# Default to running tests in PRs and public CI, but not in official builds
+- name: _WindowsTestArg
+  value: '-test'
+- name: _NonWindowsTestArg
+  value: '--test'
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - name: _WindowsTestArg
+    value: ''
+  - name: _NonWindowsTestArg
+    value: ''
+
+- name: _InternalRuntimeDownloadArgs
+  value: ''
+
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNetBuilds storage account read tokens
+  - name: _InternalRuntimeDownloadArgs
+    value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+      /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
+      /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
+
+stages:
+- stage: build
+  jobs:
+  - job: Publish_Build_Configuration
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCore-Svc-Public
+        demands: ImageOverride -equals windows.vs2019.amd64.open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals windows.vs2019.amd64
+    steps:
+    - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
+      artifact: BuildConfiguration
+      displayName: Publish Build Config
+  - template: /eng/build.yml
+    parameters:
+      agentOs: Windows_NT
+      pool:
+        ${{ if eq(variables['System.TeamProject'], 'public') }}:
+          name: NetCore-Svc-Public
+          demands: ImageOverride -equals windows.vs2019.amd64.open
+        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+          name: NetCore1ESPool-Svc-Internal
+          demands: ImageOverride -equals windows.vs2019.amd64
+      timeoutInMinutes: 180
+      strategy:
+        matrix:
+          # Public-only builds
+          ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+            Build_Release_x64:
+              _BuildConfig: Debug
+              _BuildArchitecture: x64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: '/p:PublishInternalAsset=true'
+              _TestArg: $(_WindowsTestArg)
+          # Internal-only builds
+          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+            Build_Release_x64:
+              _BuildConfig: Release
+              _BuildArchitecture: x64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: '/p:PublishInternalAsset=true'
+              _TestArg: $(_WindowsTestArg)
+            Build_Release_x86:
+              _BuildConfig: Release
+              _BuildArchitecture: x86
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: ''
+              _TestArg: $(_WindowsTestArg)
+            Build_Release_arm64:
+              _BuildConfig: Release
+              _BuildArchitecture: arm64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: ''
+              # Never run tests on arm64
+              _TestArg: ''
+
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/build.yml
+      parameters:
+        agentOs: Windows_NT
+        pool:
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCore1ESPool-Svc-Internal
+            demands: ImageOverride -equals windows.vs2019.amd64
+        timeoutInMinutes: 180
+        strategy:
+          matrix:
+            Build_Release_x64:
+              _BuildConfig: Release
+              _BuildArchitecture: x64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: '/p:PublishInternalAsset=true'
+              # Never run tests on PGO bits
+              _TestArg: ''
+            Build_Release_x86:
+              _BuildConfig: Release
+              _BuildArchitecture: x86
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: ''
+              _TestArg: ''
+            Build_Release_arm64:
+              _BuildConfig: Release
+              _BuildArchitecture: arm64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: ''
+              # Never run tests on arm64
+              _TestArg: ''
+        pgoInstrument: true
+
+  - template: /eng/build.yml
+    parameters:
+      agentOs: Linux
+      pool:
+        ${{ if eq(variables['System.TeamProject'], 'public') }}:
+          name: NetCore-Svc-Public
+          demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+          name: NetCore1ESPool-Svc-Internal
+          demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+      timeoutInMinutes: 180
+      strategy:
+        matrix:
+          ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+            Build_Ubuntu_18_04_Debug_x64:
+              _BuildConfig: Debug
+              _DockerParameter: '--docker ubuntu.18.04'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_Fedora_36_Debug_x64:
+              _BuildConfig: Debug
+              _DockerParameter: '--docker fedora.36'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_CentOS_7_Debug_x64:
+              _BuildConfig: Debug
+              _DockerParameter: '--docker centos'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_Debian_11_Debug_x64:
+              _BuildConfig: Debug
+              _DockerParameter: '--docker debian'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              _AdditionalBuildParameters: '/p:BuildSdkDeb=true'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_Arm64_Debug:
+              _BuildConfig: Debug
+              _DockerParameter: ''
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: '--runtime-id linux-arm64'
+              _BuildArchitecture: 'arm64'
+              # Never run tests on arm64
+              _TestArg: ''
+            Build_Linux_musl_Debug_x64:
+              _BuildConfig: Debug
+              _DockerParameter: '--docker alpine.3.15'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: '--runtime-id linux-musl-x64'
+              _BuildArchitecture: 'x64'
+              # Pass in HostOSName when running on alpine
+              _AdditionalBuildParameters: '/p:HostOSName="linux-musl"'
+              _TestArg: $(_NonWindowsTestArg)
+          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+            Build_Arm_Release:
+              _BuildConfig: Release
+              _DockerParameter: ''
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: '--runtime-id linux-arm'
+              _BuildArchitecture: 'arm'
+              # Never run tests on arm
+              _TestArg: ''
+            Build_Arm64_Release:
+              _BuildConfig: Release
+              _DockerParameter: ''
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: '--runtime-id linux-arm64'
+              _BuildArchitecture: 'arm64'
+              # Never run tests on arm64
+              _TestArg: ''
+            Build_Linux_musl_Release_arm:
+              _BuildConfig: Release
+              # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it)
+              _DockerParameter: '--docker ubuntu.18.04'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: '--runtime-id linux-musl-arm'
+              _BuildArchitecture: 'arm'
+              _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+              # Never run tests on arm
+              _TestArg: ''
+            Build_Linux_musl_Release_arm64:
+              _BuildConfig: Release
+              _DockerParameter: ''
+              _LinuxPortable: ''
+              _RuntimeIdentifier: '--runtime-id linux-musl-arm64'
+              _BuildArchitecture: 'arm64'
+              _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+              # Never run tests on arm64
+              _TestArg: ''
+            Build_Linux_musl_Release_x64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker alpine.3.15'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: '--runtime-id linux-musl-x64'
+              _BuildArchitecture: 'x64'
+              # Pass in HostOSName when running on alpine
+              _AdditionalBuildParameters: '/p:HostOSName="linux-musl"'
+            Build_Linux_Portable_Deb_Release_x64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker ubuntu.18.04'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              # Do not publish zips and tarballs. The linux-x64 binaries are
+              # already published by Build_LinuxPortable_Release_x64
+              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_Linux_Portable_Rpm_Release_x64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker centos'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              # Do not publish zips and tarballs. The linux-x64 binaries are
+              # already published by Build_LinuxPortable_Release_x64
+              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
+              _TestArg: $(_NonWindowsTestArg)
+            Build_Linux_Portable_Rpm_Release_Arm64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker centos'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: '--runtime-id linux-arm64'
+              _BuildArchitecture: 'arm64'
+              # Do not publish zips and tarballs. The linux-x64 binaries are
+              # already published by Build_LinuxPortable_Release_x64
+              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true'
+              # Never run tests on arm64
+              _TestArg: ''
+          Build_LinuxPortable_Release_x64:
+            _BuildConfig: Release
+            _DockerParameter: ''
+            _LinuxPortable: '--linux-portable'
+            _RuntimeIdentifier: ''
+            _BuildArchitecture: 'x64'
+            _TestArg: $(_NonWindowsTestArg)
+
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/build.yml
+      parameters:
+        agentOs: Linux
+        pool:
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCore1ESPool-Svc-Internal
+            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+        timeoutInMinutes: 180
+        strategy:
+          matrix:
+            Build_LinuxPortable_Release_x64:
+              _BuildConfig: Release
+              _DockerParameter: ''
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: ''
+              _BuildArchitecture: 'x64'
+              _TestArg: ''
+            Build_Release_arm64:
+              _BuildConfig: Release
+              _BuildArchitecture: arm64
+              _DOTNET_CLI_UI_LANGUAGE: ''
+              _AdditionalBuildParameters: ''
+              # Never run tests on arm64
+              _TestArg: ''
+        pgoInstrument: true
+
+  - template: /eng/build.yml
+    parameters:
+      agentOs: Darwin
+      pool:
+        vmImage: 'macOS-latest'
+      timeoutInMinutes: 180
+      strategy:
+        matrix:
+          Build_Release_x64:
+            _BuildConfig: Release
+            _RuntimeIdentifier: ''
+            _BuildArchitecture: 'x64'
+            _TestArg: $(_NonWindowsTestArg)
+          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+            Build_Release_arm64:
+              _BuildConfig: Release
+              _RuntimeIdentifier: '--runtime-id osx-arm64'
+              _BuildArchitecture: 'arm64'
+              # Never run tests on arm64
+              _TestArg: ''
+
+  - template: /eng/common/templates/jobs/source-build.yml
+
+  - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
+
+  # For .NET 7.0, source-build currently supports 7.0.1xx.  Disable tarball build validation in all other branches.
+  # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+  #   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+  #     parameters:
+  #       dependsOn: Source_Build_Create_Tarball
+
+  # https://github.com/dotnet/core-sdk/issues/248
+  # - template: /eng/build.yml
+  #   parameters:
+  #     agentOs: FreeBSD
+  #     queue:
+  #       name: dnceng-freebsd-internal
+  #       timeoutInMinutes: 180
+  #       matrix:
+  #         Build_Release:
+  #           _BuildConfig: Release
+  #           _BuildArchitecture: 'x64'
+  #           _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true'
+
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/common/templates/job/publish-build-assets.yml
+      parameters:
+        dependsOn:
+          - Windows_NT
+          - Linux
+          - Darwin
+          - Source_Build_Managed
+          - Source_Build_Create_Tarball
+          - PGO_Linux
+          - PGO_Windows_NT
+        publishUsingPipelines: true
+        pool:
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCore1ESPool-Svc-Internal
+            demands: ImageOverride -equals windows.vs2017.amd64
+
+
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - template: eng\common\templates\post-build\post-build.yml
+    parameters:
+      publishingInfraVersion: 3
+      enableSymbolValidation: false
+      enableSigningValidation: false
+      enableNugetValidation: false
+      enableSourceLinkValidation: false
+      publishInstallersAndChecksums: true
+      SDLValidationParameters:
+        enable: false
+        params: ' -SourceToolsList @("policheck","credscan")
+        -TsaInstanceURL $(_TsaInstanceURL)
+        -TsaProjectName $(_TsaProjectName)
+        -TsaNotificationEmail $(_TsaNotificationEmail)
+        -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
+        -TsaBugAreaPath $(_TsaBugAreaPath)
+        -TsaIterationPath $(_TsaIterationPath)
+        -TsaRepositoryName "dotnet-installer"
+        -TsaCodebaseName "dotnet-installer"
+        -TsaPublish $True'
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -180,9 +180,9 @@
      <Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
      <SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24059.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24162.2">
      <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>4bed7bdd937666fac4c4f351b9b02adddf8d035b</Sha>
+      <Sha>936411dd5d047cef6674b47872104a3a59cf5754</Sha>
      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
@ -192,22 +192,22 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24160.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
+      <Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24114.4">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24160.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
+      <Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24160.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
+      <Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.24059.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.24121.2">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>727ef4887d561dae6069d6b9c035773013dad041</Sha>
+      <Sha>c74756071d00a51bcd35510900719148b4182f34</Sha>
      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22429-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -8,7 +8,7 @@
    <VersionMajor>7</VersionMajor>
    <VersionMinor>0</VersionMinor>
    <VersionSDKMinor>3</VersionSDKMinor>
-    <VersionFeature>14</VersionFeature>
+    <VersionFeature>15</VersionFeature>
    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
    <PreReleaseVersionIteration>
@ -33,7 +33,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24160.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
@ -220,8 +220,8 @@
      or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
      necessary, and this property is removed from the file.
    -->
-    <PrivateSourceBuiltSDKVersion>7.0.116</PrivateSourceBuiltSDKVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>7.0.116</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltSDKVersion>7.0.117</PrivateSourceBuiltSDKVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>7.0.117</PrivateSourceBuiltArtifactsPackageVersion>
  </PropertyGroup>
  <!-- Workload manifest package versions -->
  <PropertyGroup>
--- a/global.json
+++ b/global.json
@ -11,7 +11,7 @@
    "cmake": "3.16.4"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1"
  }
 }
--- a/src/SourceBuild/tarball/content/global.json
+++ b/src/SourceBuild/tarball/content/global.json
@ -1,6 +1,6 @@
 {
  "tools": {
-    "dotnet": "7.0.116"
+    "dotnet": "7.0.117"
  },
  "msbuild-sdks": {
    "Microsoft.Build.CentralPackageVersions": "2.0.1",
--- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
+++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
@ -14,23 +14,7 @@ index ------------
 ./packs/Microsoft.AspNetCore.App.Ref/
 ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
@@ ------------ @@
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
- ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
 ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
-+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
 ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll
 ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml
 -./packs/Microsoft.NETCore.App.Host.portable-rid/
@ -125,35 +109,6 @@ index ------------
 ./sdk/x.y.z/DotnetTools/dotnet-format/tr/
 ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll
 ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll
-@@ ------------ @@
- ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/
-@@ ------------ @@
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll
- ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
- ./sdk/x.y.z/DotnetTools/dotnet-watch/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/
@@ ------------ @@
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll
@ -169,26 +124,21 @@ index ------------
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/
@@ ------------ @@
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/
+-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
- ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
+-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/
+-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
+-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll
@ -200,10 +150,6 @@ index ------------
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll
 -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll
 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll
@ -259,21 +205,11 @@ index ------------
 -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
 ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
 ./sdk/x.y.z/FSharp/System.CodeDom.dll
-+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll
 ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll
 +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll
 ./sdk/x.y.z/FSharp/System.Drawing.Common.dll
-+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll
-+./sdk/x.y.z/FSharp/System.Reflection.Metadata.dll
 ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll
 ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll
- ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll
- ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll
- ./sdk/x.y.z/FSharp/System.Security.Permissions.dll
-+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll
- ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll
- ./sdk/x.y.z/FSharp/tr/
- ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll
@@ ------------ @@
 ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll
 ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll
@ -329,13 +265,6 @@ index ------------
 ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll
 ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
 ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
- ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll
- ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
- ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll
-+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll
- ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
- ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache
- ./sdk/x.y.z/SdkResolvers/
@@ ------------ @@
 ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll
 ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll
@ -360,16 +289,6 @@ index ------------
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll
-@@ ------------ @@
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json
-+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll
-+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll
-+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props
@@ ------------ @@
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/
@ -387,28 +306,18 @@ index ------------
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll
@@ ------------ @@
- ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll
 ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/
 ./sdk/x.y.z/System.CodeDom.dll
-+./sdk/x.y.z/System.Collections.Immutable.dll
 ./sdk/x.y.z/System.CommandLine.dll
 -./sdk/x.y.z/System.ComponentModel.Composition.dll
 ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll
 ./sdk/x.y.z/System.Diagnostics.EventLog.dll
 ./sdk/x.y.z/System.Drawing.Common.dll
-+./sdk/x.y.z/System.Formats.Asn1.dll
-+./sdk/x.y.z/System.Reflection.Metadata.dll
- ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll
- ./sdk/x.y.z/System.Resources.Extensions.dll
- ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll
@@ ------------ @@
 ./sdk/x.y.z/System.Security.Cryptography.Xml.dll
 ./sdk/x.y.z/System.Security.Permissions.dll
 ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll
-+./sdk/x.y.z/System.Text.Encoding.CodePages.dll
 +./sdk/x.y.z/System.Text.Encodings.Web.dll
-+./sdk/x.y.z/System.Text.Json.dll
-+./sdk/x.y.z/System.Threading.Tasks.Dataflow.dll
 ./sdk/x.y.z/System.Windows.Extensions.dll
 -./sdk/x.y.z/testhost-1.0.runtimeconfig.json
 -./sdk/x.y.z/testhost-1.1.runtimeconfig.json