From 899d4d50aeda336251054a454104fa43e181fc08 Mon Sep 17 00:00:00 2001
From: Johnny Brenes <103782746+JBrenesSimpat@users.noreply.github.com>
Date: Fri, 23 Feb 2024 12:55:25 -0600
Subject: [PATCH] [ODS-6262] Cherry-Pick ODS-5686 into main6x - Minimal
 template should include only include descriptors (#972)

---
 .../workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml    | 2 +-
 .github/workflows/Pkg EdFi.Ods.Minimal.Template.yml           | 2 +-
 Utilities/CodeGeneration/README.md                            | 4 ++--
 .../EdFi.Ods.Extensions.ExtensionName.nuspec                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
index df5bcfad58..791518f0bb 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml	
@@ -87,7 +87,7 @@ jobs:
         $ErrorActionPreference = 'Stop'
         [Environment]::SetEnvironmentVariable('msbuild_buildConfiguration', '${{ env.CONFIGURATION }}')
         Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-minimal-template.psm1"
-        Initialize-MinimalTemplate -samplePath "./Ed-Fi-Standard/" -noExtensions -Engine PostgreSQL
+        Initialize-MinimalTemplate -samplePath "./Ed-Fi-Standard/Descriptors" -noExtensions -Engine PostgreSQL
       shell: powershell
     - name: pack
       working-directory: ./Ed-Fi-ODS/
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml
index bedda0e5c6..c7eb752a34 100644
--- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml	
+++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml	
@@ -85,7 +85,7 @@ jobs:
         $ErrorActionPreference = 'Stop'
         [Environment]::SetEnvironmentVariable('msbuild_buildConfiguration', '${{ env.CONFIGURATION }}')
         Import-Module -Force -Scope Global "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-minimal-template.psm1"
-        Initialize-MinimalTemplate -samplePath './Ed-Fi-Standard/' -noExtensions
+        Initialize-MinimalTemplate -samplePath './Ed-Fi-Standard/Descriptors' -noExtensions
       shell: powershell
     - name: pack
       working-directory: ./Ed-Fi-ODS/
diff --git a/Utilities/CodeGeneration/README.md b/Utilities/CodeGeneration/README.md
index c4aa9c8cf0..b92736fe34 100644
--- a/Utilities/CodeGeneration/README.md
+++ b/Utilities/CodeGeneration/README.md
@@ -14,7 +14,7 @@ Ed-Fi ODS software developers and implementers.
 
 ## Prerequisites
 To build the application the following tools are needed:
-* .NET 6 SDK (https://dotnet.microsoft.com/download)
+* .NET 8 SDK (https://dotnet.microsoft.com/download)
 * Visual Studio 2022 (https://visualstudio.microsoft.com/downloads/)
 
 ## Testing the generated artifacts against the main solution
@@ -22,4 +22,4 @@ To build the application the following tools are needed:
 * run `Rebuild-Solution` or `initdev -NoCodegen`
 
 ## Known issues
-* must use Visual Studio 2022+ net6 is not compatible with Visual Studio 2019
+* must use Visual Studio 2022+ net8 is not compatible with Visual Studio 2019
diff --git a/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/EdFi.Ods.Extensions.ExtensionName.nuspec b/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/EdFi.Ods.Extensions.ExtensionName.nuspec
index c37b0c783e..ed86c035ef 100644
--- a/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/EdFi.Ods.Extensions.ExtensionName.nuspec
+++ b/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/EdFi.Ods.Extensions.ExtensionName.nuspec
@@ -14,6 +14,6 @@
     <file src="Artifacts/**/*.sql" target="."/>
     <file src="Artifacts/**/*.json" target="."/>
     <file src="assemblyMetadata.json" target="."/>
-    <file src="bin\$configuration$\net6.0\$safeprojectname$.dll" target="."/>
+    <file src="bin\$configuration$\net8.0\$safeprojectname$.dll" target="."/>
   </files>
 </package>