From 2e481887e451ccdf8e4e692b295251f0b4fbf0f9 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 14 Nov 2024 20:20:18 -0800
Subject: [PATCH 1/3] Add missing "type": "solution", required for Rider to
 display it properly

---
 templates/csharp/xplat/.template.config/template.json | 3 ++-
 templates/fsharp/xplat/.template.config/template.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json
index aff3d8d..3c9fb6f 100644
--- a/templates/csharp/xplat/.template.config/template.json
+++ b/templates/csharp/xplat/.template.config/template.json
@@ -12,7 +12,8 @@
   "defaultName": "AvaloniaApplication",
   "tags": {
     "language": "C#",
-    "type": "project"
+    "type": "solution",
+    "editorTreatAs": "solution"
   },
   "symbols": {
     "Framework": {
diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json
index 0f4d3a8..3c2ad59 100644
--- a/templates/fsharp/xplat/.template.config/template.json
+++ b/templates/fsharp/xplat/.template.config/template.json
@@ -10,7 +10,8 @@
   "defaultName": "AvaloniaApplication",
   "tags": {
     "language": "F#",
-    "type": "project"
+    "type": "solution",
+    "editorTreatAs": "solution"
   },
   "sourceName": "AvaloniaTest",
   "preferNameDirectory": true,

From c363b79b0e2e782660d43e1cf959b4d0c09652f4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 14 Nov 2024 20:23:14 -0800
Subject: [PATCH 2/3] Set solution file guid too

---
 templates/csharp/xplat/.template.config/template.json | 3 +++
 templates/fsharp/xplat/.template.config/template.json | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json
index 3c9fb6f..c285663 100644
--- a/templates/csharp/xplat/.template.config/template.json
+++ b/templates/csharp/xplat/.template.config/template.json
@@ -15,6 +15,9 @@
     "type": "solution",
     "editorTreatAs": "solution"
   },
+  "guids": [
+    "FA975F72-10BF-449E-AF8E-03F927A4CBCB" // Solution file (SolutionGuid)
+  ],
   "symbols": {
     "Framework": {
       "type": "parameter",
diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json
index 3c2ad59..fd0270f 100644
--- a/templates/fsharp/xplat/.template.config/template.json
+++ b/templates/fsharp/xplat/.template.config/template.json
@@ -13,6 +13,9 @@
     "type": "solution",
     "editorTreatAs": "solution"
   },
+  "guids": [
+    "FA975F72-10BF-449E-AF8E-03F927A4CBCB" // Solution file (SolutionGuid)
+  ],
   "sourceName": "AvaloniaTest",
   "preferNameDirectory": true,
   "symbols": {

From 3e194138af8dfed096f300f6170298c6e45d1936 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 14 Nov 2024 20:28:02 -0800
Subject: [PATCH 3/3] Remove guids, unnecessary

---
 templates/csharp/xplat/.template.config/template.json | 3 ---
 templates/csharp/xplat/AvaloniaTest.sln               | 2 +-
 templates/fsharp/xplat/.template.config/template.json | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json
index c285663..3c9fb6f 100644
--- a/templates/csharp/xplat/.template.config/template.json
+++ b/templates/csharp/xplat/.template.config/template.json
@@ -15,9 +15,6 @@
     "type": "solution",
     "editorTreatAs": "solution"
   },
-  "guids": [
-    "FA975F72-10BF-449E-AF8E-03F927A4CBCB" // Solution file (SolutionGuid)
-  ],
   "symbols": {
     "Framework": {
       "type": "parameter",
diff --git a/templates/csharp/xplat/AvaloniaTest.sln b/templates/csharp/xplat/AvaloniaTest.sln
index 40985ab..61fa6b8 100644
--- a/templates/csharp/xplat/AvaloniaTest.sln
+++ b/templates/csharp/xplat/AvaloniaTest.sln
@@ -16,7 +16,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}"
 	ProjectSection(SolutionItems) = preProject
 #if (UseCentralPackageManagement)
-		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 #else
 		Directory.Build.props = Directory.Build.props
 #endif
diff --git a/templates/fsharp/xplat/.template.config/template.json b/templates/fsharp/xplat/.template.config/template.json
index fd0270f..3c2ad59 100644
--- a/templates/fsharp/xplat/.template.config/template.json
+++ b/templates/fsharp/xplat/.template.config/template.json
@@ -13,9 +13,6 @@
     "type": "solution",
     "editorTreatAs": "solution"
   },
-  "guids": [
-    "FA975F72-10BF-449E-AF8E-03F927A4CBCB" // Solution file (SolutionGuid)
-  ],
   "sourceName": "AvaloniaTest",
   "preferNameDirectory": true,
   "symbols": {