Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Task/bump net 8 #90

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Task/bump net 8 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94ceca
net8 bump
JFriel Mar 12, 2024
cfc001c
fix package test
JFriel Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>false</RestorePackages>
<AssemblyTitle>LoadModules.Extensions.AutomationPlugins</AssemblyTitle>
Expand Down
2 changes: 1 addition & 1 deletion Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>false</RestorePackages>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
2 changes: 1 addition & 1 deletion LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
Expand Down
2 changes: 1 addition & 1 deletion LoadModules.Extensions.Tests/PackageListIsCorrectTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private static IEnumerable<string> GetCsprojFiles(DirectoryInfo root)
/// <returns></returns>
private static string[] GetPackagesMarkdown(DirectoryInfo root)
{
var path = root.EnumerateFiles("packages.md", EnumerationOptions).Select(static f => f.FullName).ToArray();
var path = root.EnumerateFiles("packages.md", EnumerationOptions).Select(static f => f.FullName).Where(f => !f.Contains("RDMP\\Documentation\\CodeTutorials\\Packages.md")).ToArray();
Assert.That(path, Is.Not.Empty, "Packages.md not found");
return path;
}
Expand Down
2 changes: 1 addition & 1 deletion Plugin/main/main.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
<Product>Rdmp.Extensions.Plugin</Product>
<Copyright>Copyright © 2019</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Plugin/windows/windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{07F9F874-1306-4FE6-A03F-A483592BBC7F}</ProjectGuid>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
<Product>Rdmp.Extensions.Plugin</Product>
<Copyright>Copyright © 2019</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>false</RestorePackages>
<AssemblyTitle>LoadModules.Extensions</AssemblyTitle>
Expand Down
2 changes: 1 addition & 1 deletion RDMP
Open in desktop
Submodule RDMP updated 36 files
+2 −14 .github/dependabot.yml
+11 −11 .github/workflows/build.yml
+0 −26 .nuget/packages.config
+6 −6 Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
+1 −1 CHANGELOG.md
+7 −0 Directory.Build.props
+43 −0 Directory.Packages.props
+0 −2 Documentation/CodeTutorials/Packages.md
+2 −6 HIC.DataManagementPlatform.sln
+0 −3 Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs
+1 −1 Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs
+5 −3 Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs
+8 −8 Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
+7 −4 Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
+1 −0 Rdmp.Core/CommandExecution/AtomicCommands/LogsNotConfirmedException.cs
+1 −2 Rdmp.Core/Curation/Data/Catalogue.cs
+1 −1 Rdmp.Core/Curation/Data/ConcreteFilter.cs
+1 −1 Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs
+1 −1 Rdmp.Core/Curation/Data/TableInfo.cs
+1 −1 Rdmp.Core/DataExport/Data/ExternalCohortTable.cs
+2 −3 Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs
+6 −35 Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs
+42 −7 Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
+6 −4 Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs
+1 −1 Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs
+1 −1 Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs
+382 −383 Rdmp.Core/Rdmp.Core.csproj
+1 −0 Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs
+13 −9 Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
+433 −429 Rdmp.UI/Rdmp.UI.csproj
+5 −5 Rdmp.UI/TestsAndSetup/StartupUI.cs
+1 −1 SharedAssemblyInfo.cs
+5 −5 Tests.Common/Tests.Common.csproj
+48 −50 Tools/rdmp/rdmp.csproj
+2 −1 directory.build.props
+2 −2 rdmp-client.xml
2 changes: 1 addition & 1 deletion ...lugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>LoadModules.Extensions.ReleasePlugins</AssemblyTitle>
<Product>LoadModules.Extensions.ReleasePlugins</Product>
Expand Down
2 changes: 1 addition & 1 deletion ...ules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>LoadModules.Extensions.StatsScriptsExecution</AssemblyTitle>
<Product>LoadModules.Extensions.StatsScriptsExecution</Product>
<Copyright>Copyright © 2018</Copyright>
Expand Down