Skip to content

Commit 909607a

Browse files
committed
fixed use of .net8 reserved names
1 parent edbf22a commit 909607a

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

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
}

0 commit comments

Comments
 (0)