Skip to content

Upgrade to net6 #77

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

Closed
wants to merge 12 commits into from
Closed

Upgrade to net6 #77

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
72792b9
run upgrade tool
nimrof Dec 22, 2023
ce955bc
included mshtml com to fix report view
nimrof Dec 22, 2023
9118132
replaced SourceGrid with SourceGrid-huanlin
nimrof Dec 22, 2023
38ddd38
removed problem code, did not see a difference
nimrof Dec 22, 2023
c61a1b8
Removed unused references
nimrof Dec 22, 2023
d57747d
upgraded the rest of the projects
nimrof Dec 22, 2023
af6effd
fixed documentation report ?
nimrof Dec 22, 2023
f3a578e
Fixed xunit.analyzers path
nimrof Dec 23, 2023
454f940
fix github action build
nimrof Dec 23, 2023
160d3bf
fixed package restore in github action
nimrof Dec 23, 2023
e913d10
Merge branch 'bugfix' into Net6.0
trojanobelix Feb 20, 2024
e9804c9
removed Remoting.Messaging for Net6.0
trojanobelix Feb 20, 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 .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# run: dotnet restore
- name: Add Packages
run: |
nuget install EDSEditorGUI/packages.config -OutputDirectory packages
dotnet restore
# nuget install Tests/packages.config -OutputDirectory packages
- name: Build
# run: make all # builds the Debug configuration
Expand Down
10 changes: 5 additions & 5 deletions EDSEditor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.329
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSEditorGUI", "EDSEditorGUI\EDSEditorGUI.csproj", "{13D2D8ED-242B-4283-BF14-AA79FE875F7C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EDSEditorGUI", "EDSEditorGUI\EDSEditorGUI.csproj", "{13D2D8ED-242B-4283-BF14-AA79FE875F7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libEDSsharp", "libEDSsharp\libEDSsharp.csproj", "{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libEDSsharp", "libEDSsharp\libEDSsharp.csproj", "{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{2A479BF3-7628-409B-8A29-9314C308445E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{2A479BF3-7628-409B-8A29-9314C308445E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSSharp", "EDSSharp\EDSSharp.csproj", "{8B7A7545-6257-44BF-8868-F429E1B72C77}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EDSSharp", "EDSSharp\EDSSharp.csproj", "{8B7A7545-6257-44BF-8868-F429E1B72C77}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
1 change: 0 additions & 1 deletion EDSEditorGUI/DevicePDOView2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ public void UpdatePDOinfo(bool updatechoices = true)


SourceGrid.Cells.Editors.ComboBox comboStandard = new SourceGrid.Cells.Editors.ComboBox(typeof(string), srray, false);
comboStandard.Control.DropDownWidth = 0x100;
comboStandard.Changed += ComboStandard_Changed;

//tableLayoutPanel1.SuspendLayout();
Expand Down
251 changes: 30 additions & 221 deletions EDSEditorGUI/EDSEditorGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{13D2D8ED-242B-4283-BF14-AA79FE875F7C}</ProjectGuid>
<TargetFramework>net6.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ODEditor</RootNamespace>
<AssemblyName>EDSEditor</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -27,28 +19,9 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<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' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Index_8287_16x.ico</ApplicationIcon>
Expand All @@ -57,183 +30,36 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>.\Microsoft.mshtml.dll</HintPath>
</Reference>
<Reference Include="SourceGrid, Version=4.40.4580.29115, Culture=neutral, PublicKeyToken=df6f5e538749e85d, processorArchitecture=MSIL">
<HintPath>..\packages\SourceGrid.4.4.0\lib\net35\SourceGrid.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DeviceInfoView.cs">
<Compile Update="DeviceInfoView.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DeviceInfoView.Designer.cs">
<DependentUpon>DeviceInfoView.cs</DependentUpon>
</Compile>
<Compile Include="DeviceODView.cs">
<Compile Update="DeviceODView.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DeviceODView.Designer.cs">
<DependentUpon>DeviceODView.cs</DependentUpon>
</Compile>
<Compile Include="DevicePDOView2.cs">
<Compile Update="DevicePDOView2.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DevicePDOView2.Designer.cs">
<DependentUpon>DevicePDOView2.cs</DependentUpon>
</Compile>
<Compile Include="DeviceView.cs">
<Compile Update="DeviceView.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DeviceView.Designer.cs">
<DependentUpon>DeviceView.cs</DependentUpon>
</Compile>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="ListViewEx.cs">
<Compile Update="ListViewEx.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ModuleInfo.cs">
<Compile Update="ModuleInfo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ModuleInfo.Designer.cs">
<DependentUpon>ModuleInfo.cs</DependentUpon>
</Compile>
<Compile Include="MyTabUserControl.cs">
<Compile Update="MyTabUserControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="InsertObjects.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="InsertObjects.Designer.cs">
<DependentUpon>InsertObjects.cs</DependentUpon>
</Compile>
<Compile Include="NewIndex.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="NewIndex.Designer.cs">
<DependentUpon>NewIndex.cs</DependentUpon>
</Compile>
<Compile Include="NewItem.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="NewItem.Designer.cs">
<DependentUpon>NewItem.cs</DependentUpon>
</Compile>
<Compile Include="Preferences.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Preferences.Designer.cs">
<DependentUpon>Preferences.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReportView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ReportView.Designer.cs">
<DependentUpon>ReportView.cs</DependentUpon>
</Compile>
<Compile Include="TableLayoutDB.cs">
<Compile Update="TableLayoutDB.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="UpdateODViewEventArgs.cs" />
<Compile Include="Warnings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Warnings.Designer.cs">
<DependentUpon>Warnings.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="DeviceInfoView.resx">
<DependentUpon>DeviceInfoView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DeviceODView.resx">
<DependentUpon>DeviceODView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevicePDOView2.resx">
<DependentUpon>DevicePDOView2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DeviceView.resx">
<DependentUpon>DeviceView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ModuleInfo.resx">
<DependentUpon>ModuleInfo.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyTabUserControl.resx">
<DependentUpon>MyTabUserControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InsertObjects.resx">
<DependentUpon>InsertObjects.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NewIndex.resx">
<DependentUpon>NewIndex.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NewItem.resx">
<DependentUpon>NewItem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Preferences.resx">
<DependentUpon>Preferences.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="ReportView.resx">
<DependentUpon>ReportView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Warnings.resx">
<DependentUpon>Warnings.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Profiles\DS301_profile.xpd">
<None Update="Profiles\DS301_profile.xpd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Profiles\DS401_profile.xpd" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\libEDSsharp\libEDSsharp.csproj">
<Project>{cc0fa4b1-2bfc-43b3-8c56-b428df2d24e7}</Project>
<Name>libEDSsharp</Name>
</ProjectReference>
<ProjectReference Include="..\libEDSsharp\libEDSsharp.csproj" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
Expand All @@ -247,6 +73,17 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<COMReference Include="MSHTML">
<WrapperTool>tlbimp</WrapperTool>
<VersionMinor>0</VersionMinor>
<VersionMajor>4</VersionMajor>
<Guid>3050f1c5-98b5-11cf-bb82-00aa00bdce0b</Guid>
<Lcid>0</Lcid>
<Isolated>false</Isolated>
<EmbedInteropTypes>true</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<Content Include="Index_8287_16x.ico" />
<Content Include="Profiles\DS301_profile_old.xml">
Expand All @@ -258,42 +95,14 @@
<EmbeddedResource Include="version.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<None Include="Resources\PrintSetup_11011.png" />
<None Include="Resources\Print_11009.png" />
<None Include="Resources\PrintPreviewControl_698.png" />
<None Include="Resources\Index_8287_16x.png" />
<None Include="Resources\GenericVSEditor_9905.png" />
<None Include="Resources\EventLog_5735.png" />
<None Include="Resources\ListBox_686.png" />
<None Include="Resources\notebook_16xLG.png" />
<None Include="Resources\move_to_bottom.png" />
<None Include="Resources\move_to_top.png" />
<Content Include="style.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\Remove_16xLG.png" />
<None Include="Resources\action_add_16xLG.png" />
<None Include="Resources\305_Close_16x16_72.png" />
<None Include="Resources\DriverTemplate_32x.png" />
<None Include="Resources\InsertColumn_5626.png" />
<None Include="Resources\ExporttoScript_9881.png" />
<None Include="Resources\Compile_191.png" />
<None Include="Resources\GenerateAll.png" />
<None Include="Resources\Close_6519.png" />
<None Include="Resources\Open_6529.png" />
<None Include="Resources\NewFile_6276.png" />
<None Include="Resources\Save_6530.png" />
<None Include="Resources\Save.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<PackageReference Include="SourceGrid-huanlin" Version="6.0.10" />
</ItemGroup>
<PropertyGroup>
<PreBuildEvent>git describe --tags --long --dirty &gt; "$(ProjectDir)version.txt" || exit 0</PreBuildEvent>
<PreBuildEvent>git describe --tags --long --dirty &gt; "$(MSBuildProjectDirectory)\version.txt" || exit 0</PreBuildEvent>
</PropertyGroup>
<!-- 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>
23 changes: 23 additions & 0 deletions EDSEditorGUI/EDSEditorGUI.csproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,27 @@
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
<ItemGroup>
<Compile Update="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="InsertObjects.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="NewIndex.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="NewItem.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Preferences.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="ReportView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Warnings.cs">
<SubType>Form</SubType>
</Compile>
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion EDSEditorGUI/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,6 @@ private void documentationToolStripMenuItem_Click(object sender, EventArgs e)
DocumentationGen docgen = new DocumentationGen();
docgen.genhtmldoc(temp, dv.eds);
docgen.genmddoc(temp2, dv.eds, this.gitVersion);
System.Diagnostics.Process.Start("file://" + temp2);
if (IsRunningOnMono())
{
System.Diagnostics.Process.Start("file://" + temp);
Expand Down
Loading