Merge branch 'main-6x' into ODS-6263

Ed-Fi-Alliance-OSS · Feb 23, 2024 · ce76549 · ce76549
2 parents 8207eb4 + 899d4d5
commit ce76549
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -14,12 +14,12 @@ 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
 * Run `initdev` on the main solution first
 * 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/...rojectTemplates/EdFi.ProjectTemplates.Extensions/EdFi.Ods.Extensions.ExtensionName.nuspec b/...rojectTemplates/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>