Merge branch 'release/6.0.1xx-preview4'

# Conflicts:
#	eng/Microsoft.Extensions.targets
#	src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj

eng/Microsoft.Extensions.targets

@@ -1,20 +1,22 @@
 <Project>
   <PropertyGroup Condition="'$(TargetFramework.Contains(net6.0))' == 'true'">
-    <_MicrosoftHostingVersion>6.0.0-preview.4.21222.10</_MicrosoftHostingVersion>
+    <_MicrosoftHostingVersion>6.0.0-preview.4.21253.7</_MicrosoftHostingVersion>
     <_MicrosoftDependencyInjectionVersion>$(_MicrosoftHostingVersion)</_MicrosoftDependencyInjectionVersion>
-    <_MicrosoftFileProvidersVersion>6.0.0-preview.3.21201.13</_MicrosoftFileProvidersVersion>
+    <_MicrosoftFileProvidersVersion>6.0.0-preview.4.21253.5</_MicrosoftFileProvidersVersion>
+    <_MicrosoftSystemCodeDomVersion>6.0.0-preview.4.21253.7</_MicrosoftSystemCodeDomVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework.Contains(net6.0))' != 'true'">
     <_MicrosoftHostingVersion>5.0.0</_MicrosoftHostingVersion>
     <_MicrosoftDependencyInjectionVersion>5.0.1</_MicrosoftDependencyInjectionVersion>
     <_MicrosoftFileProvidersVersion>5.0.6</_MicrosoftFileProvidersVersion>
+    <_MicrosoftSystemCodeDomVersion>4.7.0</_MicrosoftSystemCodeDomVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_MicrosoftProjectReunionVersion>0.5.0</_MicrosoftProjectReunionVersion>
     <_MicrosoftGraphicsWin2DVersion>0.5.0.13</_MicrosoftGraphicsWin2DVersion>
     <_MicrosoftMauiGraphics>6.0.100-preview.4.120</_MicrosoftMauiGraphics>
+    <_MicrosoftAspNetCoreVersion>6.0.0-preview.4.21253.5</_MicrosoftAspNetCoreVersion>
     <_XamarinAndroidGlideVersion>4.11.0.1</_XamarinAndroidGlideVersion>
-    <_MicrosoftAspNetCoreVersion>6.0.0-preview.4.21227.6</_MicrosoftAspNetCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0-ios' Or '$(TargetFramework)' == 'net6.0-maccatalyst'">
     <!-- Debugger workaround -->
@@ -84,6 +86,9 @@
         Update="Microsoft.AspNetCore.Components.WebView"
         Version="$(_MicrosoftAspNetCoreVersion)"
     />
+    <PackageReference
+        Update="Microsoft.AspNetCore.Components.Web"
+        Version="$(_MicrosoftAspNetCoreVersion)" />
     <PackageReference
         Update="Microsoft.Extensions.FileProviders.Embedded"
         Version="$(_MicrosoftAspNetCoreVersion)"
@@ -92,5 +97,9 @@
         Update="Microsoft.JSInterop"
         Version="$(_MicrosoftAspNetCoreVersion)"
     />
+    <PackageReference
+        Update="System.CodeDom"
+        Version="$(_MicrosoftSystemCodeDomVersion)"
+    />
   </ItemGroup>
 </Project>

src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj

@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.3.21173.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
 </Project>

src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj

@@ -23,7 +23,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mono.Cecil" Version="0.11.3" PrivateAssets="all" GeneratePathProperty="true" />
-		<PackageReference Include="System.CodeDom" Version="4.7.0" PrivateAssets="all" GeneratePathProperty="true" />
+		<PackageReference Include="System.CodeDom" GeneratePathProperty="true" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+		<PackageReference Include="System.CodeDom" PrivateAssets="all" Condition="'$(TargetFramework)' == 'net6.0'" />
 		<PackageReference Include="Microsoft.Build" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
@@ -89,4 +90,4 @@
 		<Copy SourceFiles="@(_CopyItems)" DestinationFolder="..\..\..\..\.nuspec\" ContinueOnError="true" Retries="0" />
 	</Target>
 
-</Project>
+</Project>

src/Templates/build.ps1

@@ -1,6 +1,10 @@
-$PACKAGEVERSION = "6.0.100-preview.4.999"
+$PACKAGEVERSION = "6.0.100-preview.4.9991"
+
+& dotnet new -u "../../artifacts/Microsoft.Maui.Templates.$PACKAGEVERSION.nupkg"
 
 Remove-Item -Force "../../artifacts/Microsoft.Maui.Templates.*.nupkg"
+
+& dotnet build -t:Rebuild src/Microsoft.Maui.Templates.csproj -p:PackageVersion="$PACKAGEVERSION"
 & dotnet pack src/Microsoft.Maui.Templates.csproj -p:PackageVersion="$PACKAGEVERSION"
 & dotnet new -u Microsoft.Maui.Templates
 & dotnet new -i "../../artifacts/Microsoft.Maui.Templates.$PACKAGEVERSION.nupkg"

