Merge branch 'main' into ODS-6185

Ed-Fi-Alliance-OSS · Feb 15, 2024 · 6b391fe · 6b391fe
2 parents a18124e + fd84612
commit 6b391fe
Show file tree

Hide file tree

Showing 29 changed files with 136 additions and 443 deletions.
diff --git a/.github/workflows/Cleanup Caches by a branch.yml b/.github/workflows/Cleanup Caches by a branch.yml
@@ -6,7 +6,7 @@
 name: Cleanup Caches by a branch
 on:
   pull_request:
-    branches: [main, 'ODS-*']
+    branches: [main, 'b-v*-patch*','feature-*']
     types: [ closed ]
 
 env:

diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml
@@ -7,7 +7,7 @@ name: Dependency Review Pull request
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, 'b-v*-patch*','feature-*']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -31,9 +31,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
       - name: Checkout code
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4

diff --git a/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml b/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml
diff --git a/...lows/Lib edFi.admin.dataaccess manual.yml → ...b/workflows/Lib edFi.admin.dataaccess.yml b/...lows/Lib edFi.admin.dataaccess manual.yml → ...b/workflows/Lib edFi.admin.dataaccess.yml
@@ -3,10 +3,15 @@
    # 2.If any new public method get added/modified in Repository class of Ed-Fi-ODS\Application\EdFi.Admin.DataAccess project which interacts with EdFi_Admin Database.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS\Application\EdFi.Admin.DataAccess project
 
-name: Lib EdFi.Admin.DataAccess Manually triggered build
+name: Lib EdFi.Admin.DataAccess
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
@@ -70,12 +75,13 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj" -PackageName  "EdFi.Suite3.Admin.DataAccess"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
+
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh 
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      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}} -Solution "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.sln" -ProjectFile "Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj" -PackageName  "EdFi.Suite3.Admin.DataAccess"
       shell: pwsh      

diff --git a/.github/workflows/Lib edFi.common pullrequest.yml b/.github/workflows/Lib edFi.common pullrequest.yml
diff --git a/.github/workflows/Lib edFi.common manual.yml → .github/workflows/Lib edFi.common.yml b/.github/workflows/Lib edFi.common manual.yml → .github/workflows/Lib edFi.common.yml
@@ -3,10 +3,15 @@
    # 2.If any new code changes in Ed-Fi-ODS\Application\EdFi.Common project which interacts with ODS/API solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS\Application\EdFi.Common project
 
-name: Lib EdFi.Common Manually triggered build
+name: Lib EdFi.Common
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj" -PackageName  "EdFi.Suite3.Common"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      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}} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj" -PackageName  "EdFi.Suite3.Common"
       shell: pwsh      

diff --git a/.github/workflows/Lib edFi.loadtools pullrequest.yml b/.github/workflows/Lib edFi.loadtools pullrequest.yml
diff --git a/...b/workflows/Lib edFi.loadtools manual.yml → .github/workflows/Lib edFi.loadtools.yml b/...b/workflows/Lib edFi.loadtools manual.yml → .github/workflows/Lib edFi.loadtools.yml
@@ -3,14 +3,19 @@
    # 2.If any new code changes in Utilities/DataLoading/ folder which interacts with BulkLoadClient /SmokeTest.Console tools for testing the ODS/API solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Utilities/DataLoading/LoadTools.sln solution
 
-name: Lib EdFi.LoadTools Manually triggered build
+name: Lib EdFi.LoadTools
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-22"
+  BUILD_INCREMENTER: "4"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -78,25 +83,17 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj" -PackageName "EdFi.Suite3.SmokeTest.Console"
       shell: pwsh          
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
-    - name: publish load tools
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+    - name: publish load tools,bulk load client & smoke test console
+      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}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj"  -PackageName "EdFi.Suite3.LoadTools"
-      shell: pwsh      
-    - name: publish bulk load client
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
-      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}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj" -PackageName "EdFi.Suite3.BulkLoadClient.Console"
-      shell: pwsh
-    - name: publish smoke test console
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
-      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}} -Solution "Utilities/DataLoading/LoadTools.sln" -ProjectFile "Ed-Fi-ODS/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj" -PackageName "EdFi.Suite3.SmokeTest.Console"
-      shell: pwsh
+      shell: pwsh      
     - name: Upload EdFi.LoadTools Artifacts
       if: success()
       uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0

diff --git a/.github/workflows/Lib edFi.ods.api pullrequest .yml b/.github/workflows/Lib edFi.ods.api pullrequest .yml
diff --git a/...hub/workflows/Lib edFi.ods.api manual.yml → .github/workflows/Lib edFi.ods.api.yml b/...hub/workflows/Lib edFi.ods.api manual.yml → .github/workflows/Lib edFi.ods.api.yml
@@ -3,14 +3,19 @@
    # 2.If any new code changes in Ed-Fi-ODS/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj project which interacts with ODS/API Solution.
    # 3.If any .NET new major/minor version upgrade or Nuget package version upgrade happens in Ed-Fi-ODS/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj  Project.
 
-name: Lib EdFi.Ods.Api Manually triggered build
+name: Lib EdFi.Ods.Api
 
 on:
+  pull_request:
+    branches: [main, 'b-v*-patch*','feature-*']
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   INFORMATIONAL_VERSION: "7.2"
-  BUILD_INCREMENTER: "-52"
+  BUILD_INCREMENTER: "2"
   CONFIGURATION: "Release"
   AZURE_ARTIFACT_URL: "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
   AZURE_ARTIFACT_NUGET_KEY: ${{ secrets.AZURE_ARTIFACTS_PERSONAL_ACCESS_TOKEN }}
@@ -70,12 +75,12 @@ jobs:
         .\build.githubactions.ps1 pack -InformationalVersion ${{ env.INFORMATIONAL_VERSION }} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj" -PackageName  "EdFi.Suite3.Ods.Api"
       shell: pwsh
     - name: Install-credential-handler
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' &&  github.event_name == 'workflow_dispatch' }}
       run: |
         .\build.githubactions.ps1 InstallCredentialHandler
       shell: pwsh
     - name: publish
-      if: ${{ env.AZURE_ARTIFACT_NUGET_KEY != '' }}
+      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}} -Solution "Application/EdFi.Ods.Api/EdFi.Ods.Api.sln" -ProjectFile "Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj" -PackageName  "EdFi.Suite3.Ods.Api"
       shell: pwsh