From 1e35b16223f7036d60498819f5e3365c57cb3caf Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 21 Jan 2022 16:32:28 -0800
Subject: [PATCH 1/2] Preview 1 branding

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 57641d976..b54813a1e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
     <VersionSDKMinor>1</VersionSDKMinor>
     <VersionFeature>00</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
-    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>

From babb2cda6e5fdd4f738c39ae3566b34ff0d5c756 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 24 Jan 2022 10:30:13 -0800
Subject: [PATCH 2/2] Switching to 7.0 test templates

---
 src/redist/targets/BundledTemplates.targets | 2 +-
 test/EndToEnd/ProjectBuildTests.cs          | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 7a54451cc..0e6699ff4 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -31,7 +31,7 @@
     <Bundled70Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates70PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     
     <!-- NUnit templates are shipped in Test.ProjectTemplates -->
-    <Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.6.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates60PackageVersion)" />
+    <Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates70PackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index edaa1add5..af3c0067e 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -396,13 +396,9 @@ namespace EndToEnd.Tests
             {
                 // TODO: This block need to be updated when every template updates their default tfm.
                 // Currently winforms updated their default templates target but not others.
-                if (template.StartsWith("mstest") 
-                    || template.StartsWith("mstest") 
-                    || template.StartsWith("nunit")
-                    || template.StartsWith("xunit")
-                    || template.StartsWith("wpf"))
+                if (template.StartsWith("wpf"))
                 {
-                    return "net6.0";                    
+                    return "net6.0";
                 }
                 return $"net{latestMajorVersion}.0";
             }