diff --git a/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj b/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj index e78dd26e59..034b5c9746 100644 --- a/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj +++ b/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj @@ -1,4 +1,4 @@ - + {550988FD-F1FA-41D8-BE0F-00B4DE47D320} WinExe @@ -29,10 +29,10 @@ - - - - + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..b40ebb9954 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,47 @@ + + + true + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HIC.DataManagementPlatform.sln b/HIC.DataManagementPlatform.sln index 9601ae9ef9..c088c8a388 100644 --- a/HIC.DataManagementPlatform.sln +++ b/HIC.DataManagementPlatform.sln @@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution deadlinksconfig.json = deadlinksconfig.json directory.build.props = directory.build.props .github\workflows\links.yml = .github\workflows\links.yml + Directory.Packages.props = Directory.Packages.props NoteForNewDevelopers.md = NoteForNewDevelopers.md Documentation\CodeTutorials\Packages.md = Documentation\CodeTutorials\Packages.md rdmp-client.xml = rdmp-client.xml diff --git a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj index 84c8df6f7d..6917c59ac6 100644 --- a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj +++ b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj @@ -65,22 +65,22 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs index 882630995a..ffa4e0968b 100644 --- a/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs +++ b/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs @@ -24,10 +24,11 @@ public class PackageListIsCorrectTests { RecurseSubdirectories = true, MatchCasing = MatchCasing.CaseInsensitive, IgnoreInaccessible = true }; // - private static readonly Regex RPackageRef = - new(@" RPackageRef.Matches(s)) - .Select(m => m.Groups[1].Value).ToHashSet(StringComparer.InvariantCultureIgnoreCase); + var usedPackages = GetCsprojFiles(root).Select(File.ReadAllText) + .SelectMany(s => RPackageRefNoVersion.Matches(s)) + .Select(m => m.Groups[1].Value) + .ToHashSet(StringComparer.InvariantCultureIgnoreCase); // Then subtract those listed in PACKAGES.md (should be empty) var undocumentedPackages = usedPackages.Except(packagesMarkdown).Select(BuildRecommendedMarkdownLine).ToList(); diff --git a/Rdmp.Core/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj index 00edd93938..d1273bb7bd 100644 --- a/Rdmp.Core/Rdmp.Core.csproj +++ b/Rdmp.Core/Rdmp.Core.csproj @@ -1,384 +1,384 @@  - - HIC.RDMP.Plugin - $(version) - HIC.RDMP.Plugin - Health Informatics Centre, University of Dundee - Health Informatics Centre, University of Dundee - https://raw.githubusercontent.com/HicServices/RDMP/master/LICENSE - https://github.com/HicServices/RDMP - - https://raw.githubusercontent.com/HicServices/RDMP/master/Application/ResearchDataManagementPlatform/Icon/main.png - - false - GPL-3.0-or-later - Core package for plugin development - Copyright 2018-2019 - net7.0 - false - true - net7.0 - true - 1701;1702;CS1591;SCS0018 - embedded - true - $(NoWarn);NU5104 - - - Rdmp.Core.DataLoad.Modules.DataProvider.WebServiceConfiguration - - - true - latest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Never - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - Never - - - - - - - - - True - True - GlobalStrings.resx - - - True - True - ChecksAndProgressIcons.resx - - - True - True - Images.resx - - - DatabaseProviderIcons.resx - True - True - - - - - PublicResXFileCodeGenerator - GlobalStrings.Designer.cs - - - PublicResXFileCodeGenerator - - - - - - PublicResXFileCodeGenerator - ChecksAndProgressIcons.Designer.cs - - - Designer - PublicResXFileCodeGenerator - Images.Designer.cs - - - Designer - DatabaseProviderIcons.Designer.cs - PublicResXFileCodeGenerator - - + + HIC.RDMP.Plugin + $(version) + HIC.RDMP.Plugin + Health Informatics Centre, University of Dundee + Health Informatics Centre, University of Dundee + https://raw.githubusercontent.com/HicServices/RDMP/master/LICENSE + https://github.com/HicServices/RDMP + + https://raw.githubusercontent.com/HicServices/RDMP/master/Application/ResearchDataManagementPlatform/Icon/main.png + + false + GPL-3.0-or-later + Core package for plugin development + Copyright 2018-2019 + net7.0 + false + true + net7.0 + true + 1701;1702;CS1591;SCS0018 + embedded + true + $(NoWarn);NU5104 + + + Rdmp.Core.DataLoad.Modules.DataProvider.WebServiceConfiguration + + + true + latest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Never + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + Never + + + + + + + + + True + True + GlobalStrings.resx + + + True + True + ChecksAndProgressIcons.resx + + + True + True + Images.resx + + + DatabaseProviderIcons.resx + True + True + + + + + PublicResXFileCodeGenerator + GlobalStrings.Designer.cs + + + PublicResXFileCodeGenerator + + + + + + PublicResXFileCodeGenerator + ChecksAndProgressIcons.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Images.Designer.cs + + + Designer + DatabaseProviderIcons.Designer.cs + PublicResXFileCodeGenerator + + \ No newline at end of file diff --git a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj index e2cd176a97..4df2463615 100644 --- a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj +++ b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj @@ -1,4 +1,4 @@ - + net7.0-windows false @@ -12,22 +12,22 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Rdmp.UI/Rdmp.UI.csproj b/Rdmp.UI/Rdmp.UI.csproj index 3b3f0493ab..66fb7e55de 100644 --- a/Rdmp.UI/Rdmp.UI.csproj +++ b/Rdmp.UI/Rdmp.UI.csproj @@ -42,16 +42,16 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/Tests.Common/Tests.Common.csproj b/Tests.Common/Tests.Common.csproj index 1bdf4aaeb9..b27732f98c 100644 --- a/Tests.Common/Tests.Common.csproj +++ b/Tests.Common/Tests.Common.csproj @@ -36,12 +36,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + \ No newline at end of file diff --git a/Tools/rdmp/rdmp.csproj b/Tools/rdmp/rdmp.csproj index a7d23a30e5..c0025723ce 100644 --- a/Tools/rdmp/rdmp.csproj +++ b/Tools/rdmp/rdmp.csproj @@ -1,52 +1,50 @@ - - {A6107DDC-8268-4902-A994-233B00480113} - Exe - net7.0 - true - false - rdmp - rdmp - Copyright © 2019 - - Rdmp.Core - embedded - true - true - true - net7.0 - - - true - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - - - - - - + + {A6107DDC-8268-4902-A994-233B00480113} + Exe + net7.0 + true + false + rdmp + rdmp + Copyright © 2019 + + Rdmp.Core + embedded + true + true + true + net7.0 + + + true + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + +