Skip to content

.net 9 conversion #8

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

Open
zdomokos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

.net 9 conversion #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: .NET

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,5 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

_attic_/
21 changes: 21 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#610017",
"activityBar.background": "#610017",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#1e8000",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#610017",
"statusBar.background": "#2e000b",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#610017",
"statusBarItem.remoteBackground": "#2e000b",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#2e000b",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#2e000b99",
"titleBar.inactiveForeground": "#e7e7e799"
}
}
220 changes: 13 additions & 207 deletions CommonTools/CommonTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,218 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6D83410F-1413-4671-994C-AF095C3E5937}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<TargetFramework>net9.0-windows</TargetFramework>
<RootNamespace>CommonTools</RootNamespace>
<AssemblyName>CommonTools</AssemblyName>
<StartupObject>
</StartupObject>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>e1f48c71</NuGetPackageImportStamp>
<UseWindowsForms>true</UseWindowsForms>
<Nullable>disable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableWindowsFormsProjectSetup>false</EnableWindowsFormsProjectSetup>
<NoWarn>WFO1000</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Compile Include="ColorPickerCtrl\ColorBar.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorListBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorPickerCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorPickerCtrl.Designer.cs">
<DependentUpon>ColorPickerCtrl.cs</DependentUpon>
</Compile>
<Compile Include="ColorPickerCtrl\ColorPickerDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorPickerDialog.Designer.cs">
<DependentUpon>ColorPickerDialog.cs</DependentUpon>
</Compile>
<Compile Include="ColorPickerCtrl\ColorTable.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorWheel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorWheelCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\ColorWheelCtrl.Designer.cs">
<DependentUpon>ColorWheelCtrl.cs</DependentUpon>
</Compile>
<Compile Include="ColorPickerCtrl\EyedropColorPicker.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ColorPickerCtrl\HSLColor.cs" />
<Compile Include="ColorPickerCtrl\Resources\Images.cs" />
<Compile Include="ComboBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DataBinding.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DropdownContainerControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Editors.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="LabelRotate.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Line.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="NameObject.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PropertyDialog\PropertyDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="PropertyDialog\PropertyDialog.Designer.cs">
<DependentUpon>PropertyDialog.cs</DependentUpon>
</Compile>
<Compile Include="PropertyDialog\PropertyDialogInterface.cs" />
<Compile Include="PropertyDialog\ViewMap.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="PropertyUtil.cs" />
<Compile Include="RadioButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Tracing.cs" />
<Compile Include="TreeList\TreeListColumn.cs" />
<Compile Include="TreeList\TreeListColumn.Design.cs" />
<Compile Include="TreeList\TreeListNode.cs" />
<Compile Include="TreeList\TreeListOptions.cs" />
<Compile Include="TreeList\TreeListPainter.cs" />
<Compile Include="TreeList\TreeListView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Util.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="ColorPickerCtrl\ColorPickerCtrl.resx">
<DependentUpon>ColorPickerCtrl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ColorPickerCtrl\ColorPickerDialog.resx">
<DependentUpon>ColorPickerDialog.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ColorPickerCtrl\ColorWheelCtrl.resx">
<DependentUpon>ColorWheelCtrl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="PropertyDialog\PropertyDialog.resx">
<DependentUpon>PropertyDialog.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="ColorPickerCtrl\ColorPickerTest.csproj" />
<Content Include="ColorPickerCtrl\ColorPickerTest.csproj.user" />
<EmbeddedResource Include="ColorPickerCtrl\Resources\colorbarIndicators.bmp" />
<EmbeddedResource Include="ColorPickerCtrl\Resources\eyedropper.bmp" />
<EmbeddedResource Include="ColorPickerCtrl\Resources\popupcontainerbuttons.bmp" />
</ItemGroup>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
<Visible>False</Visible>
<ProductName>.NET Framework 3.0 %28x86%29</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<Content Include="ColorPickerCtrl\ColorPickerTest.csproj" />
<Content Include="ColorPickerCtrl\ColorPickerTest.csproj.user" />
</ItemGroup>
</Project>
</Project>
4 changes: 0 additions & 4 deletions CommonTools/app.config
View file
Open in desktop

This file was deleted.

71 changes: 6 additions & 65 deletions DataProtection/DataProtection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D016458A-83FA-4A03-B79C-7A0A66C58656}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>DataProtection</RootNamespace>
<AssemblyName>DataProtection</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
<Nullable>disable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DataProtectionForRDPWrapper.cs" />
<Compile Include="DataProtector.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion Database/Controllers/Database.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class SQLiteDataSource
public void Initialize()
{
_db_name = ConfigurationManager.AppSettings["DatbaseFilepath"].ToString();
_db_name = System.IO.Path.Combine(System.Windows.Forms.Application.StartupPath, _db_name);
_db_name = System.IO.Path.Combine(AppContext.BaseDirectory, _db_name);

_connectionString = ConfigurationManager.AppSettings["connection"].ToString();
_connectionString = string.Format(_connectionString, _db_name);
Expand Down
Loading