From ce85c68bfdb99a5078ebd9c816b3fc4959e16aef Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 16:27:37 +0000
Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade
 build 20230411.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23167.1 -> To Version 6.0.0-beta.23211.7
---
 NuGet.config            | 16 ++++++++++++++--
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 global.json             |  6 +++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d589623e6..a91bd5a8c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,21 +7,28 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-d6f154c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d6f154cc/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-a243060" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a243060c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-a243060-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a243060c-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-a243060-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a243060c-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1e620a4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1e620a4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1e620a4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-int-dotnet-templating-d3c2532" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d3c2532d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-d3c2532-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d3c2532d-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-d3c2532-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d3c2532d-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-bde268e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-bde268e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-bde268e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-bde268e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -43,17 +50,22 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-d6f154c" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-1e620a4-1" value="true" />
+    <add key="darc-int-dotnet-runtime-1e620a4-2" value="true" />
     <add key="darc-int-dotnet-runtime-1e620a4" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-int-dotnet-templating-d3c2532-1" value="true" />
+    <add key="darc-int-dotnet-templating-d3c2532-2" value="true" />
     <add key="darc-int-dotnet-templating-d3c2532" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-bde268e-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-bde268e-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-bde268e-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-bde268e" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a50b0c49c..8fc6ade00 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23167.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23211.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
+      <Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23167.1">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23211.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
+      <Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23167.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23211.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
+      <Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22570.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8a84d1369..c5e25edd4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/global.json b/global.json
index 5bd694fa0..1f0711594 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.115",
+    "dotnet": "6.0.116",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1",
-    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7",
+    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7"
   }
 }

From ef68e303f30299e4a2bb873db7fe72ea53b8233b Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 2 May 2023 10:59:47 -0700
Subject: [PATCH 2/3] Update branding to 6.0.118

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8a84d1369..a97433d87 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>17</VersionFeature>
+    <VersionFeature>18</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

From c2a7c1a238fda68568943a361083254e7cbd21cb Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 3 May 2023 12:19:12 -0700
Subject: [PATCH 3/3] Switch to debian 11, install libLLDB 9

---
 .vsts-ci.yml                       |  2 +-
 eng/docker/debian/Dockerfile       |  8 ++++++--
 test/SdkTests/SdkTests.csproj      |  7 ++++++-
 test/SdkTests/TestsToSkipLinux.xml | 10 ++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 test/SdkTests/TestsToSkipLinux.xml

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 2a9e08d43..6067e7c1e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -179,7 +179,7 @@ stages:
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
               _TestArg: $(_NonWindowsTestArg)
-            Build_Debian_Stretch_Debug_x64:
+            Build_Debian_11_Debug_x64:
               _BuildConfig: Debug
               _DockerParameter: '--docker debian'
               _LinuxPortable: ''
diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile
index ebafe9adb..e448844a4 100644
--- a/eng/docker/debian/Dockerfile
+++ b/eng/docker/debian/Dockerfile
@@ -4,7 +4,7 @@
 #
 
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
 
 # Install the deb packaging toolchain we need to build debs
 RUN apt-get update \
@@ -17,7 +17,7 @@ RUN apt-get update \
 
 # liblldb is needed so deb package build does not throw missing library info errors
 RUN apt-get update \
-    && apt-get -y install liblldb-3.9 \
+    && apt-get -y install liblldb-9 \
     && rm -rf /var/lib/apt/lists/*
 
 # Misc Dependencies for build
@@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
         sudo && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update \
+    && apt-get -y install python-is-python2 \
+    && rm -rf /var/lib/apt/lists/*
     
 RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
 
diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 2674c0f5a..32f254a89 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -258,7 +258,12 @@
       <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
     </PropertyGroup>
 
-    <Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
+    <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('Linux')) ">
+      <!-- Add list of tests to skip on Linux -->
+      <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"</TestArgs>
+    </PropertyGroup>
+
+    <Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
           WorkingDirectory="$(TestLocalToolFolder)"
           EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
   </Target>
diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml
new file mode 100644
index 000000000..b2bfd698a
--- /dev/null
+++ b/test/SdkTests/TestsToSkipLinux.xml
@@ -0,0 +1,10 @@
+<Tests>
+  <SkippedTests>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run"
+            Skip="true"
+            Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output"
+            Skip="true"
+            Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
+  </SkippedTests>
+</Tests>