diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dffeb2177..b65334ae9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ jobs: - name: set RDMP version run: | set -euxo pipefail - rdmp_cli_ver=$(grep -F -m1 HIC.RDMP.Plugin src/common/Smi.Common/Smi.Common.csproj | sed -n 's/.*Version="\([0-9.]*\)".*/\1/p') + rdmp_cli_ver=$(grep -F -m1 HIC.RDMP.Plugin Directory.Packages.props | sed -n 's/.*Version="\([0-9.]*\)".*/\1/p') echo "rdmp_cli_ver=$rdmp_cli_ver" >> $GITHUB_ENV - name: "[windows] Install SQL LocalDB" if: ${{ matrix.os == 'windows' }} diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..eb658473c --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,41 @@ + + + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fa077816c..a8e444fb0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,10 @@ - - - - + + + + + + + diff --git a/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj b/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj index 8fafeabac..7bfe3d93d 100644 --- a/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj +++ b/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj @@ -4,8 +4,8 @@ enable - - + + diff --git a/src/applications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj b/src/applications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj index b7acdd652..b1ee726a5 100644 --- a/src/applications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj +++ b/src/applications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj b/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj index fbbe98199..d984a26ee 100644 --- a/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj +++ b/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/applications/Setup/Setup.csproj b/src/applications/Setup/Setup.csproj index c86f9c078..09cda7328 100644 --- a/src/applications/Setup/Setup.csproj +++ b/src/applications/Setup/Setup.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/common/Smi.Common/Smi.Common.csproj b/src/common/Smi.Common/Smi.Common.csproj index a6a3e14a8..cc54b32f0 100644 --- a/src/common/Smi.Common/Smi.Common.csproj +++ b/src/common/Smi.Common/Smi.Common.csproj @@ -19,23 +19,18 @@ - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - + + + + + + + + + + + + + diff --git a/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj b/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj index 9c399c712..aa4581527 100644 --- a/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj +++ b/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/microservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj b/src/microservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj index a04a5b581..969baa1f0 100644 --- a/src/microservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj +++ b/src/microservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj b/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj index cdeb0eeb3..7a12789a7 100644 --- a/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj +++ b/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj b/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj index f702af7cc..7af12ce06 100644 --- a/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj +++ b/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 78243fa1a..30ac3e1f0 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,13 +1,13 @@ - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj b/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj index 7c9874905..2688b7a6e 100644 --- a/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj +++ b/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj @@ -22,12 +22,11 @@ - - - - - - + + + + + diff --git a/tests/run-all-tests.proj b/tests/run-all-tests.proj deleted file mode 100644 index 7ca1735d1..000000000 --- a/tests/run-all-tests.proj +++ /dev/null @@ -1,5 +0,0 @@ - - - - -