From a4ec49fae3b15ce2f1e146c53fc0e009b5b9cc66 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 21 Apr 2023 10:14:05 -0700
Subject: [PATCH 1/2] Fix the swr file logic

It was supposed to be && and not || to avoid copying those files
---
 src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
index c327992c1..eab79f2b7 100644
--- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
+++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
@@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Cli.Build
         {
             string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath);
             var files = Directory.GetFiles(sourceFolder)
-                            .Where(f => !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase) || !Path.GetExtension(f).Equals(".swr", StringComparison.OrdinalIgnoreCase))
+                            .Where(f => !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase) && !Path.GetExtension(f).Equals(".swr", StringComparison.OrdinalIgnoreCase))
                             .ToList();
             if (files.Any(f => !Path.GetFileName(f).Equals("_._")))
             {

From 3b55f911423403c9f2a5724be2916f096d219917 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 21 Apr 2023 10:22:58 -0700
Subject: [PATCH 2/2] Update the 6.0 implicit version in 7.0.4xx

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 3348fbaac..277b785e4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,7 +23,7 @@
     <VersionFeature21>30</VersionFeature21>
     <VersionFeature31>32</VersionFeature31>
     <VersionFeature50>17</VersionFeature50>
-    <VersionFeature60>15</VersionFeature60>
+    <VersionFeature60>16</VersionFeature60>
   </PropertyGroup>
   <!-- Restore feeds -->
   <PropertyGroup Label="Restore feeds">