Skip to content

Commit 05daa2e

Browse files
trojanobelixtrojanobelix
authored
Merge pull request #146 from CANopenNode/changed_net6_to_net8
Replace .net6 with .net8
2 parents c726e46 + 11b8eff commit 05daa2e

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
dotnet: [net481, net6]
13+
dotnet: [net481, net8]
1414
configuration: [Debug, Release]
1515

1616
runs-on: windows-latest

‎EDSEditorGUI/EDSEditorGUI.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0-windows</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0-windows</TargetFrameworks>
66
<OutputType>WinExe</OutputType>
77
<RootNamespace>ODEditor</RootNamespace>
88
<AssemblyName>EDSEditor</AssemblyName>
@@ -99,8 +99,8 @@
9999
<ItemGroup>
100100
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
101101
<PackageReference Include="SourceGrid" Version="4.4.0" Condition="'$(TargetFramework)' == 'net481'"/>
102-
<PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
103-
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0-windows'"/>
102+
<PackageReference Include="SourceGrid-huanlin" Version="6.0.10" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
103+
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'"/>
104104
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
105105
</ItemGroup>
106106
<PropertyGroup>

‎EDSSharp/EDSSharp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>

‎Tests/Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>

‎libEDSsharp/CanOpenXDD_1_1.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ public EDSsharp ReadProtobuf(string file, bool json)
229229
{
230230
var parserConfig = new JsonParser.Settings(100);
231231
var parser = new JsonParser(parserConfig);
232-
devCanOpen = parser.Parse<CanOpenDevice>(File.ReadAllText(file));
232+
devCanOpen = parser.Parse<CanOpenDevice>(System.IO.File.ReadAllText(file));
233233
}
234234
else
235235
{
236-
using (var input = File.OpenRead(file))
236+
using (var input = System.IO.File.OpenRead(file))
237237
{
238238
devCanOpen = CanOpenDevice.Parser.ParseFrom(input);
239239
}
@@ -263,11 +263,11 @@ public void WriteProtobuf(string file, EDSsharp eds, bool json)
263263
var formatterConfig = new JsonFormatter.Settings(true).WithIndentation().WithFormatDefaultValues(true);
264264
var formatter = new JsonFormatter(formatterConfig);
265265
var rawJsonString = formatter.Format(dev);
266-
File.WriteAllText(file, rawJsonString);
266+
System.IO.File.WriteAllText(file, rawJsonString);
267267
}
268268
else
269269
{
270-
using (var output = File.Create(file))
270+
using (var output = System.IO.File.Create(file))
271271
{
272272
dev.WriteTo(output);
273273
}

‎libEDSsharp/CanOpenXSD_1_0.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4999,14 +4999,14 @@ public bool numberSpecified
49994999
public partial class dictionary
50005000
{
50015001

5002-
private file fileField;
5002+
private File fileField;
50035003

50045004
private string langField;
50055005

50065006
private string dictIDField;
50075007

50085008
/// <remarks/>
5009-
public file file
5009+
public File file
50105010
{
50115011
get
50125012
{
@@ -5054,7 +5054,7 @@ public string dictID
50545054
[System.ComponentModel.DesignerCategoryAttribute("code")]
50555055
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://www.canopen.org/xml/1.0")]
50565056
[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.canopen.org/xml/1.0", IsNullable = false)]
5057-
public partial class file
5057+
public partial class File
50585058
{
50595059

50605060
private string uRIField;

‎libEDSsharp/CanOpenXSD_1_1.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4357,10 +4357,10 @@ public bool multipleChilds {
43574357
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.canopen.org/xml/1.1", IsNullable=false)]
43584358
public partial class fileList {
43594359

4360-
private file fileField;
4360+
private File fileField;
43614361

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

43824382
private string uRIField;
43834383

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

4870-
private file fileField;
4870+
private File fileField;
48714871

48724872
private string langField;
48734873

48744874
private string dictIDField;
48754875

48764876
/// <remarks/>
4877-
public file file {
4877+
public File file {
48784878
get {
48794879
return this.fileField;
48804880
}

‎libEDSsharp/libEDSsharp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="AssignInformationalVersion">
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(BuildNet6)' == 'true'">net6.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net481;net8.0</TargetFrameworks>
66
<OutputType>Library</OutputType>
77
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
88

@@ -44,7 +44,7 @@
4444
</EmbeddedResource>
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="System.CodeDom" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
47+
<PackageReference Include="System.CodeDom" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
4848
<PackageReference Include="Google.Protobuf" Version="3.27.2" />
4949
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.2" />
5050
</ItemGroup>

0 commit comments

Comments
 (0)