Skip to content

Commit

Permalink
Build using .Net 9 SDK rather than 8 (HicServices#2078)
Browse files Browse the repository at this point in the history
* Switch from .Net 8 to 9, update YAML files accordingly
* Fix up WFO1000 errors
* Update paths for .Net 9 rather than 8
* Update CHANGELOG.md

---------

Co-authored-by: James A Sutherland <>
  • Loading branch information
jas88 authored Dec 12, 2024
1 parent 5851dfa commit 20e6ece
Show file tree
Hide file tree
Showing 87 changed files with 285 additions and 31 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ updates:
aws-sdk:
patterns:
- "AWSSDK.*"
- package-ecosystem: "dotnet-sdk"
directory: "/"
schedule:
interval: weekly
18 changes: 10 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/[email protected]
- name: Populate Databases.yaml
shell: bash
run: |
Expand Down Expand Up @@ -173,14 +175,14 @@ jobs:
- name: Temporary Bundle of ddls for auto-updater
shell: bash
run: |
cp -r Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/runtimes ./PublishWinForms
cp -r Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/x64 ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/D3DCompiler_47_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/PenImc_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/PresentationNative_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/vcruntime140_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/WebView2Loader.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net8.0-windows/win-x64/wpfgfx_cor3.dll ./PublishWinForms
cp -r Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/runtimes ./PublishWinForms
cp -r Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/x64 ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/D3DCompiler_47_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/PenImc_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/PresentationNative_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/vcruntime140_cor3.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/WebView2Loader.dll ./PublishWinForms
cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/wpfgfx_cor3.dll ./PublishWinForms
- name: Install Plugins
shell: bash
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: setup .NET
uses: actions/[email protected]

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
4 changes: 3 additions & 1 deletion Application/ResearchDataManagementPlatform/RDMPMainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -81,7 +82,7 @@ public RDMPMainForm()
WindowState = FormWindowState.Maximized;
CloseOnEscape = false;

if (UserSettings.LicenseAccepted != new License("LIBRARYLICENSES").GetHashOfLicense())
if (UserSettings.LicenseAccepted != new WindowManagement.Licenses.License("LIBRARYLICENSES").GetHashOfLicense())
new LicenseUI().ShowDialog();
}

