From e8718c7c872b3aed1e36d0682edcda9ce9cdf1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Fri, 8 Apr 2022 16:37:40 +0200
Subject: [PATCH 1/2] Make vstest.console, and datacollector use latest major
 .NET version

---
 src/datacollector/datacollector.csproj   | 1 +
 src/vstest.console/vstest.console.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
index f9bfcb7699..3c6477ef2e 100644
--- a/src/datacollector/datacollector.csproj
+++ b/src/datacollector/datacollector.csproj
@@ -17,6 +17,7 @@
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
     <PlatformTarget Condition=" $(TargetFramework.StartsWith('net4')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <OutputType>Exe</OutputType>
+    <RollForward>LatestMajor</RollForward>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 6cae710a25..885b4786ca 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -11,6 +11,7 @@
     <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
+    <RollForward>LatestMajor</RollForward>
     <IsTestProject>false</IsTestProject>
     <PlatformTarget Condition="'$(TargetFramework)' == 'net451' AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget>
     <ApplicationManifest>app.manifest</ApplicationManifest>

From 08f4e9f2b6e4df43d1ef401c707a7f9c1294d2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Fri, 8 Apr 2022 17:35:01 +0200
Subject: [PATCH 2/2] Use Major, not LatestMajor

---
 src/datacollector/datacollector.csproj   | 2 +-
 src/vstest.console/vstest.console.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
index 3c6477ef2e..a2605928ed 100644
--- a/src/datacollector/datacollector.csproj
+++ b/src/datacollector/datacollector.csproj
@@ -17,7 +17,7 @@
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
     <PlatformTarget Condition=" $(TargetFramework.StartsWith('net4')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <OutputType>Exe</OutputType>
-    <RollForward>LatestMajor</RollForward>
+    <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 885b4786ca..d317a3a5ef 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <RollForward>LatestMajor</RollForward>
+    <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
     <PlatformTarget Condition="'$(TargetFramework)' == 'net451' AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget>
     <ApplicationManifest>app.manifest</ApplicationManifest>