[ODS-6188] Upgrade System.Data.SqlClient upgrade dependency v6.1-patc…

…h3 Patch Release (#896)
Ed-Fi-Alliance-OSS · Jan 25, 2024 · 3e1f78a · 3e1f78a
1 parent 3419fc2
commit 3e1f78a
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 29 deletions.
diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml
@@ -8,10 +8,10 @@ name: CodeQL Security Scan Pull request
 on:
   pull_request:
     branches:
-      - main
+      [main, b-v*-patch*]
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
 env:
   INFORMATIONAL_VERSION: "6.1"
   BUILD_INCREMENTER: "1"

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*]
 env:
   HEAD_REF:  ${{ GITHUB.HEAD_REF }}
   REF_NAME:  ${{ GITHUB.REF_NAME }}  
@@ -16,7 +16,7 @@ env:
 jobs:
   scan-actions:
     name: Scan Actions
-    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
 
   analyze-code:
     name: Analyze Code Dependencies
@@ -26,9 +26,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b  # v3.0.2

diff --git a/.../workflows/InitDev (Postgres), Tests using Sandbox, Year-Specific and Shared Instance.yml b/.../workflows/InitDev (Postgres), Tests using Sandbox, Year-Specific and Shared Instance.yml
@@ -7,9 +7,9 @@ name: InitDev (Postgres), Smoke Tests Sandbox, Year-Specific, and Shared Instanc
 
 on:
   pull_request:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   push:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-ods-repo]

diff --git a/.github/workflows/InitDev (Postgres),Unit tests,Integration tests.yml b/.github/workflows/InitDev (Postgres),Unit tests,Integration tests.yml
@@ -7,7 +7,7 @@ name: InitDev (Postgres), Unit tests, Integration tests
 
 on:
   pull_request:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-ods-repo]

diff --git a/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml b/.github/workflows/InitDev,Unit tests,Integration tests,Package.yml
@@ -7,9 +7,9 @@ name: InitDev, Unit tests, Integration tests, Package
 
 on:
   pull_request:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   push:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-ods-repo]

diff --git a/... tests,Integration tests,Smoke Tests using Sandbox, Year-Specific and Shared Instance.yml b/... tests,Integration tests,Smoke Tests using Sandbox, Year-Specific and Shared Instance.yml
@@ -7,9 +7,9 @@ name: InitDev, Smoke Tests Sandbox, Year-Specific, and Shared Instance
 
 on:
   pull_request:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   push:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-ods-repo]

diff --git a/.github/workflows/Publish to Azure Artifacts.yml b/.github/workflows/Publish to Azure Artifacts.yml
@@ -11,7 +11,7 @@ on:
     workflows: ["InitDev, Smoke Tests Sandbox, Year-Specific, and Shared Instance"]
     types:
       - completed
-    branches: [main]
+    branches: [main, b-v*-patch*]
 env:
   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 }}

diff --git a/.github/workflows/Trigger EdFi.Ods.DB.Templates workflow in ODS repo.yml b/.github/workflows/Trigger EdFi.Ods.DB.Templates workflow in ODS repo.yml
@@ -7,9 +7,9 @@ name: Trigger EdFi.Ods.DB.Templates workflow in ODS repo
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
   push:
-   branches: [main]
+   branches: [main, b-v*-patch*]
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/edFi.ods.standard pullrequest.yml b/.github/workflows/edFi.ods.standard pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.Ods.Standard Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj b/Application/EdFi.Ods.Api.IntegrationTestHarness/EdFi.Ods.Api.IntegrationTestHarness.csproj
@@ -31,8 +31,8 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.3.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.1.26" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.1.29" />
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />

diff --git a/...Features.OwnershipBasedAuthorization/EdFi.Ods.Features.OwnershipBasedAuthorization.csproj b/...Features.OwnershipBasedAuthorization/EdFi.Ods.Features.OwnershipBasedAuthorization.csproj
@@ -15,7 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="Iesi.Collections" Version="4.0.4" />
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

diff --git a/Application/EdFi.Ods.SandboxAdmin/EdFi.Ods.SandboxAdmin.csproj b/Application/EdFi.Ods.SandboxAdmin/EdFi.Ods.SandboxAdmin.csproj
@@ -15,11 +15,11 @@
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.1" />
     <PackageReference Include="Autofac" Version="6.3.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
-    <PackageReference Include="Hangfire" Version="1.7.28" />
+    <PackageReference Include="Hangfire" Version="1.8.7" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.9.5" />
     <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />

