From 409f9944212790714f9af36bd29843329643ca2b Mon Sep 17 00:00:00 2001
From: Andrew Scott <ascott18@gmail.com>
Date: Fri, 11 Oct 2024 12:27:38 -0700
Subject: [PATCH] feat: additional minor template updates

---
 Directory.Packages.props                                       | 3 ++-
 playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj          | 2 +-
 templates/Coalesce.Vue.Template/content/.vscode/settings.json  | 1 +
 .../content/Coalesce.Starter.Vue.Data/Models/Role.cs           | 2 +-
 .../content/Coalesce.Starter.Vue.Web/.vscode/settings.json     | 3 ++-
 .../Coalesce.Starter.Vue.Web/Controllers/HomeController.cs     | 3 ++-
 .../content/Coalesce.Starter.Vue.Web/src/types/env.d.ts        | 1 +
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e18c507b3..e588e5e74 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,7 +6,8 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DotNetPackageVersionSpec>6.0.*</DotNetPackageVersionSpec>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+  <!-- TargetFramework is empty for projects that aren't multi-targeting (i.e. the playground projects) -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == '' ">
     <DotNetPackageVersionSpec>8.0.10</DotNetPackageVersionSpec>
   </PropertyGroup>
   <ItemGroup>
diff --git a/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj b/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj
index 82e00de48..1901ecaa8 100644
--- a/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj
+++ b/playground/Coalesce.Web.Vue3/Coalesce.Web.Vue3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     
     <Nullable>enable</Nullable>
diff --git a/templates/Coalesce.Vue.Template/content/.vscode/settings.json b/templates/Coalesce.Vue.Template/content/.vscode/settings.json
index 5f6056a77..52b47d0ba 100644
--- a/templates/Coalesce.Vue.Template/content/.vscode/settings.json
+++ b/templates/Coalesce.Vue.Template/content/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "typescript.tsdk": "Coalesce.Starter.Vue.Web\\node_modules\\typescript\\lib",
+  "dotnet.defaultSolution": "Coalesce.Starter.Vue.sln",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs
index 63b9a85ed..47318d66d 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Role.cs
@@ -7,7 +7,7 @@ namespace Coalesce.Starter.Vue.Data.Models;
 [Create(nameof(Permission.UserAdmin))]
 [Edit(nameof(Permission.UserAdmin))]
 [Delete(nameof(Permission.UserAdmin))]
-[Description("Roles are groups of permissions, analagous to job titles or functions.")]
+[Description("Roles are groups of permissions, analogous to job titles or functions.")]
 public class Role
 #if Tenancy
     : IdentityRole, ITenanted
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/.vscode/settings.json b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/.vscode/settings.json
index 81bad0010..3335830c5 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/.vscode/settings.json
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/.vscode/settings.json
@@ -1,9 +1,10 @@
 {
   "typescript.tsdk": "node_modules\\typescript\\lib",
+  "dotnet.defaultSolution": "../Coalesce.Starter.Vue.sln",
+  "dotnet.automaticallyCreateSolutionInWorkspace": false,
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "dotnet.automaticallyCreateSolutionInWorkspace": false,
   "cSpell.words": ["Vite", "unplugin", "iconsets", "viewmodels", "composables"]
 }
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Controllers/HomeController.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Controllers/HomeController.cs
index cd6bb268f..bce1f3371 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Controllers/HomeController.cs
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Controllers/HomeController.cs
@@ -42,7 +42,8 @@ [FromServices] IWebHostEnvironment hostingEnvironment
         string contents = await reader.ReadToEndAsync();
 
         // OPTIONAL: Inject settings or other variables into index.html here.
-        // These will then be available as global variables in your Vue app:
+        // These will then be available as global variables in your Vue app.
+        // Declare them as globals in env.d.ts.
         string headPrepend = $"""
         <script>
             ASPNETCORE_ENVIRONMENT="{JsEncode(hostingEnvironment.EnvironmentName)}"
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/types/env.d.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/types/env.d.ts
index 77a99544f..70838387a 100644
--- a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/types/env.d.ts
+++ b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/types/env.d.ts
@@ -2,3 +2,4 @@
 /// <reference types="vitest/globals" />
 
 declare const BUILD_DATE: Date | null | undefined;
+declare const ASPNETCORE_ENVIRONMENT: string;