src/Templates/src/Microsoft.Maui.Templates.csproj

@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageType>Template</PackageType>
     <PackageId>Microsoft.Maui.Templates</PackageId>
-    <PackageVersion>6.0.100-preview.4.617</PackageVersion>
-    <MicrosoftExtensionsPackageVersion>6.0.0-preview.4.21227.6</MicrosoftExtensionsPackageVersion>
+    <PackageVersion>6.0.100-preview.4.9991</PackageVersion>
     <Title>.NET MAUI Templates</Title>
     <Authors>Microsoft</Authors>
     <Description>Templates for .NET MAUI.</Description>
@@ -15,64 +14,12 @@
     <ContentTargetFolders>content</ContentTargetFolders>
     <!-- This project has no .NET assemblies, so disable the warning for that -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
-    <!-- <_SolutionFile>maui-mobile/MauiApp1.in.sln</_SolutionFile>
-    <_SolutionFileDest>maui-mobile/MauiApp1.sln</_SolutionFileDest> -->
   </PropertyGroup>
 
-  <ItemGroup>
-    <_TemplateFile Include="maui-mobile/MauiApp1/MauiApp1.in.csproj" />
-    <_TemplateFile Include="maui-mobile/MauiApp1.WinUI3/MauiApp1.WinUI3.in.csproj" />
-    <_TemplateFile Include="maui-mobile/MauiApp1.WinUI3 (Package)/MauiApp1.WinUI3 (Package).in.wapproj" />
-    <_TemplateFile Include="maui-blazor/MauiApp1/MauiApp1.in.csproj" />
-    <_TemplateFile Include="maui-blazor/MauiApp1.WinUI3/MauiApp1.WinUI3.in.csproj" />
-    <_TemplateFile Include="maui-blazor/MauiApp1.WinUI3 (Package)/MauiApp1.WinUI3 (Package).in.wapproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="**/*" Exclude="**/bin/**;**/obj/**;$(MSBuildProjectFile)*;$(_SolutionFile);@(_TemplateFile)" />
-    <Compile Remove="**/*" />
-  </ItemGroup>
 
   <ItemGroup>
-    <_TemplateFile Update="@(_TemplateFile)">
-      <NewFileName>$(IntermediateOutputPath)\$([System.IO.Path]::GetDirectoryName('%(Identity)'))\$([System.IO.Path]::GetFileName('%(Identity)').Replace('.in',''))</NewFileName>
-      <ProjDirName>$([System.IO.Path]::GetDirectoryName('%(Identity)'))</ProjDirName>
-    </_TemplateFile>
-
+    <Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" />
+    <Compile Remove="**\*" />
   </ItemGroup>
 
-  <!-- Eventually replaced by eng/Versions.targets -->
-  <Target Name="SetVersions" />
-
-  <Target Name="_GenerateTemplateFile"
-      BeforeTargets="Build"
-      DependsOnTargets="SetVersions"
-      Inputs="$(MSBuildProjectFile);@(_TemplateFile);$(_SolutionFile)"
-      Outputs="%(_TemplateFile.NewFileName);$(_SolutionFileDest)">
-    <Copy
-        SourceFiles="@(_TemplateFile)"
-        DestinationFiles="%(_TemplateFile.NewFileName)"
-    />
-
-    <!-- <Copy
-      SourceFiles="$(_SolutionFile)"
-      DestinationFiles="$(IntermediateOutputPath)\$(_SolutionFileDest)" /> -->
-
-    <XmlPoke
-        XmlInputPath="%(_TemplateFile.NewFileName)"
-        Value="$(PackageVersion)"
-        Query="/Project/ItemGroup/PackageReference[@Version='MAUI_VERSION']/@Version"
-    />
-    <XmlPoke
-        XmlInputPath="%(_TemplateFile.NewFileName)"
-        Value="$(MicrosoftExtensionsPackageVersion)"
-        Query="/Project/ItemGroup/PackageReference[@Version='MICROSOFT_EXTENSIONS_VERSION']/@Version"
-    />
-    <ItemGroup>
-      <Content Include="%(_TemplateFile.NewFileName)" PackagePath="content/%(_TemplateFile.ProjDirName)" />
-      <!-- <Content Include="$(_SolutionFileDest)" Package="content/maui-mobile/" /> -->
-      <FileWrites Include="%(_TemplateFile.NewFileName);$(_SolutionFileDest)" />
-    </ItemGroup>
-  </Target>
-
 </Project>

src/Templates/src/templates/maui-blazor/.template.config/template.json

