From cdb68cd7a1eca0c2f190178f4963be9c806997ab Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 4 Oct 2021 21:58:32 +0200
Subject: [PATCH] Try improve the IDE/CLI solution issues (#2823)

Related to #2746
---
 .../templates/maui-blazor/.template.config/template.json  | 8 ++++----
 .../maui-blazor/{MauiApp.1.sln => MauiApp.1.App.sln}      | 0
 .../templates/maui-mobile/.template.config/template.json  | 8 ++++----
 .../maui-mobile/{MauiApp.1.sln => MauiApp.1.App.sln}      | 0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Templates/src/templates/maui-blazor/{MauiApp.1.sln => MauiApp.1.App.sln} (100%)
 rename src/Templates/src/templates/maui-mobile/{MauiApp.1.sln => MauiApp.1.App.sln} (100%)

diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json
index d21f08b6e294..11efec686e2b 100644
--- a/src/Templates/src/templates/maui-blazor/.template.config/template.json
+++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json
@@ -19,10 +19,10 @@
         "copyOnly": [ "**/wwwroot/css/**", "**/*.svg", "**/*.ttf" ],
         "modifiers": [
           {
-            "condition": "(HostIdentifier != \"dotnetcli\")",
-            "exclude": [
-              "*.sln"
-            ]
+            "condition": "(HostIdentifier == \"dotnetcli\")",
+            "rename": {
+               ".App.sln": ".sln"
+            }
           }
         ]
       }
diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.sln b/src/Templates/src/templates/maui-blazor/MauiApp.1.App.sln
similarity index 100%
rename from src/Templates/src/templates/maui-blazor/MauiApp.1.sln
rename to src/Templates/src/templates/maui-blazor/MauiApp.1.App.sln
diff --git a/src/Templates/src/templates/maui-mobile/.template.config/template.json b/src/Templates/src/templates/maui-mobile/.template.config/template.json
index 5b08f8e0dd1e..49544add6271 100644
--- a/src/Templates/src/templates/maui-mobile/.template.config/template.json
+++ b/src/Templates/src/templates/maui-mobile/.template.config/template.json
@@ -19,10 +19,10 @@
         "copyOnly": [ "**/*.svg", "**/*.ttf" ],
         "modifiers": [
           {
-            "condition": "(HostIdentifier != \"dotnetcli\")",
-            "exclude": [
-              "*.sln"
-            ]
+            "condition": "(HostIdentifier == \"dotnetcli\")",
+            "rename": {
+               ".App.sln": ".sln"
+            }
           }
         ]
       }
diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.sln b/src/Templates/src/templates/maui-mobile/MauiApp.1.App.sln
similarity index 100%
rename from src/Templates/src/templates/maui-mobile/MauiApp.1.sln
rename to src/Templates/src/templates/maui-mobile/MauiApp.1.App.sln