Merge pull request #146 from CANopenNode/changed_net6_to_net8

Replace .net6 with .net8
CANopenNode · Nov 11, 2024 · 05daa2e · 05daa2e
2 parents c726e46 + 11b8eff
commit 05daa2e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        dotnet: [net481, net6]
+        dotnet: [net481, net8]
         configuration: [Debug, Release]
 
     runs-on: windows-latest

diff --git a/EDSEditorGUI/EDSEditorGUI.csproj b/EDSEditorGUI/EDSEditorGUI.csproj
@@ -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>
@@ -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>

diff --git a/EDSSharp/EDSSharp.csproj b/EDSSharp/EDSSharp.csproj
@@ -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>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -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>

diff --git a/libEDSsharp/CanOpenXDD_1_1.cs b/libEDSsharp/CanOpenXDD_1_1.cs
@@ -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);
                 }
@@ -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);
                 }

diff --git a/libEDSsharp/CanOpenXSD_1_0.cs b/libEDSsharp/CanOpenXSD_1_0.cs
@@ -4999,14 +4999,14 @@ public bool numberSpecified
     public partial class dictionary
     {
 
-        private file fileField;
+        private File fileField;
 
         private string langField;
 
         private string dictIDField;
 
         /// <remarks/>
-        public file file
+        public File file
         {
             get
             {
@@ -5054,7 +5054,7 @@ public string dictID
     [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;

diff --git a/libEDSsharp/CanOpenXSD_1_1.cs b/libEDSsharp/CanOpenXSD_1_1.cs
@@ -4357,10 +4357,10 @@ public bool multipleChilds {
     [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;
             }
@@ -4377,7 +4377,7 @@ public file file {
     [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;
 
@@ -4867,14 +4867,14 @@ public bool numberSpecified {
     [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;
             }

diff --git a/libEDSsharp/libEDSsharp.csproj b/libEDSsharp/libEDSsharp.csproj
@@ -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>
 
@@ -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>