diff --git a/.github/workflows/Cleanup Caches by a branch.yml b/.github/workflows/Cleanup Caches by a branch.yml index a169a1dafa..5e96588f6d 100644 --- a/.github/workflows/Cleanup Caches by a branch.yml +++ b/.github/workflows/Cleanup Caches by a branch.yml @@ -17,7 +17,7 @@ env: jobs: cleanup: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Repo Dispatch Token if: ${{ env.REPOSITORY_OWNER == 'Ed-Fi-Alliance-OSS' && env.GH_TOKEN == '' }} diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml index 88e00e617a..9636f3b1d0 100644 --- a/.github/workflows/CodeQL Security Scan.yml +++ b/.github/workflows/CodeQL Security Scan.yml @@ -28,7 +28,7 @@ jobs: analyze: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml index 4bf33faa1b..02932b1581 100644 --- a/.github/workflows/Dependencies Security Scan.yml +++ b/.github/workflows/Dependencies Security Scan.yml @@ -27,7 +27,7 @@ jobs: analyze-code: name: Analyze Code Dependencies - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/Find Standard and Extension Versions.yml b/.github/workflows/Find Standard and Extension Versions.yml index b3b96471d4..ff93a4a77e 100644 --- a/.github/workflows/Find Standard and Extension Versions.yml +++ b/.github/workflows/Find Standard and Extension Versions.yml @@ -31,7 +31,7 @@ env: jobs: FindStandardAndExtensionVersions: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: StandardVersions: ${{ steps.Set_StandardVersions.outputs.StandardVersions }} ExtensionVersions: ${{ steps.Set_ExtensionVersions.outputs.ExtensionVersions }} diff --git a/.github/workflows/Lib edFi.admin.dataaccess.yml b/.github/workflows/Lib edFi.admin.dataaccess.yml index 50bb6e2c7b..6300584727 100644 --- a/.github/workflows/Lib edFi.admin.dataaccess.yml +++ b/.github/workflows/Lib edFi.admin.dataaccess.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Lib edFi.common.yml b/.github/workflows/Lib edFi.common.yml index d19e464aac..d2345bf44c 100644 --- a/.github/workflows/Lib edFi.common.yml +++ b/.github/workflows/Lib edFi.common.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Lib edFi.loadtools.yml b/.github/workflows/Lib edFi.loadtools.yml index b5562c8520..964332de7a 100644 --- a/.github/workflows/Lib edFi.loadtools.yml +++ b/.github/workflows/Lib edFi.loadtools.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Lib edFi.ods.api.yml b/.github/workflows/Lib edFi.ods.api.yml index 927ce378b9..274494620f 100644 --- a/.github/workflows/Lib edFi.ods.api.yml +++ b/.github/workflows/Lib edFi.ods.api.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Lib edFi.ods.common.yml b/.github/workflows/Lib edFi.ods.common.yml index 947cab26e3..8afea64111 100644 --- a/.github/workflows/Lib edFi.ods.common.yml +++ b/.github/workflows/Lib edFi.ods.common.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Lib edFi.ods.standard.yml b/.github/workflows/Lib edFi.ods.standard.yml index af440f1cd5..dc956263b1 100644 --- a/.github/workflows/Lib edFi.ods.standard.yml +++ b/.github/workflows/Lib edFi.ods.standard.yml @@ -35,7 +35,7 @@ jobs: calling_branch: ${{ github.head_ref || github.ref_name }} build: needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Lib edFi.security.dataaccess.yml b/.github/workflows/Lib edFi.security.dataaccess.yml index 707c16a596..f3fd5fb26c 100644 --- a/.github/workflows/Lib edFi.security.dataaccess.yml +++ b/.github/workflows/Lib edFi.security.dataaccess.yml @@ -28,7 +28,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Azure token diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml index bcad02ed66..aa8d5563e4 100644 --- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml +++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml @@ -33,7 +33,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: echo distinct ID ${{ github.event.inputs.distinct_id }} diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml index 60b0c53bad..4c16308cb0 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml @@ -39,7 +39,7 @@ jobs: build: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml index b41957de68..caddcdc7c0 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml @@ -39,7 +39,7 @@ jobs: build: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml index ded5cd3b95..93bdbdc297 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml @@ -57,7 +57,7 @@ jobs: --health-retries 3 --name mssql --user root - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml index 31425e1534..f82eebe49f 100644 --- a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml @@ -38,7 +38,7 @@ jobs: calling_branch: ${{ github.head_ref || github.ref_name }} build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{ always() }} needs: FindStandardAndExtensionVersions services: diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml index 05e957c772..ff45fe86b7 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml @@ -39,7 +39,7 @@ jobs: build: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml index a443e945af..3794fbe1ed 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml @@ -39,7 +39,7 @@ jobs: build: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml index 66f1f15948..d0b3b47d1f 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml @@ -57,7 +57,7 @@ jobs: --health-retries 3 --name mssql --user root - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: StandardVersion: ${{ fromJson(needs.FindStandardAndExtensionVersions.outputs.StandardVersions) }} diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml index 59b9955452..990cd2b4fb 100644 --- a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml +++ b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml @@ -40,7 +40,7 @@ jobs: build: if: ${{ always() }} needs: FindStandardAndExtensionVersions - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 services: mssql: image: mcr.microsoft.com/mssql/server:2019-latest diff --git a/.github/workflows/Scorecard supply-chain security.yml b/.github/workflows/Scorecard supply-chain security.yml index 0286fcb80e..8d622fa113 100644 --- a/.github/workflows/Scorecard supply-chain security.yml +++ b/.github/workflows/Scorecard supply-chain security.yml @@ -14,7 +14,7 @@ permissions: read-all jobs: analysis: name: Scorecard analysis - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: # Needed to upload the results to code-scanning dashboard. security-events: write diff --git a/.github/workflows/Security Vulnerability Check on Release Tags.yml b/.github/workflows/Security Vulnerability Check on Release Tags.yml index 28e4d675ab..17c46cf486 100644 --- a/.github/workflows/Security Vulnerability Check on Release Tags.yml +++ b/.github/workflows/Security Vulnerability Check on Release Tags.yml @@ -14,7 +14,7 @@ permissions: read-all jobs: Security-Vulnerability-Check-Each-Release-Tag: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/Trgr InitDev workflows in Implementation repo.yml b/.github/workflows/Trgr InitDev workflows in Implementation repo.yml index 042f0e0008..e87cd6b1bc 100644 --- a/.github/workflows/Trgr InitDev workflows in Implementation repo.yml +++ b/.github/workflows/Trgr InitDev workflows in Implementation repo.yml @@ -22,7 +22,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check for Repo Dispatch Token diff --git a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec index 6ee7993f87..786f16f0fa 100644 --- a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec +++ b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec @@ -4,8 +4,8 @@ EdFi.OdsApi.Sdk $version$ EdFi.OdsApi.Sdk - $authors$ - $owners$ + Ed-Fi Alliance + Ed-Fi Alliance https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS false A pregenerated sdk for use with the Ed-Fi Ods Api. diff --git a/build.githubactions.ps1 b/build.githubactions.ps1 index 5cc7b06347..34af70fd36 100644 --- a/build.githubactions.ps1 +++ b/build.githubactions.ps1 @@ -153,7 +153,17 @@ function Pack { } } if ($NuspecFilePath -Like "*.nuspec" -and $null -ne $PackageName){ - nuget pack $NuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties configuration=$Configuration -Properties id=$PackageName -NoPackageAnalysis -NoDefaultExcludes + $params = @{ + PackageDefinitionFile = $NuspecFilePath + Version = $version + PackageId = $PackageName + OutputDirectory = $packageOutput + BuildConfiguration = $Configuration + } + + & "$PSScriptRoot/../Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1" + + New-Package @params | Out-Host } if ([string]::IsNullOrWhiteSpace($NuspecFilePath) -and $null -ne $PackageName){ Invoke-Execute { diff --git a/tests/EdFi.Ods.Api.IntegrationTests/EducationOrganizationTestDataBuilder.cs b/tests/EdFi.Ods.Api.IntegrationTests/EducationOrganizationTestDataBuilder.cs index 67d5b8ab7f..6976b16fb0 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/EducationOrganizationTestDataBuilder.cs +++ b/tests/EdFi.Ods.Api.IntegrationTests/EducationOrganizationTestDataBuilder.cs @@ -80,7 +80,7 @@ public EducationOrganizationTestDataBuilder AddStaffEducationOrganizationEmploym {schoolId}, {staffUSI}, {TestEmploymentStatusDescriptorId}, - '{ entryDate }');" + '{ entryDate?.Date.ToShortDateString() }');" ); @@ -105,7 +105,7 @@ public EducationOrganizationTestDataBuilder AddStaffEducationOrganizationAssignm {schoolId}, {staffUSI}, {TestStaffClassificationDescriptorId}, - '{ entryDate }');" + '{ entryDate?.Date.ToShortDateString() }');" ); return this; @@ -122,7 +122,7 @@ public EducationOrganizationTestDataBuilder AddStaff(string newGuidId) VALUES ( '{newGuidId}', '{newGuidId}', - '{ DateTime.Now }', + '{ DateTime.UtcNow.Date.ToShortDateString() }', '{newGuidId}');" ); return this; @@ -245,7 +245,7 @@ public EducationOrganizationTestDataBuilder AddStudent(string newGuidId) VALUES ( '{newGuidId}', '{newGuidId}', - '{DateTime.UtcNow.Date}', + '{DateTime.UtcNow.Date.ToShortDateString()}', '{newGuidId}');" ); @@ -268,7 +268,7 @@ public EducationOrganizationTestDataBuilder AddStudentSchoolAssociation(long sch VALUES ( {schoolId}, {studentUSI}, - '{entryDate}', + '{entryDate?.Date.ToShortDateString()}', {TestGradeLevelDescriptorId});" ); @@ -289,7 +289,7 @@ public EducationOrganizationTestDataBuilder AddStudentEducationOrganizationRespo StudentUSI, ResponsibilityDescriptorId) VALUES ( - '{entryDate}', + '{entryDate?.Date.ToShortDateString()}', {schoolId}, {studentUSI}, {TestResponsibilityDescriptorId});"