[net7] include net6 templates

Directory.Build.props

@@ -6,6 +6,12 @@
     <_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
     <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
     <_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
+
+    <_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">6</_MauiPreviousDotNetVersionMajor>
+    <_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
+    <_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
+    <_MauiPreviousDotNetTfm Condition="'$(_MauiPreviousDotNetTfm)' == ''">net$(_MauiPreviousDotNetVersion)</_MauiPreviousDotNetTfm>
+
     <_MauiTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MauiTargetPlatformIdentifier>
     <_MauiNoTargetPlatform Condition="'$(_MauiTargetPlatformIdentifier)' == ''">True</_MauiNoTargetPlatform>
     <_MauiTargetPlatformIsAndroid Condition="'$(_MauiTargetPlatformIdentifier)' == 'android'">True</_MauiTargetPlatformIsAndroid>

eng/Versions.props

@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
+    <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.400</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.6.22316.8</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->

eng/cake/dotnet.cake

@@ -156,7 +156,11 @@ Task("dotnet-templates")
                 var projectName = template.Key.Split(":")[0];
                 var templateName = template.Key.Split(":")[1];
 
-                var framework = string.IsNullOrWhiteSpace(TestTFM) ? "" : $"--framework {TestTFM}";
+                var framework = string.IsNullOrWhiteSpace(TestTFM)
+                    ? ""
+                    : TestTFM.StartsWith("net6")
+                        ? $"--Framework {TestTFM}" // this is just needed until we ship the next MAUI SR2
+                        ? $"--framework {TestTFM}";
 
                 projectName = $"{tempDir}/{projectName}_{type}";
                 projectName += string.IsNullOrWhiteSpace(TestTFM) ? "" : $"_{TestTFM}";

eng/pipelines/handlers.yml

@@ -104,8 +104,10 @@ parameters:
     default:
       - name: default
         tfm: default
-      # - name: net6
-      #   tfm: net6.0
+      - name: net6
+        tfm: net6.0
+      - name: net7
+        tfm: net7.0
 
 resources:
   repositories:

src/Workload/Microsoft.NET.Sdk.Maui/Microsoft.NET.Sdk.Maui.csproj

@@ -74,12 +74,24 @@
         OldValue="@MAUI_GRAPHICS_VERSION@"
         NewValue="$(MicrosoftMauiGraphicsVersion)"
     />
+    <ReplaceText
+        Input="$(IntermediateOutputPath)WorkloadManifest.json"
+        Output="$(IntermediateOutputPath)WorkloadManifest.json"
+        OldValue="@MAUI_PREVIOUS_DOTNET_VERSION@"
+        NewValue="$(_MauiPreviousDotNetVersion)"
+    />
     <ReplaceText
         Input="$(IntermediateOutputPath)WorkloadManifest.json"
         Output="$(IntermediateOutputPath)WorkloadManifest.json"
         OldValue="@MAUI_DOTNET_VERSION@"
         NewValue="$(_MauiDotNetVersion)"
     />
+    <ReplaceText
+        Input="$(IntermediateOutputPath)WorkloadManifest.json"
+        Output="$(IntermediateOutputPath)WorkloadManifest.json"
+        OldValue="@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@"
+        NewValue="$(MicrosoftMauiPreviousDotNetReleasedVersion)"
+    />
     <ReplaceText
         Input="%(_JsonVariableMatrix.OutputPath)"
         Output="%(_JsonVariableMatrix.OutputPath)"

src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json

@@ -31,6 +31,7 @@
           "Microsoft.Maui.Sdk",
           "Microsoft.Maui.Graphics",
           "Microsoft.Maui.Resizetizer.Sdk",
+          "Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@",
           "Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@",
           "Microsoft.Maui.Core.Ref.any",
           "Microsoft.Maui.Core.Runtime.any",
@@ -293,6 +294,10 @@
     "Microsoft.Maui.Templates-@MAUI_DOTNET_VERSION@": {
       "kind": "template",
       "version": "@VERSION@"
+    },
+    "Microsoft.Maui.Templates-@MAUI_PREVIOUS_DOTNET_VERSION@": {
+      "kind": "template",
+      "version": "@MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION@"
     }
   }
 }