From 04355918b51a6c67c1c8792e23cde5ca6cec4d67 Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Fri, 2 Jun 2023 13:37:18 -0700
Subject: [PATCH 1/6] Add known RID platforms to generated BundledVersions
 props

---
 src/redist/targets/GenerateBundledVersions.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index d9b4d2a8d..ed29193cd 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -324,6 +324,10 @@
       <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
       <WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
       <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
+
+      <_KnownRuntimeIdentiferPlatforms Include="$(ProductMonikerRid.Substring(0, $(Rid.LastIndexOf('-'))))" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+      <_KnownRuntimeIdentiferPlatforms Include="any;freebsd;illumos;linux;linux-bionic;linux-musl;osx;solaris;unix;win" />
+      <_KnownRuntimeIdentiferPlatforms Include="android;aot;browser;ios;iossimulator;maccatalyst;tvos;tvossimulator" />
     </ItemGroup>
 
     <!--
@@ -1130,6 +1134,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
 
+    <_KnownRuntimeIdentiferPlatforms Include="@(_KnownRuntimeIdentiferPlatforms, '%3B')" />
   </ItemGroup>
 </Project>
 ]]>

From baaa3a74e731a1fb73432c6bc4c4c457a52c45e2 Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Tue, 6 Jun 2023 15:54:45 -0700
Subject: [PATCH 2/6] Process KnownRuntimePack/KnownFrameworkReference to
 determine KnownRuntimeIdentifierPlatforms for current target framework

---
 .../targets/GenerateBundledVersions.targets       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index ed29193cd..fe98aba34 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -326,8 +326,11 @@
       <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
 
       <_KnownRuntimeIdentiferPlatforms Include="$(ProductMonikerRid.Substring(0, $(Rid.LastIndexOf('-'))))" Condition="'$(DotNetBuildFromSource)' == 'true'" />
-      <_KnownRuntimeIdentiferPlatforms Include="any;freebsd;illumos;linux;linux-bionic;linux-musl;osx;solaris;unix;win" />
-      <_KnownRuntimeIdentiferPlatforms Include="android;aot;browser;ios;iossimulator;maccatalyst;tvos;tvossimulator" />
+      <_KnownRuntimeIdentiferPlatforms Include="any;aot;freebsd;illumos;solaris;unix" />
+      <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+      <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" />
+      <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.4.0.0-'))" />
+      <_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.5.0.0-'))" />
     </ItemGroup>
 
     <!--
@@ -1134,7 +1137,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     <WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
 
+    <_KnownRuntimeIdentifersForTfm Include="%40(KnownRuntimePack->WithMetadataValue('TargetFramework', %24(TargetFramework))->Metadata('RuntimePackRuntimeIdentifiers'))" />
+    <_KnownRuntimeIdentifersForTfm Include="%40(KnownFrameworkReference->WithMetadataValue('TargetFramework', %24(TargetFramework))->Metadata('RuntimePackRuntimeIdentifiers'))" />
+    <_KnownRuntimeIdentifersForTfmWithPlatform Include="%40(_KnownRuntimeIdentifersForTfm->ClearMetadata()->Distinct())">
+      <Platform Condition="%24([System.String]::new('%25(Identity)').LastIndexOf('-')) == -1">%25(Identity)</Platform>
+      <Platform Condition="%24([System.String]::new('%25(Identity)').LastIndexOf('-')) != -1">%24([System.String]::new('%25(Identity)').Substring(0, %24([System.String]::new('%25(Identity)').LastIndexOf('-'))))</Platform>
+    </_KnownRuntimeIdentifersForTfmWithPlatform>
+
     <_KnownRuntimeIdentiferPlatforms Include="@(_KnownRuntimeIdentiferPlatforms, '%3B')" />
+    <_KnownRuntimeIdentiferPlatforms Include="%40(_KnownRuntimeIdentifersForTfmWithPlatform->Metadata('Platform')->ClearMetadata()->Distinct())" Exclude="@(_ExcludedKnownRuntimeIdentiferPlatforms, '%3B')" />
   </ItemGroup>
 </Project>
 ]]>