Expand Down Expand Up @@ -163,6 +164,7 @@ private void RDMPMainForm_Load(object sender, EventArgs e)
Loading = false;
}

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public override string Text
{
get => base.Text;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{550988FD-F1FA-41D8-BE0F-00B4DE47D320}</ProjectGuid>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
Expand Down
7 changes: 7 additions & 0 deletions Application/ResearchDataManagementPlatform/Theme/Themes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System.ComponentModel;
using System.Globalization;
using System.Windows.Forms;
using Rdmp.UI.Theme;
Expand All @@ -16,6 +17,8 @@ namespace ResearchDataManagementPlatform.Theme;
public class MyVS2015BlueTheme : VS2015BlueTheme, ITheme
{
private ThemeExtender _extender;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool ApplyThemeToMenus { get; set; }

public MyVS2015BlueTheme()
Expand All @@ -40,6 +43,8 @@ public MyVS2015BlueTheme()
public class MyVS2015DarkTheme : VS2015DarkTheme, ITheme
{
private ThemeExtender _extender;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool ApplyThemeToMenus { get; set; }

public MyVS2015DarkTheme()
Expand All @@ -64,6 +69,8 @@ public MyVS2015DarkTheme()
public class MyVS2015LightTheme : VS2015LightTheme, ITheme
{
private ThemeExtender _extender;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool ApplyThemeToMenus { get; set; }

public MyVS2015LightTheme()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System.ComponentModel;
using System.Windows.Forms;
using Rdmp.Core.CommandExecution;
using Rdmp.Core.Curation.Data;
Expand All @@ -28,6 +29,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.
[TechnicalUI]
public class PersistableSingleDatabaseObjectDockContent : RDMPSingleControlTab
{
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IMapsDirectlyToDatabaseTable DatabaseObject { get; private set; }

public const string Prefix = "RDMPSingleDatabaseObjectControl";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Text;
using System.Windows.Forms;
using Rdmp.Core.Curation.Data.Dashboarding;
Expand All @@ -26,6 +27,7 @@ public class RDMPSingleControlTab : DockContent, IRefreshBusSubscriber
/// <summary>
/// The control hosted on this tab
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Control Control { get; protected set; }

public const string BasicPrefix = "BASIC";
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

- Build on and target .Net 9 rather than 8

## [8.4.1] - 2024-12-10

- Improve Overview Model Generation Speed
Expand Down
9 changes: 5 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<PropertyGroup>
<LangVersion>11.0</LangVersion>
<Version>8.4.0</Version>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<NoWarn>NU1902;NU1903;NU1904;1701;1702;CS1591;NU1701;CA1416</NoWarn>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<Product>Rdmp.Core.Tests</Product>
<Copyright>Copyright © 2019</Copyright>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>net8.0</TargetFramework>
<DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion Rdmp.Core/Rdmp.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<description>Core package for plugin development</description>
<copyright>Copyright 2018-2019</copyright>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
Expand Down
5 changes: 2 additions & 3 deletions Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols>
<NoWarn>NU1701</NoWarn>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
<NoWarn>$(NoWarn);NU1701;SYSLIB0011</NoWarn>
<GenerateResourceWarnOnBinaryFormatterUse>false</GenerateResourceWarnOnBinaryFormatterUse>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions Rdmp.UI/AggregationUIs/AggregateGraphUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,13 @@ public partial class AggregateGraphUI : AggregateGraph_Design
/// the sensible decision is taken e.g. to not try to render.
///
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool Silent { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Scintilla QueryEditor { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public int Timeout
{
get => _timeoutControls.Timeout;
Expand Down Expand Up @@ -166,8 +169,13 @@ public void AbortLoadGraph()
llCancel.Visible = false;
}

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Exception Exception { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool Crashed { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool Done { get; private set; }

private Task _loadTask;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;

Expand All @@ -30,12 +31,22 @@ public ConsequenceBar()
public static Color HasValuesColor = Color.Black;
public static Color IsNullColor = Color.LightGray;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Correct { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Invalid { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Missing { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Wrong { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double DBNull { get; set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public string Label { get; set; }

protected override void OnPaintBackground(PaintEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Windows.Forms;
using Rdmp.Core.DataQualityEngine.Data;

Expand All @@ -19,6 +20,8 @@ namespace Rdmp.UI.CatalogueSummary.DataQualityReporting.SubComponents;
public partial class DQEPivotCategorySelector : UserControl
{
public event Action PivotCategorySelectionChanged;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public string SelectedPivotCategory { get; private set; }

public DQEPivotCategorySelector()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
Expand All @@ -31,6 +32,7 @@ public EvaluationTrackBar()
}


[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Evaluation[] Evaluations
{
get => _evaluations;
Expand Down
1 change: 1 addition & 0 deletions Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ namespace Rdmp.UI.CatalogueSummary.LoadEvents;
/// </summary>
public partial class LoadEventsTreeView : RDMPUserControl, IObjectCollectionControl
{
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public LoadEventsTreeViewObjectCollection Collection { get; set; }

private BackgroundWorker _populateLoadHistory = new();
Expand Down
3 changes: 3 additions & 0 deletions Rdmp.UI/CatalogueSummary/LoadEvents/ResolveFatalErrors.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Linq;
using Rdmp.Core.Logging;
using Rdmp.Core.Logging.PastEvents;
Expand All @@ -28,6 +29,8 @@ public partial class ResolveFatalErrors : RDMPForm
{
private readonly LogManager _logManager;
private readonly ArchivalFatalError[] _toResolve;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Scintilla Explanation { get; set; }

public ResolveFatalErrors(IActivateItems activator, LogManager logManager, ArchivalFatalError[] toResolve) :
Expand Down
4 changes: 4 additions & 0 deletions Rdmp.UI/ChecksUI/ChecksUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

using System;
using System.Collections.Concurrent;
using System.ComponentModel;
using System.Drawing;
using System.Threading;
using System.Windows.Forms;
Expand Down Expand Up @@ -123,7 +124,10 @@ private Bitmap ImageGetter(object rowObject)
};
}

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool CheckingInProgress { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool AllowsYesNoToAll { get; set; }

private Timer _timer;
Expand Down
2 changes: 2 additions & 0 deletions Rdmp.UI/ChecksUI/RAGSmiley.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Threading.Tasks;
Expand All @@ -19,6 +20,7 @@ public partial class RAGSmiley : UserControl, IRAGSmiley
{
private bool _alwaysShowHandCursor;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool AlwaysShowHandCursor
{
get => _alwaysShowHandCursor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.ComponentModel;
using System.Windows.Forms;
using Rdmp.Core.CohortCommitting;
using Rdmp.Core.DataExport.Data;
Expand Down Expand Up @@ -53,9 +54,13 @@ protected override void OnLoad(EventArgs e)
Activator.RepositoryLocator.DataExportRepository, false);
}

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public CreateNewCohortDatabaseWizard Wizard { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public PrivateIdentifierPrototype PrivateIdentifierPrototype { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public ExternalCohortTable ExternalCohortTableCreatedIfAny { get; private set; }

private void btnDiscoverExtractionIdentifiers_Click(object sender, EventArgs e)
Expand Down
Loading

0 comments on commit 20e6ece

Please sign in to comment.