[ODS-6530] Switch Ubuntu builds back to Ubuntu latest (24.04) (#1183)

Ed-Fi-Alliance-OSS · Nov 11, 2024 · 35d01c4 · 35d01c4
1 parent f49da47
commit 35d01c4
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,8 +4,8 @@
     <id>EdFi.OdsApi.Sdk</id>
     <version>$version$</version>
     <title>EdFi.OdsApi.Sdk</title>
-    <authors>$authors$</authors>
-    <owners>$owners$</owners>
+    <authors>Ed-Fi Alliance</authors>
+    <owners>Ed-Fi Alliance</owners>
     <projectUrl>https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A pregenerated sdk for use with the Ed-Fi Ods Api.</description>

diff --git 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
@@ -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});"
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ env: @@
     jobs:
       build:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         steps:
         - name: Check for Azure token
@@ Expand Down @@