From ef03d03f71f5891ccd515b62d8114cfc89c402f1 Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Thu, 8 Jun 2023 15:53:13 -0700
Subject: [PATCH 3/6] Move processing KnownRuntimePack to SDK

---
 src/redist/targets/GenerateBundledVersions.targets | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index fe98aba34..2557b2d8b 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -1137,15 +1137,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
 
-    <_KnownRuntimeIdentifersForTfm Include="%40(KnownRuntimePack->WithMetadataValue('TargetFramework', %24(TargetFramework))->Metadata('RuntimePackRuntimeIdentifiers'))" />
-    <_KnownRuntimeIdentifersForTfm Include="%40(KnownFrameworkReference->WithMetadataValue('TargetFramework', %24(TargetFramework))->Metadata('RuntimePackRuntimeIdentifiers'))" />
-    <_KnownRuntimeIdentifersForTfmWithPlatform Include="%40(_KnownRuntimeIdentifersForTfm->ClearMetadata()->Distinct())">
-      <Platform Condition="%24([System.String]::new('%25(Identity)').LastIndexOf('-')) == -1">%25(Identity)</Platform>
-      <Platform Condition="%24([System.String]::new('%25(Identity)').LastIndexOf('-')) != -1">%24([System.String]::new('%25(Identity)').Substring(0, %24([System.String]::new('%25(Identity)').LastIndexOf('-'))))</Platform>
-    </_KnownRuntimeIdentifersForTfmWithPlatform>
-
     <_KnownRuntimeIdentiferPlatforms Include="@(_KnownRuntimeIdentiferPlatforms, '%3B')" />
-    <_KnownRuntimeIdentiferPlatforms Include="%40(_KnownRuntimeIdentifersForTfmWithPlatform->Metadata('Platform')->ClearMetadata()->Distinct())" Exclude="@(_ExcludedKnownRuntimeIdentiferPlatforms, '%3B')" />
+    <_ExcludedKnownRuntimeIdentiferPlatforms Include="@(_ExcludedKnownRuntimeIdentiferPlatforms, '%3B')" />
   </ItemGroup>
 </Project>
 ]]>

From 242b50c8ad1f3916b45f0a28f9060b7970c5f43f Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Thu, 8 Jun 2023 16:27:24 -0700
Subject: [PATCH 4/6] Update src/redist/targets/GenerateBundledVersions.targets

---
 src/redist/targets/GenerateBundledVersions.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 2557b2d8b..276897b02 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -325,7 +325,6 @@
       <WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
       <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
 
-      <_KnownRuntimeIdentiferPlatforms Include="$(ProductMonikerRid.Substring(0, $(Rid.LastIndexOf('-'))))" Condition="'$(DotNetBuildFromSource)' == 'true'" />
       <_KnownRuntimeIdentiferPlatforms Include="any;aot;freebsd;illumos;solaris;unix" />
       <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' != 'true'" />
       <_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" />

From c10115c483a4f61f021fc4cde7b66e4919f9785e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 9 Jun 2023 11:12:52 -0700
Subject: [PATCH 5/6] Update debpkg leg to use the Ubuntu 22.04-based image
 (#16635)

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 5c2195610..4444ccb3e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -237,7 +237,7 @@ stages:
       parameters:
         agentOs: Linux
         jobName: Build_Linux_Portable_Deb_Release_x64
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg'
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
         buildConfiguration: Release
         buildArchitecture: x64
         # Do not publish zips and tarballs. The linux-x64 binaries are

From 5f170fb1eb6a72c6fbdadfbd47b3bb2665c25087 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 10 Jun 2023 12:27:30 +0000
Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/arcade
 build 20230609.8

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23308.2 -> To Version 8.0.0-beta.23309.8
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 global.json             |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78e7c97ef..58f283ff9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -202,18 +202,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23308.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23309.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
+      <Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23308.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23309.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
+      <Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23308.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23309.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
+      <Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index b9a2883bb..81c016cec 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23308.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23309.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
diff --git a/global.json b/global.json
index c24c61426..0617366fd 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.21.0"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23308.2",
-    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23308.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8",
+    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23309.8"
   }
 }