diff --git a/.github/workflows/after-pullrequest.yml b/.github/workflows/after-pullrequest.yml index a7b753bc4..19d7c0845 100644 --- a/.github/workflows/after-pullrequest.yml +++ b/.github/workflows/after-pullrequest.yml @@ -21,6 +21,7 @@ jobs: with: artifact: csharp-tests name: C# Unit Test Results - path: "*.trx" + path: "**/*.trx" reporter: dotnet-trx fail-on-error: false + \ No newline at end of file diff --git a/.github/workflows/on-pullrequest.yml b/.github/workflows/on-pullrequest.yml index 42c8bed34..00b5654d8 100644 --- a/.github/workflows/on-pullrequest.yml +++ b/.github/workflows/on-pullrequest.yml @@ -57,7 +57,7 @@ jobs: uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 with: name: csharp-tests - path: TestResults/unit-tests.trx + path: "**/*.trx" retention-days: 5 - name: Dependency Review ("Dependabot on PR") diff --git a/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj b/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj index 038311ec8..17f748ea6 100644 --- a/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj +++ b/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj @@ -9,12 +9,13 @@ - - + + + - + diff --git a/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj b/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj index 22b6b17e4..d43feb191 100644 --- a/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj +++ b/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj @@ -7,8 +7,9 @@ - - + + + diff --git a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj index a89938226..af26b9894 100644 --- a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj +++ b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -21,8 +21,8 @@ - - + + @@ -30,8 +30,8 @@ - - + + diff --git a/Application/EdFi.Ods.AdminApi/Infrastructure/EdFi.Ods.AdminApp.Management.csproj b/Application/EdFi.Ods.AdminApi/Infrastructure/EdFi.Ods.AdminApp.Management.csproj index ab31283af..70c0249f6 100644 --- a/Application/EdFi.Ods.AdminApi/Infrastructure/EdFi.Ods.AdminApp.Management.csproj +++ b/Application/EdFi.Ods.AdminApi/Infrastructure/EdFi.Ods.AdminApp.Management.csproj @@ -10,8 +10,8 @@ - - + + @@ -19,8 +19,8 @@ - - + + diff --git a/eng/database-manager.psm1 b/eng/database-manager.psm1 index 02b68c124..e508bfe4e 100644 --- a/eng/database-manager.psm1 +++ b/eng/database-manager.psm1 @@ -6,7 +6,7 @@ #requires -version 5 $ErrorActionPreference = "Stop" -Set-Variable DbDeployVersion -option Constant -value "2.3.10068" +Set-Variable DbDeployVersion -option Constant -value "4.0.46" Import-Module -Name "$PSScriptRoot/connection-strings.psm1"