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

Replace .net6 with .net8 #146

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Replace .net6 with .net8 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edbf22a
changed project files
nimrof Nov 10, 2024
909607a
fixed use of .net8 reserved names
nimrof Nov 10, 2024
11b8eff
changed github action
nimrof Nov 10, 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 @@ -10,7 +10,7 @@ jobs:
build:
strategy:
matrix:
dotnet: [net481, net6]
dotnet: [net481, net8]
configuration: [Debug, Release]

runs-on: windows-latest
Expand Down
8 changes: 4 additions & 4 deletions EDSEditorGUI/EDSEditorGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>ODEditor</RootNamespace>
<AssemblyName>EDSEditor</AssemblyName>
Expand Down Expand Up @@ -99,8 +99,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'"/>
<PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
<PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions EDSSharp/EDSSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions libEDSsharp/CanOpenXDD_1_1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ public EDSsharp ReadProtobuf(string file, bool json)
{
var parserConfig = new JsonParser.Settings(100);
var parser = new JsonParser(parserConfig);
devCanOpen = parser.Parse<CanOpenDevice>(File.ReadAllText(file));
devCanOpen = parser.Parse<CanOpenDevice>(System.IO.File.ReadAllText(file));
}
else
{
using (var input = File.OpenRead(file))
using (var input = System.IO.File.OpenRead(file))
{
devCanOpen = CanOpenDevice.Parser.ParseFrom(input);
}
Expand Down Expand Up @@ -263,11 +263,11 @@ public void WriteProtobuf(string file, EDSsharp eds, bool json)
var formatterConfig = new JsonFormatter.Settings(true).WithIndentation().WithFormatDefaultValues(true);
var formatter = new JsonFormatter(formatterConfig);
var rawJsonString = formatter.Format(dev);
File.WriteAllText(file, rawJsonString);
System.IO.File.WriteAllText(file, rawJsonString);
}
else
{
using (var output = File.Create(file))
using (var output = System.IO.File.Create(file))
{
dev.WriteTo(output);
}
Expand Down
6 changes: 3 additions & 3 deletions libEDSsharp/CanOpenXSD_1_0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class version

Check warning on line 1270 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'version' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 1270 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'version' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private versionVersionType versionTypeField;
Expand Down Expand Up @@ -4620,7 +4620,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class capabilities

Check warning on line 4623 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'capabilities' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4623 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'capabilities' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private characteristicsList[] characteristicsListField;
Expand Down Expand Up @@ -4734,7 +4734,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class characteristic

Check warning on line 4737 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'characteristic' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4737 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'characteristic' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private characteristicName characteristicNameField;
Expand Down Expand Up @@ -4918,7 +4918,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class picture

Check warning on line 4921 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'picture' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4921 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'picture' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private object[] itemsField;
Expand Down Expand Up @@ -4996,17 +4996,17 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class dictionary

Check warning on line 4999 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'dictionary' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4999 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'dictionary' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private file fileField;
private File fileField;

private string langField;

private string dictIDField;

/// <remarks/>
public file file
public File file
{
get
{
Expand Down Expand Up @@ -5054,7 +5054,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class file
public partial class File
{

private string uRIField;
Expand Down Expand Up @@ -5260,7 +5260,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class array

Check warning on line 5263 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'array' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 5263 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'array' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private object[] itemsField;
Expand Down Expand Up @@ -5390,7 +5390,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
public partial class subrange

Check warning on line 5393 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'subrange' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 5393 in libEDSsharp/CanOpenXSD_1_0.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'subrange' only contains lower-cased ascii characters. Such names may become reserved for the language.
{

private long lowerLimitField;
Expand Down
10 changes: 5 additions & 5 deletions libEDSsharp/CanOpenXSD_1_1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.canopen.org/xml/1.1")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class version {

Check warning on line 1088 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'version' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 1088 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'version' only contains lower-cased ascii characters. Such names may become reserved for the language.

private versionVersionType versionTypeField;

Expand Down Expand Up @@ -4357,10 +4357,10 @@
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class fileList {

private file fileField;
private File fileField;

/// <remarks/>
public file file {
public File file {
get {
return this.fileField;
}
Expand All @@ -4377,7 +4377,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.canopen.org/xml/1.1")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class file {
public partial class File {

private string uRIField;

Expand Down Expand Up @@ -4546,7 +4546,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.canopen.org/xml/1.1")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class capabilities {

Check warning on line 4549 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'capabilities' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4549 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'capabilities' only contains lower-cased ascii characters. Such names may become reserved for the language.

private characteristicsList[] characteristicsListField;

Expand Down Expand Up @@ -4643,7 +4643,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.canopen.org/xml/1.1")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class characteristic {

Check warning on line 4646 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Debug) 

The type name 'characteristic' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 4646 in libEDSsharp/CanOpenXSD_1_1.cs

View workflow job for this annotation

GitHub Actions / build (net8, Release) 

The type name 'characteristic' only contains lower-cased ascii characters. Such names may become reserved for the language.

private characteristicName characteristicNameField;

Expand Down Expand Up @@ -4867,14 +4867,14 @@
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
public partial class dictionary {

private file fileField;
private File fileField;

private string langField;

private string dictIDField;

/// <remarks/>
public file file {
public File file {
get {
return this.fileField;
}
Expand Down
6 changes: 3 additions & 3 deletions libEDSsharp/libEDSsharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="AssignInformationalVersion">
<PropertyGroup>
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>

Expand Down Expand Up @@ -44,7 +44,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.CodeDom" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageReference Include="System.CodeDom" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Google.Protobuf" Version="3.27.2" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.2" />
</ItemGroup>
Expand Down
Loading