Winify – Diff between revs 30 and 38
?pathlinks?
Rev 30 | Rev 38 | |||
---|---|---|---|---|
Line 47... | Line 47... | |||
47 | |
47 | |
|
Line 48... | Line 48... | |||
48 | settings.ValidationEventHandler += XmlReaderSettingsValidationEventHandler; |
48 | settings.ValidationEventHandler += XmlReaderSettingsValidationEventHandler; |
|
Line 49... | Line 49... | |||
49 | |
49 | |
|
50 | settings.Schemas.Add(targetNamespace, schemeUri); |
50 | settings.Schemas.Add(targetNamespace, schemeUri); |
|
51 | |
51 | |
|
52 | using var fileStream = |
- | ||
53 | await Miscellaneous.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, |
- | ||
54 | cancellationToken); |
- | ||
55 | |
- | ||
56 | using var xmlReader = XmlReader.Create(fileStream, |
- | ||
57 | settings); |
- | ||
58 | |
- | ||
59 | var stringBuilder = new StringBuilder(); |
52 | using (var fileStream = |
|
60 | |
53 | await Miscellaneous.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, |
|
61 | using (var stringWriter = new StringWriter(stringBuilder)) |
54 | cancellationToken)) |
|
62 | { |
55 | { |
|
- | 56 | using (var xmlReader = XmlReader.Create(fileStream, |
||
Line 63... | Line 57... | |||
63 | while (await xmlReader.ReadAsync()) |
57 | settings)) |
|
- | 58 | { |
||
- | 59 | var stringBuilder = new StringBuilder(); |
||
- | 60 | |
||
- | 61 | using (var stringWriter = new StringWriter(stringBuilder)) |
||
Line -... | Line 62... | |||
- | 62 | { |
||
64 | await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync()); |
63 | while (await xmlReader.ReadAsync()) |
|
- | 64 | await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync()); |
||
65 | } |
65 | } |
|
66 | |
66 | |
|
- | 67 | using (var stringReader = new StringReader(stringBuilder.ToString())) |
||
- | 68 | { |
||
- | 69 | servers = |
||
67 | using var stringReader = new StringReader(stringBuilder.ToString()); |
70 | (T)xmlSerializer |
|
68 | |
71 | .Deserialize(stringReader); |
|
69 | servers = |
72 | } |
|
70 | (T)xmlSerializer |
73 | } |
|
71 | .Deserialize(stringReader); |
74 | } |
|
Line 88... | Line 91... | |||
88 | { |
91 | { |
|
89 | var xmlSerializer = new XmlSerializer(typeof(T)); |
92 | var xmlSerializer = new XmlSerializer(typeof(T)); |
|
Line 90... | Line 93... | |||
90 | |
93 | |
|
91 | try |
94 | try |
|
92 | { |
95 | { |
|
- | 96 | using (var memoryStream = new MemoryStream()) |
||
93 | using var memoryStream = new MemoryStream(); |
97 | { |
|
94 | using var xmlWriter = |
98 | using (var xmlWriter = |
|
95 | XmlWriter.Create(memoryStream, |
99 | XmlWriter.Create(memoryStream, |
|
- | 100 | new XmlWriterSettings |
||
- | 101 | { |
||
- | 102 | Async = true, |
||
- | 103 | Indent = true, |
||
- | 104 | IndentChars = " ", |
||
- | 105 | OmitXmlDeclaration = false |
||
- | 106 | })) |
||
- | 107 | { |
||
- | 108 | await xmlWriter.WriteDocTypeAsync(name, |
||
- | 109 | null, |
||
- | 110 | null, |
||
- | 111 | subset); |
||
- | 112 | |
||
- | 113 | xmlSerializer.Serialize(xmlWriter, servers); |
||
- | 114 | |
||
- | 115 | using (var fileStream = |
||
- | 116 | await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write, |
||
- | 117 | FileShare.Write, |
||
96 | new XmlWriterSettings |
118 | cancellationToken)) |
|
97 | { |
- | ||
98 | Async = true, |
- | ||
99 | Indent = true, |
- | ||
100 | IndentChars = " ", |
119 | { |
|
101 | OmitXmlDeclaration = false |
- | ||
102 | }); |
- | ||
103 | await xmlWriter.WriteDocTypeAsync(name, |
- | ||
104 | null, |
- | ||
105 | null, |
- | ||
106 | subset); |
- | ||
107 | |
- | ||
108 | xmlSerializer.Serialize(xmlWriter, servers); |
- | ||
109 | |
- | ||
110 | using var fileStream = |
- | ||
111 | await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write, FileShare.Write, |
- | ||
Line 112... | Line 120... | |||
112 | cancellationToken); |
120 | memoryStream.Position = 0L; |
|
113 | |
- | ||
114 | memoryStream.Position = 0L; |
121 | |
|
- | 122 | await memoryStream.CopyToAsync(fileStream); |
||
- | 123 | } |
||
115 | |
124 | } |
|
116 | await memoryStream.CopyToAsync(fileStream); |
125 | } |
|
117 | } |
126 | } |
|
118 | catch (Exception exception) |
127 | catch (Exception exception) |
|
119 | { |
128 | { |