[ODS-6568] Revert changes done to remove mono in Ubuntu 24 runners (#…

…1189)
Ed-Fi-Alliance-OSS · Dec 3, 2024 · e94f447 · e94f447
1 parent 59c9de1
commit e94f447
Show file tree

Hide file tree

Showing 22 changed files with 116 additions and 27 deletions.
diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml
@@ -74,6 +74,10 @@ jobs:
             $PSVersionTable
             . $env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1
             Invoke-CodeGen -Engine PostgreSQL -RepositoryRoot $env:GITHUB_WORKSPACE/ -StandardVersion ${{ matrix.StandardVersion }} -ExtensionVersion ${{ matrix.ExtensionVersion }}
+      # This step shall be removed in ODS-6572
+      - name: Install Mono and Nuget
+        working-directory: ./Ed-Fi-ODS/.github/workflows
+        run: sudo ./install-mono.sh
       - name: Cache Nuget packages
         uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
         with:

diff --git a/.github/workflows/Lib edFi.admin.dataaccess.yml b/.github/workflows/Lib edFi.admin.dataaccess.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.common.yml b/.github/workflows/Lib edFi.common.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.loadtools.yml b/.github/workflows/Lib edFi.loadtools.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.ods.api.yml b/.github/workflows/Lib edFi.ods.api.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.ods.common.yml b/.github/workflows/Lib edFi.ods.common.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.ods.standard.yml b/.github/workflows/Lib edFi.ods.standard.yml
@@ -62,6 +62,10 @@ jobs:
       shell: pwsh
       run: |
         .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-ODS-Implementation"
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Lib edFi.security.dataaccess.yml b/.github/workflows/Lib edFi.security.dataaccess.yml
@@ -40,6 +40,10 @@ jobs:
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
       with:
         repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml
@@ -113,11 +113,13 @@ jobs:
         nuget pack $AdminBACPACNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
         nuget pack $AdminPostgreSQLNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}    
-      run: iex "& { $(irm https://aka.ms/install-artifacts-credprovider.ps1) } -AddNetfx"
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
+      working-directory: ./Ed-Fi-ODS/      
+      run: |      
+        .\build.githubactions.ps1 InstallCredentialHandler
       shell: powershell 
     - name: Publish Nuget package
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}    
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       working-directory: ./Ed-Fi-ODS/
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Admin.Standard.${{ matrix.StandardVersion }}"

diff --git a/.github/workflows/Pkg EdFi.Database.Security.yml b/.github/workflows/Pkg EdFi.Database.Security.yml
@@ -113,12 +113,14 @@ jobs:
         nuget pack $SecurityBACPACNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
         nuget pack $SecurityPostgreSQLNuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties "configuration=release" -Properties "authors=Ed-Fi Alliance" -Properties "owners=Ed-Fi Alliance" -Properties "copyright=Copyright © $(date +'%Y') Ed-Fi Alliance, LLC and Contributors" -NoPackageAnalysis -NoDefaultExcludes
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}    
-      run: iex "& { $(irm https://aka.ms/install-artifacts-credprovider.ps1) } -AddNetfx"
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
+      working-directory: ./Ed-Fi-ODS/      
+      run: |      
+        .\build.githubactions.ps1 InstallCredentialHandler
       shell: powershell 
     - name: Publish Nuget package
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}    
       working-directory: ./Ed-Fi-ODS/
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Security.Standard.${{ matrix.StandardVersion }}"
         .\build.githubactions.ps1 publish -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -NuGetApiKey ${{ env.AZURE_ARTIFACT_NUGET_KEY }} -EdFiNuGetFeed ${{env.AZURE_ARTIFACT_URL}} -PackageName  "EdFi.Database.Security.BACPAC.Standard.${{ matrix.StandardVersion }}"

diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml
@@ -68,6 +68,10 @@ jobs:
       shell: pwsh
       run: |
         .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-Extensions"
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages   
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
@@ -105,6 +105,10 @@ jobs:
         sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         sudo apt-get update
         sudo apt-get -y install postgresql-client-16
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml
@@ -125,6 +125,10 @@ jobs:
         sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         sudo apt-get update
         sudo apt-get -y install postgresql-client-16
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml
@@ -124,6 +124,10 @@ jobs:
                 echo "BUILD_INCREMENTER=$newRevision">> $env:GITHUB_ENV
             }
       shell: pwsh
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml
@@ -110,6 +110,10 @@ jobs:
                 echo "BUILD_INCREMENTER=$newRevision">> $env:GITHUB_ENV
             }
       shell: pwsh
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml
@@ -104,6 +104,10 @@ jobs:
         sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         sudo apt-get update
         sudo apt-get -y install postgresql-client-16
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages       
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml
@@ -125,6 +125,10 @@ jobs:
         sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
         sudo apt-get update
         sudo apt-get -y install postgresql-client-16
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml
@@ -124,6 +124,10 @@ jobs:
                 echo "BUILD_INCREMENTER=$newRevision">> $env:GITHUB_ENV
             }
       shell: pwsh
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml
@@ -102,6 +102,10 @@ jobs:
       shell: pwsh
       run: |
         .\build.githubactions.ps1 CheckoutBranch -RelativeRepoPath "../Ed-Fi-ODS-Implementation"
+    # This step shall be removed in ODS-6572
+    - name: Install Mono and Nuget
+      working-directory: ./Ed-Fi-ODS/.github/workflows
+      run: sudo ./install-mono.sh
     - name: Cache Nuget packages
       uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
       with:

diff --git a/.github/workflows/install-mono.sh b/.github/workflows/install-mono.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+# SPDX-License-Identifier: Apache-2.0
+# Licensed to the Ed-Fi Alliance under one or more agreements.
+# The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+# See the LICENSE and NOTICES files in the project root for more information.
+
+# Sourced and adapted from: 
+# https://github.com/actions/runner-images/blob/main/images/ubuntu/scripts/build/install-mono.sh
+
+# This script shall be removed in ODS-6572
+
+REPO_URL="https://download.mono-project.com/repo/ubuntu"
+GPG_KEY="/usr/share/keyrings/mono-official-stable.gpg"
+REPO_PATH="/etc/apt/sources.list.d/mono-official-stable.list"
+
+# There are no packages for Ubuntu 22 and 24 in the repo, but developers confirmed that packages from Ubuntu 20 should work
+os_label="focal"
+
+# Install Mono repo
+curl -fsSL https://download.mono-project.com/repo/xamarin.gpg | gpg --dearmor -o $GPG_KEY
+echo "deb [signed-by=$GPG_KEY] $REPO_URL stable-$os_label main" > $REPO_PATH
+
+# Install Mono
+apt-get update
+apt-get install --no-install-recommends apt-transport-https mono-complete nuget
+
+# Remove Mono's apt repo
+rm $REPO_PATH
+rm -f "${REPO_PATH}.save"
+rm $GPG_KEY
+
+# Document source repo
+echo "mono https://download.mono-project.com/repo/ubuntu stable-$os_label main" >> $HELPER_SCRIPTS/apt-sources.txt
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>Ed-Fi Alliance</authors>
-    <owners>Ed-Fi Alliance</owners>
+    <authors>$authors$</authors>
+    <owners>$owners$</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
@@ -161,24 +161,7 @@ function Pack {
         $xml.package.metadata.id = $PackageName
         $xml.package.metadata.description = $PackageName
         $xml.Save($NuspecFilePath)
-
-        if (Get-IsWindows){
-            nuget pack $NuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties configuration=$Configuration -Properties copyright=$Copyright  -NoPackageAnalysis -NoDefaultExcludes
-        }
-        else{
-            $params = @{
-                PackageDefinitionFile = $NuspecFilePath
-                Version               = $version
-                PackageId             = $PackageName
-                OutputDirectory       = $packageOutput
-                BuildConfiguration    = $Configuration
-                ProjectFile           = $ProjectFile
-            }
-
-            & "$PSScriptRoot/../Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1"
-
-            New-Package @params | Out-Host
-        }
+        nuget pack $NuspecFilePath -OutputDirectory $packageOutput -Version $version -Properties configuration=$Configuration -Properties copyright=$Copyright  -NoPackageAnalysis -NoDefaultExcludes
 
     }
     if ([string]::IsNullOrWhiteSpace($NuspecFilePath) -and $null -ne $PackageName){
@@ -466,4 +449,4 @@ Invoke-Main {
         TriggerImplementationRepositoryWorkflows { TriggerImplementationRepositoryWorkflows }
         default { throw "Command '$Command' is not recognized" }
     }
-}
+}