From 4db594f41b052beb740c12ebec2bc278e7128bc4 Mon Sep 17 00:00:00 2001 From: Paul DeVito Date: Thu, 5 Dec 2024 17:55:23 -0500 Subject: [PATCH 1/5] fix: github workflow --- .github/workflows/peaklims-functional-tests.yaml | 4 ++-- .github/workflows/peaklims-integration-tests.yaml | 4 ++-- .github/workflows/peaklims-unit-tests.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/peaklims-functional-tests.yaml b/.github/workflows/peaklims-functional-tests.yaml index b72e04cf..f8872478 100644 --- a/.github/workflows/peaklims-functional-tests.yaml +++ b/.github/workflows/peaklims-functional-tests.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['8.0.x'] + dotnet-version: ['9.0.x'] steps: - uses: actions/checkout@v2 - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims/tests/PeakLims.FunctionalTests + working-directory: PeakLims.FunctionalTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file diff --git a/.github/workflows/peaklims-integration-tests.yaml b/.github/workflows/peaklims-integration-tests.yaml index 2462253a..ce80c5b8 100644 --- a/.github/workflows/peaklims-integration-tests.yaml +++ b/.github/workflows/peaklims-integration-tests.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['8.0.x'] + dotnet-version: ['9.0.x'] steps: - uses: actions/checkout@v2 - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims/tests/PeakLims.IntegrationTests + working-directory: PeakLims.IntegrationTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file diff --git a/.github/workflows/peaklims-unit-tests.yaml b/.github/workflows/peaklims-unit-tests.yaml index 2c063e13..ce80c58f 100644 --- a/.github/workflows/peaklims-unit-tests.yaml +++ b/.github/workflows/peaklims-unit-tests.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['8.0.x'] + dotnet-version: ['9.0.x'] steps: - uses: actions/checkout@v2 - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims/tests/PeakLims.UnitTests + working-directory: PeakLims.UnitTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file From 906e6008253b464a58b96a5f7027fe19ed6dbbeb Mon Sep 17 00:00:00 2001 From: Paul DeVito Date: Thu, 5 Dec 2024 18:00:18 -0500 Subject: [PATCH 2/5] fix: sln reference to old project name --- PeakLimsApi.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PeakLimsApi.sln b/PeakLimsApi.sln index f324cd4f..6eb2fc2c 100644 --- a/PeakLimsApi.sln +++ b/PeakLimsApi.sln @@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.SharedTestHelpers" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.UnitTests", "PeakLims\tests\PeakLims.UnitTests\PeakLims.UnitTests.csproj", "{0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeycloakInPulumi", "KeycloakInPulumi\KeycloakInPulumi.csproj", "{9E4842A7-EC6F-438C-8620-61BC2093E7E5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsIdp", "PeakLimsIdp\PeakLimsIdp.csproj", "{9E4842A7-EC6F-438C-8620-61BC2093E7E5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsSpa.Bff", "PeakLimsSpa.Bff\PeakLimsSpa.Bff.csproj", "{B22C4E0E-CF8A-4955-82BA-5D64719DE042}" EndProject From 1c2f5c9b0a07e72fa6e71230b40180f39e8b8a5c Mon Sep 17 00:00:00 2001 From: Paul DeVito Date: Thu, 5 Dec 2024 18:03:30 -0500 Subject: [PATCH 3/5] fix: build --- Directory.Packages.props | 1 + PeakLimsIdp/PeakLimsIdp.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0bcd7b1d..856244a4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -47,6 +47,7 @@ + diff --git a/PeakLimsIdp/PeakLimsIdp.csproj b/PeakLimsIdp/PeakLimsIdp.csproj index 89a6ba37..b7a0d8aa 100644 --- a/PeakLimsIdp/PeakLimsIdp.csproj +++ b/PeakLimsIdp/PeakLimsIdp.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file From a5696dc651b1b7c01b1820acc0aac991be52c1f9 Mon Sep 17 00:00:00 2001 From: Paul DeVito Date: Wed, 4 Dec 2024 23:09:23 -0500 Subject: [PATCH 4/5] build: .net 9 upgrade resolve .net 9 issue --- Directory.Packages.props | 62 +++---- PeakLims/src/PeakLims/PeakLims.csproj | 2 +- .../PeakLims.FunctionalTests.csproj | 2 +- .../PeakLims.IntegrationTests.csproj | 2 +- .../PeakLims.SharedTestHelpers.csproj | 2 +- .../PeakLims.UnitTests.csproj | 2 +- PeakLimsApi.sln | 158 +++++++++--------- PeakLimsIdp/PeakLimsIdp.csproj | 2 +- PeakLimsSpa.Bff/PeakLimsSpa.Bff.csproj | 2 +- 9 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 856244a4..b4a5ee91 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,68 +5,68 @@ $(NoWarn);NU1507 - - - + + + - + - - - + + + - + - - - - - - + + + + + + - - + + - - + + - + - + - - - + + + - + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/PeakLims/src/PeakLims/PeakLims.csproj b/PeakLims/src/PeakLims/PeakLims.csproj index 32205aca..ef8b6476 100644 --- a/PeakLims/src/PeakLims/PeakLims.csproj +++ b/PeakLims/src/PeakLims/PeakLims.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable true diff --git a/PeakLims/tests/PeakLims.FunctionalTests/PeakLims.FunctionalTests.csproj b/PeakLims/tests/PeakLims.FunctionalTests/PeakLims.FunctionalTests.csproj index 9e289dc5..35c3655e 100644 --- a/PeakLims/tests/PeakLims.FunctionalTests/PeakLims.FunctionalTests.csproj +++ b/PeakLims/tests/PeakLims.FunctionalTests/PeakLims.FunctionalTests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable false diff --git a/PeakLims/tests/PeakLims.IntegrationTests/PeakLims.IntegrationTests.csproj b/PeakLims/tests/PeakLims.IntegrationTests/PeakLims.IntegrationTests.csproj index 432be894..f8ec6d54 100644 --- a/PeakLims/tests/PeakLims.IntegrationTests/PeakLims.IntegrationTests.csproj +++ b/PeakLims/tests/PeakLims.IntegrationTests/PeakLims.IntegrationTests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable false diff --git a/PeakLims/tests/PeakLims.SharedTestHelpers/PeakLims.SharedTestHelpers.csproj b/PeakLims/tests/PeakLims.SharedTestHelpers/PeakLims.SharedTestHelpers.csproj index 26a7f755..90004c79 100644 --- a/PeakLims/tests/PeakLims.SharedTestHelpers/PeakLims.SharedTestHelpers.csproj +++ b/PeakLims/tests/PeakLims.SharedTestHelpers/PeakLims.SharedTestHelpers.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable diff --git a/PeakLims/tests/PeakLims.UnitTests/PeakLims.UnitTests.csproj b/PeakLims/tests/PeakLims.UnitTests/PeakLims.UnitTests.csproj index 3f4aa8cd..bd686e92 100644 --- a/PeakLims/tests/PeakLims.UnitTests/PeakLims.UnitTests.csproj +++ b/PeakLims/tests/PeakLims.UnitTests/PeakLims.UnitTests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable false diff --git a/PeakLimsApi.sln b/PeakLimsApi.sln index 6eb2fc2c..be6bdf0d 100644 --- a/PeakLimsApi.sln +++ b/PeakLimsApi.sln @@ -1,79 +1,79 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedKernel", "SharedKernel\SharedKernel.csproj", "{1A6F006A-8374-4DB9-9E7C-F23D7CE55266}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PeakLims", "PeakLims", "{523539D8-B9F0-4217-BAA7-AB14C628135E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93C304BE-B71A-4AE2-87F0-09D4885DDC65}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims", "PeakLims\src\PeakLims\PeakLims.csproj", "{5327AAD8-C7D6-4374-9298-E0F58B98E760}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EFB20ACD-F065-4E99-89B8-9DABED2342AD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.IntegrationTests", "PeakLims\tests\PeakLims.IntegrationTests\PeakLims.IntegrationTests.csproj", "{72EF8DAB-F362-4637-B62F-7EDC8699AD1B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.FunctionalTests", "PeakLims\tests\PeakLims.FunctionalTests\PeakLims.FunctionalTests.csproj", "{05946816-D25D-43FC-BA8F-C7F067658E13}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.SharedTestHelpers", "PeakLims\tests\PeakLims.SharedTestHelpers\PeakLims.SharedTestHelpers.csproj", "{CE26650D-2382-4231-A7DF-E8625BB905BB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.UnitTests", "PeakLims\tests\PeakLims.UnitTests\PeakLims.UnitTests.csproj", "{0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsIdp", "PeakLimsIdp\PeakLimsIdp.csproj", "{9E4842A7-EC6F-438C-8620-61BC2093E7E5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsSpa.Bff", "PeakLimsSpa.Bff\PeakLimsSpa.Bff.csproj", "{B22C4E0E-CF8A-4955-82BA-5D64719DE042}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Release|Any CPU.Build.0 = Release|Any CPU - {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Release|Any CPU.Build.0 = Release|Any CPU - {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Release|Any CPU.Build.0 = Release|Any CPU - {05946816-D25D-43FC-BA8F-C7F067658E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05946816-D25D-43FC-BA8F-C7F067658E13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05946816-D25D-43FC-BA8F-C7F067658E13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05946816-D25D-43FC-BA8F-C7F067658E13}.Release|Any CPU.Build.0 = Release|Any CPU - {CE26650D-2382-4231-A7DF-E8625BB905BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE26650D-2382-4231-A7DF-E8625BB905BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE26650D-2382-4231-A7DF-E8625BB905BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE26650D-2382-4231-A7DF-E8625BB905BB}.Release|Any CPU.Build.0 = Release|Any CPU - {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Release|Any CPU.Build.0 = Release|Any CPU - {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Release|Any CPU.Build.0 = Release|Any CPU - {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {93C304BE-B71A-4AE2-87F0-09D4885DDC65} = {523539D8-B9F0-4217-BAA7-AB14C628135E} - {5327AAD8-C7D6-4374-9298-E0F58B98E760} = {93C304BE-B71A-4AE2-87F0-09D4885DDC65} - {EFB20ACD-F065-4E99-89B8-9DABED2342AD} = {523539D8-B9F0-4217-BAA7-AB14C628135E} - {72EF8DAB-F362-4637-B62F-7EDC8699AD1B} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} - {05946816-D25D-43FC-BA8F-C7F067658E13} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} - {CE26650D-2382-4231-A7DF-E8625BB905BB} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} - {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedKernel", "SharedKernel\SharedKernel.csproj", "{1A6F006A-8374-4DB9-9E7C-F23D7CE55266}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PeakLims", "PeakLims", "{523539D8-B9F0-4217-BAA7-AB14C628135E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93C304BE-B71A-4AE2-87F0-09D4885DDC65}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PeakLims", "PeakLims\src\PeakLims\PeakLims.csproj", "{5327AAD8-C7D6-4374-9298-E0F58B98E760}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EFB20ACD-F065-4E99-89B8-9DABED2342AD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.IntegrationTests", "PeakLims\tests\PeakLims.IntegrationTests\PeakLims.IntegrationTests.csproj", "{72EF8DAB-F362-4637-B62F-7EDC8699AD1B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.FunctionalTests", "PeakLims\tests\PeakLims.FunctionalTests\PeakLims.FunctionalTests.csproj", "{05946816-D25D-43FC-BA8F-C7F067658E13}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.SharedTestHelpers", "PeakLims\tests\PeakLims.SharedTestHelpers\PeakLims.SharedTestHelpers.csproj", "{CE26650D-2382-4231-A7DF-E8625BB905BB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLims.UnitTests", "PeakLims\tests\PeakLims.UnitTests\PeakLims.UnitTests.csproj", "{0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsIdp", "PeakLimsIdp\PeakLimsIdp.csproj", "{9E4842A7-EC6F-438C-8620-61BC2093E7E5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeakLimsSpa.Bff", "PeakLimsSpa.Bff\PeakLimsSpa.Bff.csproj", "{B22C4E0E-CF8A-4955-82BA-5D64719DE042}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A6F006A-8374-4DB9-9E7C-F23D7CE55266}.Release|Any CPU.Build.0 = Release|Any CPU + {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5327AAD8-C7D6-4374-9298-E0F58B98E760}.Release|Any CPU.Build.0 = Release|Any CPU + {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72EF8DAB-F362-4637-B62F-7EDC8699AD1B}.Release|Any CPU.Build.0 = Release|Any CPU + {05946816-D25D-43FC-BA8F-C7F067658E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05946816-D25D-43FC-BA8F-C7F067658E13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05946816-D25D-43FC-BA8F-C7F067658E13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05946816-D25D-43FC-BA8F-C7F067658E13}.Release|Any CPU.Build.0 = Release|Any CPU + {CE26650D-2382-4231-A7DF-E8625BB905BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE26650D-2382-4231-A7DF-E8625BB905BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE26650D-2382-4231-A7DF-E8625BB905BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE26650D-2382-4231-A7DF-E8625BB905BB}.Release|Any CPU.Build.0 = Release|Any CPU + {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3}.Release|Any CPU.Build.0 = Release|Any CPU + {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E4842A7-EC6F-438C-8620-61BC2093E7E5}.Release|Any CPU.Build.0 = Release|Any CPU + {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B22C4E0E-CF8A-4955-82BA-5D64719DE042}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {93C304BE-B71A-4AE2-87F0-09D4885DDC65} = {523539D8-B9F0-4217-BAA7-AB14C628135E} + {5327AAD8-C7D6-4374-9298-E0F58B98E760} = {93C304BE-B71A-4AE2-87F0-09D4885DDC65} + {EFB20ACD-F065-4E99-89B8-9DABED2342AD} = {523539D8-B9F0-4217-BAA7-AB14C628135E} + {72EF8DAB-F362-4637-B62F-7EDC8699AD1B} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} + {05946816-D25D-43FC-BA8F-C7F067658E13} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} + {CE26650D-2382-4231-A7DF-E8625BB905BB} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} + {0ACE8680-37D0-4304-A0E7-831C5DD8A0B3} = {EFB20ACD-F065-4E99-89B8-9DABED2342AD} + EndGlobalSection +EndGlobal diff --git a/PeakLimsIdp/PeakLimsIdp.csproj b/PeakLimsIdp/PeakLimsIdp.csproj index b7a0d8aa..a2bb1aae 100644 --- a/PeakLimsIdp/PeakLimsIdp.csproj +++ b/PeakLimsIdp/PeakLimsIdp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable PeakLimsIdp diff --git a/PeakLimsSpa.Bff/PeakLimsSpa.Bff.csproj b/PeakLimsSpa.Bff/PeakLimsSpa.Bff.csproj index 94641c2d..e55e050c 100644 --- a/PeakLimsSpa.Bff/PeakLimsSpa.Bff.csproj +++ b/PeakLimsSpa.Bff/PeakLimsSpa.Bff.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable enable From 2280f0930c1e530a5b5b35a0795e44995a78e8f2 Mon Sep 17 00:00:00 2001 From: Paul DeVito Date: Thu, 5 Dec 2024 18:12:56 -0500 Subject: [PATCH 5/5] fix: dir ref --- .github/workflows/peaklims-functional-tests.yaml | 2 +- .github/workflows/peaklims-integration-tests.yaml | 2 +- .github/workflows/peaklims-unit-tests.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/peaklims-functional-tests.yaml b/.github/workflows/peaklims-functional-tests.yaml index f8872478..c608816e 100644 --- a/.github/workflows/peaklims-functional-tests.yaml +++ b/.github/workflows/peaklims-functional-tests.yaml @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims.FunctionalTests + working-directory: PeakLims/tests/PeakLims.FunctionalTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file diff --git a/.github/workflows/peaklims-integration-tests.yaml b/.github/workflows/peaklims-integration-tests.yaml index ce80c5b8..d30c92fc 100644 --- a/.github/workflows/peaklims-integration-tests.yaml +++ b/.github/workflows/peaklims-integration-tests.yaml @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims.IntegrationTests + working-directory: PeakLims/tests/PeakLims.IntegrationTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file diff --git a/.github/workflows/peaklims-unit-tests.yaml b/.github/workflows/peaklims-unit-tests.yaml index ce80c58f..afd634df 100644 --- a/.github/workflows/peaklims-unit-tests.yaml +++ b/.github/workflows/peaklims-unit-tests.yaml @@ -20,5 +20,5 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - working-directory: PeakLims.UnitTests + working-directory: PeakLims/tests/PeakLims.UnitTests run: dotnet test --no-restore --verbosity minimal \ No newline at end of file