diff --git a/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj b/Application/EdFi.Ods.WebApi/EdFi.Ods.WebApi.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
     <PackageReference Include="FluentValidation" Version="10.4.0" />
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />

diff --git a/configuration.packages.json b/configuration.packages.json
@@ -62,12 +62,12 @@
     },
     "EdFi.Ods.CodeGen": {
       "PackageName": "EdFi.Suite3.Ods.CodeGen",
-      "PackageVersion": "6.1.475",
+      "PackageVersion": "6.1.669",
       "PackageSource": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
     },
     "EdFi.Db.Deploy": {
       "PackageName": "EdFi.Suite3.Db.Deploy",
-      "PackageVersion": "3.1.24",
+      "PackageVersion": "3.1.27",
       "PackageSource": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
     },
     "EdFi.Database.Admin.PostgreSQL": {
@@ -157,7 +157,7 @@
     },
     "EdFi.Ods.Common": {
       "PackageName": "EdFi.Suite3.Ods.Common",
-      "PackageVersion": "6.1.30",
+      "PackageVersion": "6.1.33",
       "PackageSource": "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_packaging/EdFi/nuget/v3/index.json"
     },
     "EdFi.Ods.Api": {

diff --git a/logistics/scripts/modules/database/database-management.psm1 b/logistics/scripts/modules/database/database-management.psm1
@@ -82,7 +82,11 @@ function New-DbConnectionStringBuilder {
         $newDbCSB = New-DbConnectionStringBuilder
         foreach ($key in $existingCSB.keys) {
             $value = $existingCSB[$key]
-            if (-not ($emptySpecificCSB[$key] -eq $value)) {
+            if($key -eq 'Encrypt')
+            {
+                $newDbCSB[$key] =$value
+            }
+            elseif (-not ($emptySpecificCSB[$key] -eq $value)) {
                 $newDbCSB[$key] = [String]::Copy($value)
             }
         }
@@ -617,6 +621,7 @@ Function Clear-DatabaseUsers {
     $csb = Convert-CommonDbCSBtoSqlCSB $csb
     $databaseName = $csb['Initial Catalog']
     $masterCSB = New-DbConnectionStringBuilder -existingCSB $csb -property @{'Initial Catalog' = 'master' }
+    Write-Host "masterCSB is $masterCSB"  -ForegroundColor Blue
     $masterConnStr = Get-SqlConnectionString -dbCSB $masterCSB
 
     # Kill all the database processes using T-SQL:

diff --git a/logistics/scripts/modules/settings/settings-management.psm1 b/logistics/scripts/modules/settings/settings-management.psm1
@@ -295,6 +295,18 @@ function Add-ApplicationNameToConnectionStrings([hashtable] $Settings = @{ }, [s
     return $newSettings
 }
 
+function Add-EncryptValueToConnectionStrings([hashtable] $Settings = @{ }, [string] $EncryptValue) {
+    $csbs = Get-ConnectionStringBuildersFromSettings $Settings
+    $newConnectionStrings = @{ }
+    foreach ($key in $csbs.Keys) {
+        if (-not [string]::IsNullOrEmpty($csbs[$key]['Encrypt'])) { continue }
+        $csbs[$key]['Encrypt'] = (Split-Path -Leaf $EncryptValue).ToString()
+        $newConnectionStrings[$key] = $csbs[$key].ToString()
+    }
+    $newSettings = Merge-Hashtables $Settings, @{ ConnectionStrings = $newConnectionStrings }
+    return $newSettings
+}
+
 function Format-Json {
     <#
     .SYNOPSIS
@@ -596,6 +608,10 @@ function New-DevelopmentAppSettings([hashtable] $Settings = @{ }) {
     foreach ($project in $developmentSettingsByProject.Keys) {
         $newDevelopmentSettings = (Get-DefaultConnectionStringsByEngine)[$Settings.ApiSettings.Engine]
         $newDevelopmentSettings = Add-ApplicationNameToConnectionStrings $newDevelopmentSettings $project
+        if ($Settings.ApiSettings.Engine -eq 'SQLServer')
+        {
+            $newDevelopmentSettings = Add-EncryptValueToConnectionStrings $newDevelopmentSettings $false
+        }
         $newDevelopmentSettings = Merge-Hashtables $developmentSettingsByProject[$project], $newDevelopmentSettings
 
         $newDevelopmentSettings = Add-TestSpecificAppSettings $newDevelopmentSettings $project