From cc15567555316fa0791fdf8d7ecfc7e4fe96868a Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Thu, 31 Aug 2023 16:41:08 -0300 Subject: [PATCH 01/22] Update checkout actions. Remove duplicate pkg references workaround (solved upstream). Update tpdm default version. --- .github/workflows/test-nuget-package.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index f705570..c4fd2ab 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -18,7 +18,7 @@ on: description: "Ed-Fi-ODS-Implementation-ref: checks out the specified branch/tag of the Ed-Fi-ODS-Implementation repo. Default branch if not specified." env: - tpdm_version: "1.1.0" + tpdm_version: "1.2.0" ods_ref: "" ods_ref_implementation: "" @@ -52,14 +52,14 @@ jobs: - name: Ed-Fi-ODS - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS ref: ${{ env.ods_ref }} path: Ed-Fi-ODS - name: Ed-Fi-ODS-Implementation - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation ref: ${{ env.ods_ref_implementation }} @@ -67,19 +67,11 @@ jobs: - name: Ed-Fi-Extension - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Workaround for duplicake package references in EdFi.Ods.Sandbox.csproj - run: | - $f = Get-Content .\EdFi.Ods.Sandbox.csproj -Raw - $first_part = $f | Select-String -Pattern '(?s)^.*?(?=\ .\EdFi.Ods.Sandbox.csproj - working-directory: Ed-Fi-ODS\Application\EdFi.Ods.Sandbox - + - name: Download TPDM-Community-Extension Artifact uses: dawidd6/action-download-artifact@1cf11afe3f1874cee82a8d5a2b45c0fd63f0fa22 with: From c56f565c7c89d5fd22b660c171567e28596f1c80 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Thu, 31 Aug 2023 17:44:07 -0300 Subject: [PATCH 02/22] Fixed configuration.packages.json regex. --- .github/workflows/test-nuget-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index c4fd2ab..15ba5ec 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -7,7 +7,7 @@ on: tpdm_version: type: string required: false - description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.1.0" + description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.2.0" Ed-Fi-ODS-ref: type: string required: false @@ -88,8 +88,8 @@ jobs: run: | $PackageSource = ('${{ github.workspace }}' -Replace '\\', '/') + '/Artifact/NugetPackages/"' (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(?<="tpdm")(.*?)\d(.*?)Core\.(\d+.\d+\.\d+)(.*?)\d+.\d+\.\d+(.*?)https.*?(")' ` - , "`${1}3`$2Community.${{ env.tpdm_version }}`${5}$PackageSource" ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion}).*?(PackageSource\"\:.*?\},)' ` + , "`${1}.Community.`$2`",`"PackageSource`":`"$PackageSource`"}," ` | Out-File configuration.packages.json (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: Ed-Fi-ODS-Implementation From e8201232d093cd823dda4fc7177afa9d1f3d486e Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Thu, 31 Aug 2023 17:59:01 -0300 Subject: [PATCH 03/22] Use correct bidi scanner branch --- .github/workflows/test-nuget-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index 15ba5ec..d17f2c9 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -24,7 +24,7 @@ env: jobs: ed-fi-repository-scanner: - uses: ed-fi-alliance-oss/ed-fi-actions/.github/workflows/repository-scanner.yml@latest + uses: ed-fi-alliance-oss/ed-fi-actions/.github/workflows/repository-scanner.yml@main with: config-file-path: ./.github/workflows/bidi-scanner/config.json @@ -89,7 +89,7 @@ jobs: $PackageSource = ('${{ github.workspace }}' -Replace '\\', '/') + '/Artifact/NugetPackages/"' (Get-Content configuration.packages.json -Raw) ` -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion}).*?(PackageSource\"\:.*?\},)' ` - , "`${1}.Community.`$2`",`"PackageSource`":`"$PackageSource`"}," ` + , "`${1}.Community.`$2`",`"PackageSource`":`"$PackageSource}," ` | Out-File configuration.packages.json (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: Ed-Fi-ODS-Implementation From 51d8d2fd29cb725ad2b6a43eaa93eaa108591d8a Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Thu, 31 Aug 2023 18:24:53 -0300 Subject: [PATCH 04/22] Use extensionVersion in Initialize-DevelopmentEnvironment --- .github/workflows/test-nuget-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index d17f2c9..b0edfe7 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -118,7 +118,7 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion ${{ env.tpdm_version }} working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template From 288dbf3b1cd3cea98578dd93b30b003ae7a1d4db Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Thu, 31 Aug 2023 18:41:35 -0300 Subject: [PATCH 05/22] Fix version in template. --- .github/workflows/test-nuget-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index b0edfe7..181f129 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -101,8 +101,8 @@ jobs: - name: Replace package name in create script run: | - (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` - -replace 'EdFi.Ods.Populated.Template.TPDM.Core', 'EdFi.Ods.Populated.Template.TPDM.Community' ` | + ((Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` + -replace 'Core', 'Community') -replace "1.1.0", "${{ env.tpdm_version }}" ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 - name: Install SQL Server @@ -118,7 +118,7 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion ${{ env.tpdm_version }} + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template From aca1288a5b0d35662a059bdb4c53dcac69d79acf Mon Sep 17 00:00:00 2001 From: phollox Date: Tue, 5 Sep 2023 17:20:09 -0300 Subject: [PATCH 06/22] Update test-nuget-package.yml --- .github/workflows/test-nuget-package.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index 181f129..d8c6e83 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -75,7 +75,7 @@ jobs: - name: Download TPDM-Community-Extension Artifact uses: dawidd6/action-download-artifact@1cf11afe3f1874cee82a8d5a2b45c0fd63f0fa22 with: - workflow: build-nuget-package.yml + workflow: "Pkg EdFi.Ods.Extensions.TPDM.yml" repo: Ed-Fi-Exchange-OSS/TPDM-Community-Extension path: Artifact @@ -93,16 +93,19 @@ jobs: | Out-File configuration.packages.json (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: Ed-Fi-ODS-Implementation - - - - name: Workaround for file copy + + - name: Add tpdm_version to valid set run: | - (get-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 -Raw).replace('-Destination "$directory\$xmlFile"', '-Destination "$directory\$($xmlFile.Name)"').replace('-Destination "$directory\$xsdFile"', '-Destination "$directory\$($xsdFile.Name)"') | set-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 - + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` + -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | + Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls '"ExtensionVersion"' -Context 0,3 + working-directory: Ed-Fi-ODS-Implementation + - name: Replace package name in create script run: | ((Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` - -replace 'Core', 'Community') -replace "1.1.0", "${{ env.tpdm_version }}" ` | + -replace 'Core', 'Community') -replace "(extensionVersion\s+\=\s+\').*?(\')", '${1}${{ env.tpdm_version }}$2' ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 - name: Install SQL Server @@ -118,11 +121,11 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template run: | Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-template.psm1 - Initialize-TPDMTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" + Initialize-TPDMTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-TPDM-Extension From 778abebf6b15e95d61e849e36f7df52198a12987 Mon Sep 17 00:00:00 2001 From: phollox Date: Tue, 5 Sep 2023 18:07:39 -0300 Subject: [PATCH 07/22] Update test-nuget-package.yml --- .github/workflows/test-nuget-package.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index d8c6e83..0695030 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -1,7 +1,6 @@ name: Test Community Extension package (unpublished) on: - workflow_dispatch: inputs: tpdm_version: @@ -49,7 +48,6 @@ jobs: - name: Git long filename support run: git config --system core.longpaths true - - name: Ed-Fi-ODS uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c @@ -65,13 +63,11 @@ jobs: ref: ${{ env.ods_ref_implementation }} path: Ed-Fi-ODS-Implementation - - name: Ed-Fi-Extension uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Download TPDM-Community-Extension Artifact uses: dawidd6/action-download-artifact@1cf11afe3f1874cee82a8d5a2b45c0fd63f0fa22 with: @@ -99,7 +95,7 @@ jobs: (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 - (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls '"ExtensionVersion"' -Context 0,3 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 3,3 working-directory: Ed-Fi-ODS-Implementation - name: Replace package name in create script @@ -107,6 +103,7 @@ jobs: ((Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` -replace 'Core', 'Community') -replace "(extensionVersion\s+\=\s+\').*?(\')", '${1}${{ env.tpdm_version }}$2' ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 | sls 'ExtensionVersion' -Context 0,3 - name: Install SQL Server run: choco install sql-server-2019 --no-progress --params="'/IgnorePendingReboot'" From c25b5779ca17b4ebe5afceaddaa9d00d5d92411b Mon Sep 17 00:00:00 2001 From: phollox Date: Tue, 5 Sep 2023 18:15:36 -0300 Subject: [PATCH 08/22] Update test-nuget-package.yml --- .github/workflows/test-nuget-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index 0695030..6a2f9f9 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.github/workflows/test-nuget-package.yml @@ -95,7 +95,7 @@ jobs: (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 - (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 3,3 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 1,0 working-directory: Ed-Fi-ODS-Implementation - name: Replace package name in create script @@ -103,7 +103,7 @@ jobs: ((Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` -replace 'Core', 'Community') -replace "(extensionVersion\s+\=\s+\').*?(\')", '${1}${{ env.tpdm_version }}$2' ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 - (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 | sls 'ExtensionVersion' -Context 0,3 + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) | sls 'ExtensionVersion' -Context 0,3 - name: Install SQL Server run: choco install sql-server-2019 --no-progress --params="'/IgnorePendingReboot'" From 8439aaf49a2e26bd31989e51e1cc35b3dd7d7644 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 13:29:24 -0300 Subject: [PATCH 09/22] Update minimal template --- .../build-minimal-template-sqlServer.yml | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 8436e3d..fadc936 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -56,45 +56,40 @@ jobs: git config --system core.longpaths true - name: Ed-Fi-ODS - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS ref: ${{ env.ods_ref }} path: Ed-Fi-ODS - name: Ed-Fi-ODS-Implementation - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation ref: ${{ env.ods_ref_implementation }} path: Ed-Fi-ODS-Implementation - name: Ed-Fi-Extension - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Workaround for duplicate package references in EdFi.Ods.Sandbox.csproj - run: | - $f = Get-Content .\EdFi.Ods.Sandbox.csproj -Raw - $first_part = $f | Select-String -Pattern '(?s)^.*?(?=\ .\EdFi.Ods.Sandbox.csproj - working-directory: Ed-Fi-ODS\Application\EdFi.Ods.Sandbox - - - name: Workaround for file copy - run: | - (get-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 -Raw).replace('-Destination "$directory\$xmlFile"', '-Destination "$directory\$($xmlFile.Name)"').replace('-Destination "$directory\$xsdFile"', '-Destination "$directory\$($xsdFile.Name)"') | set-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 - - name: Replace package name and version in packages config run: | (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(?<="tpdm")(.*?)\d(.*?)Core\.(\d+.\d+\.\d+)(.*?)\d+.\d+\.\d+' ` - , '${1}3$2Community.${{ env.tpdm_version }}${4}${{ env.tpdm_package_version }}' ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})' ` + , '`${1}.Community.`$2' ` | Out-File configuration.packages.json working-directory: ./Ed-Fi-ODS-Implementation + - name: Add tpdm_version to valid set + run: | + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` + -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | + Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 1,0 + working-directory: Ed-Fi-ODS-Implementation + - name: Replace package name in create script run: | (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) ` @@ -114,13 +109,13 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template run: | Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 - Initialize-TPDMMinimalTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" + Initialize-TPDMMinimalTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-TPDM-Extension - name: Pack From 9f1f50f90dedec17bd1381e7504caa676956ec1c Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 13:56:29 -0300 Subject: [PATCH 10/22] Update minimal template --- .../workflows/build-minimal-template-sqlServer.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index fadc936..613bb4f 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -6,11 +6,11 @@ on: ODS_version: type: string required: false - description: "ODS_version: Ed-Fi ODS/API version. Default: 6.1" + description: "ODS_version: Ed-Fi ODS/API version. Default: 7.0" tpdm_version: type: string required: false - description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.1.0" + description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.2.0" Ed-Fi-ODS-ref: type: string required: false @@ -21,9 +21,9 @@ on: description: "Ed-Fi-ODS-Implementation-ref: checks out the specified branch/tag of the Ed-Fi-ODS-Implementation repo. Default branch if not specified." env: - tpdm_version: "1.1.0" + tpdm_version: "1.2.0" version_suite: "3" - ODS_version: "6.1" + ODS_version: "7.0" ods_ref: "" ods_ref_implementation: "" @@ -78,7 +78,7 @@ jobs: run: | (Get-Content configuration.packages.json -Raw) ` -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})' ` - , '`${1}.Community.`$2' ` + , '${1}.Community.$2' ` | Out-File configuration.packages.json working-directory: ./Ed-Fi-ODS-Implementation @@ -95,6 +95,7 @@ jobs: (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) ` -replace 'Core', 'Community' ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1 + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) | sls 'ExtensionVersion' -Context 0,3 - name: Install SQL Server run: choco install sql-server-2019 --no-progress --params="'/IgnorePendingReboot'" From ada30d63e92f1663af1701bc98b30690c43826d8 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 14:19:28 -0300 Subject: [PATCH 11/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 613bb4f..0407a95 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -77,9 +77,10 @@ jobs: - name: Replace package name and version in packages config run: | (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})' ` - , '${1}.Community.$2' ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})(.*?)(PackageVersion\"\:\s+\").*?(\"\,)' ` + , '${1}.Community.$2$3$4latest$5' ` | Out-File configuration.packages.json + (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: ./Ed-Fi-ODS-Implementation - name: Add tpdm_version to valid set From 3a7baf3c8814f5b8b29f685a885a4d35c67a13e4 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 15:03:51 -0300 Subject: [PATCH 12/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 0407a95..c5a93ec 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -78,7 +78,7 @@ jobs: run: | (Get-Content configuration.packages.json -Raw) ` -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})(.*?)(PackageVersion\"\:\s+\").*?(\"\,)' ` - , '${1}.Community.$2$3$4latest$5' ` + , '${1}.Community.$2$5' ` | Out-File configuration.packages.json (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: ./Ed-Fi-ODS-Implementation From 49ba2bdeb47609c24faf76850643e3586ded428b Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 15:29:19 -0300 Subject: [PATCH 13/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index c5a93ec..3584648 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -117,7 +117,7 @@ jobs: - name: Create Database Template run: | Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 - Initialize-TPDMMinimalTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" + Initialize-TPDMMinimalTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-TPDM-Extension - name: Pack From 350fb5294248983ef7fd13c8f3c692904ba7fe7c Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 16:15:39 -0300 Subject: [PATCH 14/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 3584648..759a583 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -24,6 +24,7 @@ env: tpdm_version: "1.2.0" version_suite: "3" ODS_version: "7.0" + data_standard: "5.0.0" ods_ref: "" ods_ref_implementation: "" @@ -122,15 +123,15 @@ jobs: - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` -Properties authors="Ed-Fi Alliance" ` -Properties owners="Ed-Fi Alliance" ` -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}" ` - -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` -Properties description="EdFi Ods Minimal Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension From ce7b07462c34630481a075b72ff77a573825507c Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 16:16:18 -0300 Subject: [PATCH 15/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 759a583..7396045 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -112,7 +112,7 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" + #Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template From 8e65191f6ae049c978028516ea0348fbdb6e03af Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 16:25:10 -0300 Subject: [PATCH 16/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 7396045..759a583 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -112,7 +112,7 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - #Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template From 13a74f1ef3f7b49c30b71ff4436e1bbc6ed7a696 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 16:45:48 -0300 Subject: [PATCH 17/22] Update minimal template --- .github/workflows/build-minimal-template-sqlServer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-minimal-template-sqlServer.yml b/.github/workflows/build-minimal-template-sqlServer.yml index 759a583..3c88029 100644 --- a/.github/workflows/build-minimal-template-sqlServer.yml +++ b/.github/workflows/build-minimal-template-sqlServer.yml @@ -143,5 +143,5 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.${{ env.version_core }}.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg path: NugetPackages\*.nupkg From d5639a410c32ef0461f8ffe18122e42263331590 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 16:50:56 -0300 Subject: [PATCH 18/22] Update populated template --- .../build-populated-template-sqlServer.yml | 87 +++++++++---------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build-populated-template-sqlServer.yml b/.github/workflows/build-populated-template-sqlServer.yml index fd4f8f8..f12c707 100644 --- a/.github/workflows/build-populated-template-sqlServer.yml +++ b/.github/workflows/build-populated-template-sqlServer.yml @@ -2,15 +2,15 @@ name: build TPDM Populated Template sqlServer on: workflow_dispatch: - inputs: + inputs: ODS_version: type: string required: false - description: "ODS_version: Ed-Fi ODS/API version. Default: 6.1" + description: "ODS_version: Ed-Fi ODS/API version. Default: 7.0" tpdm_version: type: string required: false - description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.1.0" + description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.2.0" Ed-Fi-ODS-ref: type: string required: false @@ -21,14 +21,14 @@ on: description: "Ed-Fi-ODS-Implementation-ref: checks out the specified branch/tag of the Ed-Fi-ODS-Implementation repo. Default branch if not specified." env: - tpdm_version: "1.1.0" + tpdm_version: "1.2.0" + version_suite: "3" + ODS_version: "7.0" + data_standard: "5.0.0" ods_ref: "" ods_ref_implementation: "" - ODS_version: "6.1" - version_suite: "3" - -jobs: +jobs: build: runs-on: windows-latest @@ -53,58 +53,55 @@ jobs: echo "temp=${{ github.workspace }}\temp" >> $env:GITHUB_ENV - name: Git long filename support - run: git config --system core.longpaths true - + run: | + git config --system core.longpaths true - name: Ed-Fi-ODS - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS ref: ${{ env.ods_ref }} path: Ed-Fi-ODS - name: Ed-Fi-ODS-Implementation - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation ref: ${{ env.ods_ref_implementation }} path: Ed-Fi-ODS-Implementation - name: Ed-Fi-Extension - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Workaround for duplicate package references in EdFi.Ods.Sandbox.csproj - run: | - $f = Get-Content .\EdFi.Ods.Sandbox.csproj -Raw - $first_part = $f | Select-String -Pattern '(?s)^.*?(?=\ .\EdFi.Ods.Sandbox.csproj - working-directory: Ed-Fi-ODS\Application\EdFi.Ods.Sandbox - - - name: Workaround for file copy - run: | - (get-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 -Raw).replace('-Destination "$directory\$xmlFile"', '-Destination "$directory\$($xmlFile.Name)"').replace('-Destination "$directory\$xsdFile"', '-Destination "$directory\$($xsdFile.Name)"') | set-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 - - name: Replace package name and version in packages config run: | (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(?<="tpdm")(.*?)\d(.*?)Core\.(\d+.\d+\.\d+)(.*?)\d+.\d+\.\d+' ` - , '${1}3$2Community.${{ env.tpdm_version }}${4}${{ env.tpdm_package_version }}' ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})(.*?)(PackageVersion\"\:\s+\").*?(\"\,)' ` + , '${1}.Community.$2$5' ` | Out-File configuration.packages.json + (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: ./Ed-Fi-ODS-Implementation + + - name: Add tpdm_version to valid set + run: | + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` + -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | + Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 1,0 + working-directory: Ed-Fi-ODS-Implementation - name: Replace package name in create script run: | (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` -replace 'Core', 'Community' ` | Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 - + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) | sls 'ExtensionVersion' -Context 0,3 + - name: Install SQL Server run: choco install sql-server-2019 --no-progress --params="'/IgnorePendingReboot'" - + - name: Remove Ed-Fi Databases run: | $ErrorActionPreference = 'Stop' @@ -115,36 +112,36 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template run: | - Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-template.psm1 - Initialize-TPDMTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" + Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 + Initialize-TPDMTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-TPDM-Extension - + - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` - -Properties "authors=Ed-Fi Alliance" ` - -Properties "owners=Ed-Fi Alliance" ` - -Properties "copyright=Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id=EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }} ` - -Properties title=EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }} ` - -Properties "description=EdFi Ods Populated Template TPDM Community Database" ` + -Properties authors="Ed-Fi Alliance" ` + -Properties owners="Ed-Fi Alliance" ` + -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties description="EdFi Ods Minimal Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension - + - name: Create temp folder for upload artifact action run: | mkdir temp - + - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.${{ env.version_core }}.nupkg - path: NugetPackages\*.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg + path: NugetPackages\*.nupkg From e4f06928464f6f5aa431f6671972b539a073d732 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 17:00:58 -0300 Subject: [PATCH 19/22] Update minimal template PostgreSQL --- .../build-minimal-template-postgreSQL.yml | 89 +++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build-minimal-template-postgreSQL.yml b/.github/workflows/build-minimal-template-postgreSQL.yml index 3d9ed47..93d7a55 100644 --- a/.github/workflows/build-minimal-template-postgreSQL.yml +++ b/.github/workflows/build-minimal-template-postgreSQL.yml @@ -6,11 +6,11 @@ on: ODS_version: type: string required: false - description: "ODS_version: Ed-Fi ODS/API version. Default: 6.1" + description: "ODS_version: Ed-Fi ODS/API version. Default: 7.0" tpdm_version: type: string required: false - description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.1.0" + description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.2.0" Ed-Fi-ODS-ref: type: string required: false @@ -21,13 +21,14 @@ on: description: "Ed-Fi-ODS-Implementation-ref: checks out the specified branch/tag of the Ed-Fi-ODS-Implementation repo. Default branch if not specified." env: - tpdm_version: "1.1.0" + tpdm_version: "1.2.0" + version_suite: "3" + ODS_version: "7.0" + data_standard: "5.0.0" ods_ref: "" ods_ref_implementation: "" - ODS_version: "6.1" - version_suite: "3" -jobs: +jobs: build: runs-on: windows-latest @@ -52,61 +53,57 @@ jobs: echo "temp=${{ github.workspace }}\temp" >> $env:GITHUB_ENV - name: Git long filename support - run: git config --system core.longpaths true - + run: | + git config --system core.longpaths true - name: Ed-Fi-ODS - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS ref: ${{ env.ods_ref }} path: Ed-Fi-ODS - name: Ed-Fi-ODS-Implementation - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation ref: ${{ env.ods_ref_implementation }} path: Ed-Fi-ODS-Implementation - name: Ed-Fi-Extension - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Workaround for duplicate package references in EdFi.Ods.Sandbox.csproj - run: | - $f = Get-Content .\EdFi.Ods.Sandbox.csproj -Raw - $first_part = $f | Select-String -Pattern '(?s)^.*?(?=\ .\EdFi.Ods.Sandbox.csproj - working-directory: Ed-Fi-ODS\Application\EdFi.Ods.Sandbox - - - name: Workaround for file copy - run: | - (get-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 -Raw).replace('-Destination "$directory\$xmlFile"', '-Destination "$directory\$($xmlFile.Name)"').replace('-Destination "$directory\$xsdFile"', '-Destination "$directory\$($xsdFile.Name)"') | set-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 - - name: Replace package name and version in packages config run: | (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(?<="tpdm")(.*?)\d(.*?)Core\.(\d+.\d+\.\d+)(.*?)\d+.\d+\.\d+' ` - , '${1}3$2Community.${{ env.tpdm_version }}${4}${{ env.tpdm_package_version }}' ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})(.*?)(PackageVersion\"\:\s+\").*?(\"\,)' ` + , '${1}.Community.$2$5' ` | Out-File configuration.packages.json + (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: ./Ed-Fi-ODS-Implementation + + - name: Add tpdm_version to valid set + run: | + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` + -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | + Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 1,0 + working-directory: Ed-Fi-ODS-Implementation + - name: Replace package name in create script + run: | + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) ` + -replace 'Core', 'Community' ` | + Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1 + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) | sls 'ExtensionVersion' -Context 0,3 - name: Install PostgreSQL run: | choco install postgresql13 --no-progress Stop-Service postgresql* Set-Content -Path "C:\Program Files\PostgreSQL\13\data\pg_hba.conf" -Value 'host all all all trust' Start-Service postgresql-x64-13 - - - name: Replace package name in create script - run: | - (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1) ` - -replace 'Core', 'Community' ` | - Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-minimal-template.psm1 - name: Remove Ed-Fi Databases run: | @@ -118,36 +115,36 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -Engine PostgreSQL + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" -Engine PostgreSQL working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template run: | Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 - Initialize-TPDMMinimalTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" -Engine PostgreSQL + Initialize-TPDMMinimalTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" -Engine PostgreSQL working-directory: ./Ed-Fi-TPDM-Extension - + - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.PostgreSQL.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` - -Properties "authors=Ed-Fi Alliance" ` - -Properties "owners=Ed-Fi Alliance" ` - -Properties "copyright=Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id=EdFi.Suite3.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }} ` - -Properties title=EdFi.Suite3.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }} ` - -Properties "description=EdFi Ods Minimal Template TPDM Community Database for PostgreSQL" ` + -Properties authors="Ed-Fi Alliance" ` + -Properties owners="Ed-Fi Alliance" ` + -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties description="EdFi Ods Minimal Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension - + - name: Create temp folder for upload artifact action run: | mkdir temp - + - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite3.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.${{ env.version_core }}.nupkg - path: NugetPackages\*.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg + path: NugetPackages\*.nupkg From 54c92b892150fd13dd079ff68b34340668ae2889 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 17:05:43 -0300 Subject: [PATCH 20/22] Update populated template PostgreSQL --- .../build-populated-template-postgreSQL.yml | 93 +++++++++---------- 1 file changed, 45 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build-populated-template-postgreSQL.yml b/.github/workflows/build-populated-template-postgreSQL.yml index 0243935..d906a58 100644 --- a/.github/workflows/build-populated-template-postgreSQL.yml +++ b/.github/workflows/build-populated-template-postgreSQL.yml @@ -6,11 +6,11 @@ on: ODS_version: type: string required: false - description: "ODS_version: Ed-Fi ODS/API version. Default: 6.1" + description: "ODS_version: Ed-Fi ODS/API version. Default: 7.0" tpdm_version: type: string required: false - description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.1.0" + description: "tpdm_version: TPDM version as noted in the Community Extension built nuget package artifact. Default: 1.2.0" Ed-Fi-ODS-ref: type: string required: false @@ -21,13 +21,14 @@ on: description: "Ed-Fi-ODS-Implementation-ref: checks out the specified branch/tag of the Ed-Fi-ODS-Implementation repo. Default branch if not specified." env: - tpdm_version: "1.1.0" + tpdm_version: "1.2.0" + version_suite: "3" + ODS_version: "7.0" + data_standard: "5.0.0" ods_ref: "" ods_ref_implementation: "" - ODS_version: "6.1" - version_suite: "3" -jobs: +jobs: build: runs-on: windows-latest @@ -52,61 +53,57 @@ jobs: echo "temp=${{ github.workspace }}\temp" >> $env:GITHUB_ENV - name: Git long filename support - run: git config --system core.longpaths true - + run: | + git config --system core.longpaths true - name: Ed-Fi-ODS - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS ref: ${{ env.ods_ref }} path: Ed-Fi-ODS - name: Ed-Fi-ODS-Implementation - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: repository: Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Implementation ref: ${{ env.ods_ref_implementation }} path: Ed-Fi-ODS-Implementation - + - name: Ed-Fi-Extension - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: path: Ed-Fi-TPDM-Extension - - name: Workaround for duplicate package references in EdFi.Ods.Sandbox.csproj - run: | - $f = Get-Content .\EdFi.Ods.Sandbox.csproj -Raw - $first_part = $f | Select-String -Pattern '(?s)^.*?(?=\ .\EdFi.Ods.Sandbox.csproj - working-directory: Ed-Fi-ODS\Application\EdFi.Ods.Sandbox - - - name: Workaround for file copy - run: | - (get-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 -Raw).replace('-Destination "$directory\$xmlFile"', '-Destination "$directory\$($xmlFile.Name)"').replace('-Destination "$directory\$xsdFile"', '-Destination "$directory\$($xsdFile.Name)"') | set-content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-database-template.psm1 - - name: Replace package name and version in packages config run: | (Get-Content configuration.packages.json -Raw) ` - -replace '(?ism)(?<="tpdm")(.*?)\d(.*?)Core\.(\d+.\d+\.\d+)(.*?)\d+.\d+\.\d+' ` - , '${1}3$2Community.${{ env.tpdm_version }}${4}${{ env.tpdm_package_version }}' ` + -replace '(?ism)(EdFi\.Suite3\.Ods\.Extensions\.TPDM)\.Core\.({ExtensionVersion}\.Standard\.{StandardVersion})(.*?)(PackageVersion\"\:\s+\").*?(\"\,)' ` + , '${1}.Community.$2$5' ` | Out-File configuration.packages.json + (Get-Content configuration.packages.json) | sls '"tpdm"' -Context 0,3 working-directory: ./Ed-Fi-ODS-Implementation + + - name: Add tpdm_version to valid set + run: | + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 -Raw) ` + -replace "(ValidateSet\()(.*?)(\))", '${1}$2,''${{ env.tpdm_version }}''$3' ` | + Out-File .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1 + (Get-Content .\Application\SolutionScripts\InitializeDevelopmentEnvironment.psm1) | sls 'ExtensionVersion' -Context 1,0 + working-directory: Ed-Fi-ODS-Implementation + - name: Replace package name in create script + run: | + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` + -replace 'Core', 'Community' ` | + Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 + (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) | sls 'ExtensionVersion' -Context 0,3 - name: Install PostgreSQL run: | choco install postgresql13 --no-progress Stop-Service postgresql* Set-Content -Path "C:\Program Files\PostgreSQL\13\data\pg_hba.conf" -Value 'host all all all trust' Start-Service postgresql-x64-13 - - - name: Replace package name in create script - run: | - (Get-Content ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1) ` - -replace 'Core', 'Community' ` | - Out-File ./Ed-Fi-ODS-Implementation/DatabaseTemplate/Modules/create-tpdm-template.psm1 - name: Remove Ed-Fi Databases run: | @@ -118,36 +115,36 @@ jobs: run: | $ErrorActionPreference = 'Stop' ./Initialize-PowershellForDevelopment.ps1 - Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -Engine PostgreSQL + Initialize-DevelopmentEnvironment -UsePlugins -NoDeploy -ExtensionVersion "${{ env.tpdm_version }}" -Engine PostgreSQL working-directory: ./Ed-Fi-ODS-Implementation - name: Create Database Template run: | - Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-template.psm1 - Initialize-TPDMTemplate -samplePath "D:\a\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Community-Artifacts\Ed-Fi-TPDM-Extension\" -Engine PostgreSQL + Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 + Initialize-TPDMTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" -Engine PostgreSQL working-directory: ./Ed-Fi-TPDM-Extension - + - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.PostgreSQL.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` - -Properties "authors=Ed-Fi Alliance" ` - -Properties "owners=Ed-Fi Alliance" ` - -Properties "copyright=Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id=EdFi.Suite3.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }} ` - -Properties title=EdFi.Suite3.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }} ` - -Properties "description=EdFi Ods Populated Template TPDM Community Database for PostgreSQL" ` + -Properties authors="Ed-Fi Alliance" ` + -Properties owners="Ed-Fi Alliance" ` + -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties description="EdFi Ods Populated Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension - + - name: Create temp folder for upload artifact action run: | mkdir temp - + - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite3.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.${{ env.version_core }}.nupkg - path: NugetPackages\*.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg + path: NugetPackages\*.nupkg From dbf97789ec85e8c08e215abc97bd128bfde568b9 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 17:08:25 -0300 Subject: [PATCH 21/22] fix import module for populated templates --- .github/workflows/build-populated-template-postgreSQL.yml | 2 +- .github/workflows/build-populated-template-sqlServer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-populated-template-postgreSQL.yml b/.github/workflows/build-populated-template-postgreSQL.yml index d906a58..5b5c338 100644 --- a/.github/workflows/build-populated-template-postgreSQL.yml +++ b/.github/workflows/build-populated-template-postgreSQL.yml @@ -120,7 +120,7 @@ jobs: - name: Create Database Template run: | - Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 + Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-template.psm1 Initialize-TPDMTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" -Engine PostgreSQL working-directory: ./Ed-Fi-TPDM-Extension diff --git a/.github/workflows/build-populated-template-sqlServer.yml b/.github/workflows/build-populated-template-sqlServer.yml index f12c707..7654b54 100644 --- a/.github/workflows/build-populated-template-sqlServer.yml +++ b/.github/workflows/build-populated-template-sqlServer.yml @@ -117,7 +117,7 @@ jobs: - name: Create Database Template run: | - Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-minimal-template.psm1 + Import-Module -Force -Scope Global ${{ github.workspace }}\Ed-Fi-ODS-Implementation\DatabaseTemplate\Modules\create-tpdm-template.psm1 Initialize-TPDMTemplate -samplePath "${{ github.workspace }}\Ed-Fi-TPDM-Extension\" -ExtensionVersion "${{ env.tpdm_version }}" working-directory: ./Ed-Fi-TPDM-Extension From defac94d4a998ec6b1efe0cc735f5ef342f31f90 Mon Sep 17 00:00:00 2001 From: Marcos Gallo Date: Wed, 6 Sep 2023 17:31:51 -0300 Subject: [PATCH 22/22] Fix packages names for Postgres populated templates --- .github/workflows/build-minimal-template-postgreSQL.yml | 8 ++++---- .github/workflows/build-populated-template-postgreSQL.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-minimal-template-postgreSQL.yml b/.github/workflows/build-minimal-template-postgreSQL.yml index 93d7a55..5c9a9bb 100644 --- a/.github/workflows/build-minimal-template-postgreSQL.yml +++ b/.github/workflows/build-minimal-template-postgreSQL.yml @@ -126,15 +126,15 @@ jobs: - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` -Properties authors="Ed-Fi Alliance" ` -Properties owners="Ed-Fi Alliance" ` -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` - -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}" ` -Properties description="EdFi Ods Minimal Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension @@ -146,5 +146,5 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Minimal.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg path: NugetPackages\*.nupkg diff --git a/.github/workflows/build-populated-template-postgreSQL.yml b/.github/workflows/build-populated-template-postgreSQL.yml index 5b5c338..ab0cc2b 100644 --- a/.github/workflows/build-populated-template-postgreSQL.yml +++ b/.github/workflows/build-populated-template-postgreSQL.yml @@ -126,15 +126,15 @@ jobs: - name: Pack run: | - nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}.nuspec ` + nuget pack ${{ github.workspace }}/Ed-Fi-ODS-Implementation/DatabaseTemplate/Database/EdFi.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}.nuspec ` -OutputDirectory ${{ github.workspace }}/NugetPackages ` -Version ${{ env.version_core }} ` -Properties configuration=release ` -Properties authors="Ed-Fi Alliance" ` -Properties owners="Ed-Fi Alliance" ` -Properties copyright="Copyright ©Ed-Fi Alliance, LLC. 2020" ` - -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` - -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}.Standard.${{ env.data_standard }}" ` + -Properties id="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}" ` + -Properties title="EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}" ` -Properties description="EdFi Ods Populated Template TPDM Community Database" ` -NoPackageAnalysis -NoDefaultExcludes working-directory: ${{ github.workspace }}/Ed-Fi-TPDM-Extension @@ -146,5 +146,5 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 with: - name: EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.PostgreSQL.${{ env.tpdm_version }}..Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg + name: EdFi.Suite${{ env.version_suite }}.Ods.Populated.Template.TPDM.Community.${{ env.tpdm_version }}.PostgreSQL.Standard.${{ env.data_standard }}.${{ env.version_core }}.nupkg path: NugetPackages\*.nupkg