From 6a2a80c50550c9b3d12fba4c8f8bc65b3a8d66c9 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Fri, 27 Jan 2023 14:34:40 -0600
Subject: [PATCH 1/2] Source-build should also use the release runtime.

---
 src/Tools/Directory.Build.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 438ea3da045d..0123c55dc4ae 100644
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -8,7 +8,7 @@
       Target the default version of .NET Core in tool projects to maximize the compatible environments. Must be set
       before importing root Directory.Build.targets.
     -->
-    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
+    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' '$(DotNetSourceBuild))' != 'true'">false</TargetLatestDotNetRuntime>
     <!-- Tool projects publish before packing. Packages should contain the latest bits. -->
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
   </PropertyGroup>
@@ -18,4 +18,5 @@
   <Target Name="CleanPublishDir" AfterTargets="CoreClean">
     <RemoveDir Directories="$(PublishDir)" />
   </Target>
+
 </Project>

From 6a72e1b36723541acdf65b7c3b09f73b323112bb Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Mon, 30 Jan 2023 18:02:24 -0600
Subject: [PATCH 2/2] Move condition down to source-build-affected projects
 only.

---
 src/Tools/Directory.Build.targets                            | 3 +--
 src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj       | 1 +
 src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj       | 1 +
 src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 0123c55dc4ae..438ea3da045d 100644
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -8,7 +8,7 @@
       Target the default version of .NET Core in tool projects to maximize the compatible environments. Must be set
       before importing root Directory.Build.targets.
     -->
-    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' '$(DotNetSourceBuild))' != 'true'">false</TargetLatestDotNetRuntime>
+    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
     <!-- Tool projects publish before packing. Packages should contain the latest bits. -->
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
   </PropertyGroup>
@@ -18,5 +18,4 @@
   <Target Name="CleanPublishDir" AfterTargets="CoreClean">
     <RemoveDir Directories="$(PublishDir)" />
   </Target>
-
 </Project>
diff --git a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
index c644415502cb..495fec884700 100644
--- a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
+++ b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
@@ -10,6 +10,7 @@
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' and '$(DotNetSourceBuild))' != 'true'">false</TargetLatestDotNetRuntime>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
index 119c210c6eae..c7ad28f589c4 100644
--- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
+++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
@@ -10,6 +10,7 @@
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' and '$(DotNetSourceBuild))' != 'true'">false</TargetLatestDotNetRuntime>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
index 61586af02eff..8c9274ecc455 100644
--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
@@ -11,6 +11,7 @@
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+    <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' and '$(DotNetSourceBuild))' != 'true'">false</TargetLatestDotNetRuntime>
   </PropertyGroup>
 
   <ItemGroup>