From 3e1c825e9160faeedc071725a2e34350b631e1a7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 21 Jun 2025 19:42:47 +0000 Subject: [PATCH 1/4] Initial plan for issue From 2a21a5e9874c23808d9a48190753667fa9f79b45 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 21 Jun 2025 19:53:12 +0000 Subject: [PATCH 2/4] Initial plan for Blazor targets file restructuring Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com> --- src/Templates/src/cgmanifest.json | 124 +++++++++--------- .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - .../localize/templatestrings.json | 1 - 13 files changed, 62 insertions(+), 74 deletions(-) diff --git a/src/Templates/src/cgmanifest.json b/src/Templates/src/cgmanifest.json index 53385cc17fa7..9de9f5181332 100644 --- a/src/Templates/src/cgmanifest.json +++ b/src/Templates/src/cgmanifest.json @@ -3,155 +3,155 @@ "registrations": [ { "component": { + "type": "nuget", "nuget": { "version": "11.1.1", "name": "CommunityToolkit.Maui" - }, - "type": "nuget" + } } }, { "component": { + "type": "nuget", "nuget": { "version": "9.1.0", "name": "CommunityToolkit.Maui" - }, - "type": "nuget" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "17.6.0", - "name": "Microsoft.NET.Test.Sdk" - }, - "type": "nuget" + "version": "9.0.5", + "name": "Microsoft.Extensions.Logging.Debug" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "2.8.2", - "name": "xunit.runner.visualstudio" - }, - "type": "nuget" + "version": "17.6.0", + "name": "Microsoft.NET.Test.Sdk" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "9.0.4", - "name": "Microsoft.Extensions.Configuration" - }, - "type": "nuget" + "version": "1.7.250513003", + "name": "Microsoft.WindowsAppSDK" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "1.0.4", - "name": "Syncfusion.Maui.Toolkit" - }, - "type": "nuget" + "version": "10.0.22621.756", + "name": "Microsoft.Windows.SDK.BuildTools" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "1.7.250401001", - "name": "Microsoft.WindowsAppSDK" - }, - "type": "nuget" + "version": "2.1.10", + "name": "SQLitePCLRaw.bundle_green" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "2.1.10", - "name": "SQLitePCLRaw.bundle_green" - }, - "type": "nuget" + "version": "8.3.2", + "name": "CommunityToolkit.Mvvm" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "9.0.4", - "name": "Microsoft.Extensions.Logging.Debug" - }, - "type": "nuget" + "version": "1.15.0", + "name": "xunit.analyzer" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "10.0.22621.756", - "name": "Microsoft.Windows.SDK.BuildTools" - }, - "type": "nuget" + "version": "1.0.4", + "name": "Syncfusion.Maui.Toolkit" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "8.3.2", - "name": "CommunityToolkit.Mvvm" - }, - "type": "nuget" + "version": "6.0.0", + "name": "coverlet.collector" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "1.2.0", - "name": "Microsoft.Graphics.Win2D" - }, - "type": "nuget" + "version": "9.0.5", + "name": "Microsoft.Extensions.Configuration" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "2.9.0", - "name": "xunit" - }, - "type": "nuget" + "version": "9.0.5", + "name": "Microsoft.Extensions.DependencyInjection" + } } }, { "component": { + "type": "nuget", "nuget": { "version": "8.0.8", "name": "Microsoft.Data.Sqlite.Core" - }, - "type": "nuget" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "9.0.4", - "name": "Microsoft.Extensions.DependencyInjection" - }, - "type": "nuget" + "version": "2.8.2", + "name": "xunit.runner.visualstudio" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "1.15.0", - "name": "xunit.analyzer" - }, - "type": "nuget" + "version": "1.3.2", + "name": "Microsoft.Graphics.Win2D" + } } }, { "component": { + "type": "nuget", "nuget": { - "version": "6.0.0", - "name": "coverlet.collector" - }, - "type": "nuget" + "version": "2.9.0", + "name": "xunit" + } } } ], diff --git a/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json index 6e7f003887a6..5f08d99565a3 100644 --- a/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Blazor Hybrid and Web App", - "_name.comment": "{Locked='.NET MAUI Blazor Hybrid', Locked='Web'}", "description": "A multi-project app for creating a .NET MAUI Blazor Hybrid application with a Blazor Web project with a shared user interface.", "postActions/openInEditor/description": "Opens Shared Pages/Home.razor in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json index 8e3c03e044ed..4fb3f9cf9571 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Blazor Hybrid App", - "_name.comment": "{Locked='.NET MAUI Blazor Hybrid'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor Hybrid", "postActions/openInEditor/description": "Opens Components/Pages/Home.razor in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json index 491e40d03f77..39794f90318c 100644 --- a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI ContentPage (C#)", - "_name.comment": "{Locked}", "description": "A page for displaying content using C#.", "postActions/openInEditor/description": "Opens NewPage1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json index 06e8e189961b..af7559bcac2e 100644 --- a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI ContentPage (XAML)", - "_name.comment": "{Locked}", "description": "A page for displaying content using XAML.", "postActions/openInEditor/description": "Opens NewPage1.xaml in the editor.", "symbols/namespace/description": "namespace for the generated code" diff --git a/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json index 1523ff8c82e3..b468dd11ec35 100644 --- a/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI ContentView (C#)", - "_name.comment": "{Locked}", "description": "A view for displaying content using C#. This is very suitable for creating your own custom and reusable controls.", "postActions/openInEditor/description": "Opens NewContent1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json index f2fd74e0321e..af69fc4c3d18 100644 --- a/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI ContentView (XAML)", - "_name.comment": "{Locked}", "description": "A view for displaying content using XAML. This is very suitable for creating your own custom and reusable controls.", "postActions/openInEditor/description": "Opens NewContent1.xaml in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json index c41e9a17a72b..494bb654e85a 100644 --- a/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Class Library", - "_name.comment": "{Locked='.NET MAUI Class'}", "description": "A project for creating a .NET MAUI class library", "postActions/openInEditor/description": "Opens Class1.cs in the editor.", "symbols/Framework/description": "The target framework for the project.", diff --git a/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json index 3b57e21d5883..b195588e3b12 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI App", - "_name.comment": "{Locked='.NET MAUI'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI and Tizen", "postActions/openInEditor/description": "Opens MainPage.xaml in the editor.", "postActions/restore/description": "Restore NuGet packages required by this project.", diff --git a/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json index bced66b48a8e..93268cbfc7eb 100644 --- a/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Multi-Project App", - "_name.comment": "{Locked='.NET MAUI'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst and WinUI with multiple, separate app projects.", "postActions/openInEditor/description": "Opens MainPage.xaml in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json index 351d3cbf4d61..320a80a984d7 100644 --- a/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI ResourceDictionary (XAML)", - "_name.comment": "{Locked}", "description": "A repository for resources that are used by a .NET MAUI app. Typical resources that are stored in a ResourceDictionary include styles, control templates, data templates, converters, and colors.", "postActions/openInEditor/description": "Opens Dictionary1.xaml in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json index 6bf0365b5aec..4d3d7417ea10 100644 --- a/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Window (C#)", - "_name.comment": "{Locked}", "description": "A window for displaying a page using C#.", "postActions/openInEditor/description": "Opens NewWindow1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json index 083008677353..56b2f808762a 100644 --- a/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json @@ -1,7 +1,6 @@ { "author": "Microsoft", "name": ".NET MAUI Window (XAML)", - "_name.comment": "{Locked}", "description": "A window for displaying a page using XAML.", "postActions/openInEditor/description": "Opens NewWindow1.xaml in the editor.", "symbols/namespace/description": "namespace for the generated code" From 0888a7be650f10e5f79cf9139ad0b778a8339438 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 21 Jun 2025 20:01:08 +0000 Subject: [PATCH 3/4] Implement conditional import for Blazor targets files Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com> --- .gitignore | 4 + ...etCore.Components.WebView.Maui.Sdk.targets | 124 +++++++++++++++++ ...AspNetCore.Components.WebView.Maui.targets | 125 +----------------- src/Templates/src/cgmanifest.json | 124 ++++++++--------- .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + .../localize/templatestrings.json | 1 + 16 files changed, 206 insertions(+), 183 deletions(-) create mode 100644 src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.Sdk.targets diff --git a/.gitignore b/.gitignore index 8f457824a432..c6fd756d2852 100644 --- a/.gitignore +++ b/.gitignore @@ -384,3 +384,7 @@ snapshots-diff/ temp .packages /src/Templates/.tempTemplateOutput + +# Auto-generated files that should not be committed +cgmanifest.json +templatestrings.json diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.Sdk.targets b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.Sdk.targets new file mode 100644 index 000000000000..614de50283cd --- /dev/null +++ b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.Sdk.targets @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + / + Root + + + + + + + + + + + %(_MauiStaticWebAssetWithTargetPath.TargetPath) + %(_MauiStaticWebAssetWithTargetPath.TargetPath) + + + + + + + <_ContentNotScopedCssFiles Include="@(Content)" Exclude="@(ScopedCssInput)" /> + <_ContentToUpdate Include="@(Content)" Exclude="@(_ContentNotScopedCssFiles)" /> + + + <_ContentToUpdate Include="@(Content->WithMetadataValue('Extension', '.razor'))" /> + + + + + + + + + + + + + + + + + + + + + + <_NonWWWRootContent Include="@(Content)" Exclude="wwwroot/**/*" /> + + <_TemporaryHiddenContent Include="@(Content)" Exclude="@(_NonWWWRootContent)" /> + + <_TemporaryHiddenContent Include="Components\**\*.razor.css" /> + <_TemporaryHiddenContent Include="Pages\**\*.razor.css" /> + <_TemporaryHiddenContent Include="Shared\**\*.razor.css" /> + + + + + + + + + + + + + + + + <_NonWWWRootContent Include="@(Content)" Exclude="wwwroot/**/*" /> + + <_TemporaryHiddenContent Include="@(Content)" Exclude="@(_NonWWWRootContent)" /> + + <_TemporaryHiddenContent Include="Components\**\*.razor.css" /> + <_TemporaryHiddenContent Include="Pages\**\*.razor.css" /> + <_TemporaryHiddenContent Include="Shared\**\*.razor.css" /> + + + + + + + + + + + + + + + <_TemporaryAndroidHiddenContent Include="@(Content)" /> + + + + + + + + + + + + diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets index 614de50283cd..6e463958c277 100644 --- a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets +++ b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets @@ -1,124 +1,7 @@  - - - - + + - - - - - - - - - - - - - / - Root - - - - - - - - - - - %(_MauiStaticWebAssetWithTargetPath.TargetPath) - %(_MauiStaticWebAssetWithTargetPath.TargetPath) - - - - - - - <_ContentNotScopedCssFiles Include="@(Content)" Exclude="@(ScopedCssInput)" /> - <_ContentToUpdate Include="@(Content)" Exclude="@(_ContentNotScopedCssFiles)" /> - - - <_ContentToUpdate Include="@(Content->WithMetadataValue('Extension', '.razor'))" /> - - - - - - - - - - - - - - - - - - - - - - <_NonWWWRootContent Include="@(Content)" Exclude="wwwroot/**/*" /> - - <_TemporaryHiddenContent Include="@(Content)" Exclude="@(_NonWWWRootContent)" /> - - <_TemporaryHiddenContent Include="Components\**\*.razor.css" /> - <_TemporaryHiddenContent Include="Pages\**\*.razor.css" /> - <_TemporaryHiddenContent Include="Shared\**\*.razor.css" /> - - - - - - - - - - - - - - - - <_NonWWWRootContent Include="@(Content)" Exclude="wwwroot/**/*" /> - - <_TemporaryHiddenContent Include="@(Content)" Exclude="@(_NonWWWRootContent)" /> - - <_TemporaryHiddenContent Include="Components\**\*.razor.css" /> - <_TemporaryHiddenContent Include="Pages\**\*.razor.css" /> - <_TemporaryHiddenContent Include="Shared\**\*.razor.css" /> - - - - - - - - - - - - - - - <_TemporaryAndroidHiddenContent Include="@(Content)" /> - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/Templates/src/cgmanifest.json b/src/Templates/src/cgmanifest.json index 9de9f5181332..53385cc17fa7 100644 --- a/src/Templates/src/cgmanifest.json +++ b/src/Templates/src/cgmanifest.json @@ -3,155 +3,155 @@ "registrations": [ { "component": { - "type": "nuget", "nuget": { "version": "11.1.1", "name": "CommunityToolkit.Maui" - } + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { "version": "9.1.0", "name": "CommunityToolkit.Maui" - } + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "9.0.5", - "name": "Microsoft.Extensions.Logging.Debug" - } + "version": "17.6.0", + "name": "Microsoft.NET.Test.Sdk" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "17.6.0", - "name": "Microsoft.NET.Test.Sdk" - } + "version": "2.8.2", + "name": "xunit.runner.visualstudio" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "1.7.250513003", - "name": "Microsoft.WindowsAppSDK" - } + "version": "9.0.4", + "name": "Microsoft.Extensions.Configuration" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "10.0.22621.756", - "name": "Microsoft.Windows.SDK.BuildTools" - } + "version": "1.0.4", + "name": "Syncfusion.Maui.Toolkit" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "2.1.10", - "name": "SQLitePCLRaw.bundle_green" - } + "version": "1.7.250401001", + "name": "Microsoft.WindowsAppSDK" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "8.3.2", - "name": "CommunityToolkit.Mvvm" - } + "version": "2.1.10", + "name": "SQLitePCLRaw.bundle_green" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "1.15.0", - "name": "xunit.analyzer" - } + "version": "9.0.4", + "name": "Microsoft.Extensions.Logging.Debug" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "1.0.4", - "name": "Syncfusion.Maui.Toolkit" - } + "version": "10.0.22621.756", + "name": "Microsoft.Windows.SDK.BuildTools" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "6.0.0", - "name": "coverlet.collector" - } + "version": "8.3.2", + "name": "CommunityToolkit.Mvvm" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "9.0.5", - "name": "Microsoft.Extensions.Configuration" - } + "version": "1.2.0", + "name": "Microsoft.Graphics.Win2D" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "9.0.5", - "name": "Microsoft.Extensions.DependencyInjection" - } + "version": "2.9.0", + "name": "xunit" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { "version": "8.0.8", "name": "Microsoft.Data.Sqlite.Core" - } + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "2.8.2", - "name": "xunit.runner.visualstudio" - } + "version": "9.0.4", + "name": "Microsoft.Extensions.DependencyInjection" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "1.3.2", - "name": "Microsoft.Graphics.Win2D" - } + "version": "1.15.0", + "name": "xunit.analyzer" + }, + "type": "nuget" } }, { "component": { - "type": "nuget", "nuget": { - "version": "2.9.0", - "name": "xunit" - } + "version": "6.0.0", + "name": "coverlet.collector" + }, + "type": "nuget" } } ], diff --git a/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json index 5f08d99565a3..6e7f003887a6 100644 --- a/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-blazor-solution/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Blazor Hybrid and Web App", + "_name.comment": "{Locked='.NET MAUI Blazor Hybrid', Locked='Web'}", "description": "A multi-project app for creating a .NET MAUI Blazor Hybrid application with a Blazor Web project with a shared user interface.", "postActions/openInEditor/description": "Opens Shared Pages/Home.razor in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json index 4fb3f9cf9571..8e3c03e044ed 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Blazor Hybrid App", + "_name.comment": "{Locked='.NET MAUI Blazor Hybrid'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor Hybrid", "postActions/openInEditor/description": "Opens Components/Pages/Home.razor in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json index 39794f90318c..491e40d03f77 100644 --- a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI ContentPage (C#)", + "_name.comment": "{Locked}", "description": "A page for displaying content using C#.", "postActions/openInEditor/description": "Opens NewPage1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json index af7559bcac2e..06e8e189961b 100644 --- a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI ContentPage (XAML)", + "_name.comment": "{Locked}", "description": "A page for displaying content using XAML.", "postActions/openInEditor/description": "Opens NewPage1.xaml in the editor.", "symbols/namespace/description": "namespace for the generated code" diff --git a/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json index b468dd11ec35..1523ff8c82e3 100644 --- a/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentview-csharp/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI ContentView (C#)", + "_name.comment": "{Locked}", "description": "A view for displaying content using C#. This is very suitable for creating your own custom and reusable controls.", "postActions/openInEditor/description": "Opens NewContent1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json index af69fc4c3d18..f2fd74e0321e 100644 --- a/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-contentview-xaml/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI ContentView (XAML)", + "_name.comment": "{Locked}", "description": "A view for displaying content using XAML. This is very suitable for creating your own custom and reusable controls.", "postActions/openInEditor/description": "Opens NewContent1.xaml in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json index 494bb654e85a..c41e9a17a72b 100644 --- a/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-lib/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Class Library", + "_name.comment": "{Locked='.NET MAUI Class'}", "description": "A project for creating a .NET MAUI class library", "postActions/openInEditor/description": "Opens Class1.cs in the editor.", "symbols/Framework/description": "The target framework for the project.", diff --git a/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json index b195588e3b12..3b57e21d5883 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI App", + "_name.comment": "{Locked='.NET MAUI'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI and Tizen", "postActions/openInEditor/description": "Opens MainPage.xaml in the editor.", "postActions/restore/description": "Restore NuGet packages required by this project.", diff --git a/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json index 93268cbfc7eb..bced66b48a8e 100644 --- a/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-multiproject/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Multi-Project App", + "_name.comment": "{Locked='.NET MAUI'}", "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst and WinUI with multiple, separate app projects.", "postActions/openInEditor/description": "Opens MainPage.xaml in the editor.", "symbols/applicationId/description": "Overrides the $(ApplicationId) in the project", diff --git a/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json index 320a80a984d7..351d3cbf4d61 100644 --- a/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-resourcedictionary-xaml/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI ResourceDictionary (XAML)", + "_name.comment": "{Locked}", "description": "A repository for resources that are used by a .NET MAUI app. Typical resources that are stored in a ResourceDictionary include styles, control templates, data templates, converters, and colors.", "postActions/openInEditor/description": "Opens Dictionary1.xaml in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json index 4d3d7417ea10..6bf0365b5aec 100644 --- a/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-window-csharp/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Window (C#)", + "_name.comment": "{Locked}", "description": "A window for displaying a page using C#.", "postActions/openInEditor/description": "Opens NewWindow1.cs in the editor.", "symbols/namespace/description": "Namespace for the generated code." diff --git a/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json b/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json index 56b2f808762a..083008677353 100644 --- a/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json +++ b/src/Templates/src/templates/maui-window-xaml/.template.config/localize/templatestrings.json @@ -1,6 +1,7 @@ { "author": "Microsoft", "name": ".NET MAUI Window (XAML)", + "_name.comment": "{Locked}", "description": "A window for displaying a page using XAML.", "postActions/openInEditor/description": "Opens NewWindow1.xaml in the editor.", "symbols/namespace/description": "namespace for the generated code" From fc44121d266da2dae476418a388c3b1c48ad1eef Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 21 Jun 2025 20:34:44 +0000 Subject: [PATCH 4/4] Revert .gitignore changes and reset auto-generated files Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com> --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index c6fd756d2852..8f457824a432 100644 --- a/.gitignore +++ b/.gitignore @@ -384,7 +384,3 @@ snapshots-diff/ temp .packages /src/Templates/.tempTemplateOutput - -# Auto-generated files that should not be committed -cgmanifest.json -templatestrings.json