@@ -0,0 +1,47 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "Microsoft",
+    "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Blazor" ],
+    "identity": "Microsoft.Maui.BlazorApp",
+    "groupIdentity": "Microsoft.Maui.Blazor",
+    "name": ".NET MAUI Blazor App",
+    "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, and WinUI using Blazor",
+    "shortName": "maui-blazor",
+    "tags": {
+      "language": "C#",
+      "type": "solution"
+    },
+    "sourceName": "MauiApp1",
+    "preferNameDirectory": true,
+    "primaryOutputs": [
+      { "path": "MauiApp1/MauiApp1.csproj" },
+      { "path": "MauiApp1.WinUI3/MauiApp1.WinUI3.csproj" },
+      { "path": "MauiApp1.WinUI3 (Package)/MauiApp1.WinUI3 (Package).csproj" }
+    ],
+    "guids": [
+      "07CD65EF-6238-4365-AF5D-F6D433967F48",
+      "202C61B5-A2D9-4817-8020-731D9F855561",
+      "A88FCF8C-EC35-4623-B126-C591EEF99C70"
+    ],
+    "symbols": {
+      "applicationId": {
+        "type": "parameter",
+        "description": "Overrides the $(ApplicationId) in the project",
+        "datatype": "string",
+        "replaces": "com.companyname.MauiApp1"
+      },
+      "microsoftExtensionsVersion": {
+        "type": "parameter",
+        "dataType": "string",
+        "replaces": "MICROSOFT_EXTENSIONS_VERSION",
+        "defaultValue": "6.0.0-preview.4.*"
+      },
+      "mauiVersion": {
+        "type": "parameter",
+        "dataType": "string",
+        "replaces": "MAUI_VERSION",
+        "defaultValue": "6.0.100-preview.4.*"
+      }
+    },
+    "defaultName": "MauiApp1"
+  }

src/Templates/src/templates/maui-blazor/Directory.Build.targets

@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
+    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Required - Setup Single Project features -->
+    <ProjectCapability Include="MauiSingleProject" />
+
+    <!-- Optional - Enables a list of TFM's and device categories in the debug menu -->
+    <!-- This allows easily toggling of debug target TFM by selecting the platform -->
+    <!-- If removed, Top level debug targets show as a list of devices for the selected TFM -->
+    <ProjectCapability Include="XamarinStaticLaunchProfiles" />
+  </ItemGroup>
+</Project>

src/Templates/src/maui-mobile/.template.config/template.json → src/Templates/src/templates/maui-mobile/.template.config/template.json

@@ -2,28 +2,40 @@
     "$schema": "http://json.schemastore.org/template",
     "author": "Microsoft",
     "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI" ],
-    "identity": "Microsoft.Maui.SingleProject",
+    "identity": "Microsoft.Maui.MauiApp",
+    "groupIdentity": "Microsoft.Maui",
     "name": ".NET MAUI App",
     "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, and WinUI",
     "shortName": "maui",
     "tags": {
       "language": "C#",
-      "type": "project"
+      "type": "solution"
     },
     "sourceName": "MauiApp1",
     "preferNameDirectory": true,
-    "primaryOutputs": [
-      { "path": "MauiApp1\\MauiApp1.csproj" },
-      { "path": "MauiApp1.WinUI3\\MauiApp1.WinUI3.csproj" },
-      { "path": "MauiApp1.WinUI3 (Package)\\MauiApp1.WinUI3 (Package).csproj" },
-      { "path": "MauiApp1.sln" }
+    "guids": [
+      "07CD65EF-6238-4365-AF5D-F6D433967F48",
+      "202C61B5-A2D9-4817-8020-731D9F855561",
+      "A88FCF8C-EC35-4623-B126-C591EEF99C70"
     ],
     "symbols": {
       "applicationId": {
         "type": "parameter",
         "description": "Overrides the $(ApplicationId) in the project",
         "datatype": "string",
         "replaces": "com.companyname.MauiApp1"
+      },
+      "microsoftExtensionsVersion": {
+        "type": "parameter",
+        "dataType": "string",
+        "replaces": "MICROSOFT_EXTENSIONS_VERSION",
+        "defaultValue": "6.0.0-preview.4.*"
+      },
+      "mauiVersion": {
+        "type": "parameter",
+        "dataType": "string",
+        "replaces": "MAUI_VERSION",
+        "defaultValue": "6.0.100-preview.4.*"
       }
     },
     "defaultName": "MauiApp1"

src/Templates/src/templates/maui-mobile/Directory.Build.targets

@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
+    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Required - Setup Single Project features -->
+    <ProjectCapability Include="MauiSingleProject" />
+
+    <!-- Optional - Enables a list of TFM's and device categories in the debug menu -->
+    <!-- This allows easily toggling of debug target TFM by selecting the platform -->
+    <!-- If removed, Top level debug targets show as a list of devices for the selected TFM -->
+    <ProjectCapability Include="XamarinStaticLaunchProfiles" />
+  </ItemGroup>
+</Project>