Winify – Diff between revs 44 and 61
?pathlinks?
Rev 44 | Rev 61 | |||
---|---|---|---|---|
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, |
52 | using var fileStream = |
|
54 | cancellationToken)) |
53 | await Miscellaneous.GetFileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read, |
|
55 | { |
- | ||
56 | using (var xmlReader = XmlReader.Create(fileStream, |
54 | cancellationToken); |
|
Line 57... | Line 55... | |||
57 | settings)) |
55 | using var xmlReader = XmlReader.Create(fileStream, |
|
58 | { |
56 | settings); |
|
59 | var stringBuilder = new StringBuilder(); |
57 | var stringBuilder = new StringBuilder(); |
|
Line 69... | Line 67... | |||
69 | servers = |
67 | servers = |
|
70 | (T)xmlSerializer |
68 | (T)xmlSerializer |
|
71 | .Deserialize(stringReader); |
69 | .Deserialize(stringReader); |
|
72 | } |
70 | } |
|
73 | } |
71 | } |
|
74 | } |
- | ||
75 | } |
- | ||
76 | catch (Exception exception) |
72 | catch (Exception exception) |
|
77 | { |
73 | { |
|
78 | return new SerializationFailure(exception, validationEventArgs); |
74 | return new SerializationFailure(exception, validationEventArgs); |
|
79 | } |
75 | } |
|
80 | finally |
76 | finally |
|
Line 91... | Line 87... | |||
91 | { |
87 | { |
|
92 | var xmlSerializer = new XmlSerializer(typeof(T)); |
88 | var xmlSerializer = new XmlSerializer(typeof(T)); |
|
Line 93... | Line 89... | |||
93 | |
89 | |
|
94 | try |
90 | try |
|
95 | { |
91 | { |
|
96 | using (var memoryStream = new MemoryStream()) |
- | ||
97 | { |
92 | using var memoryStream = new MemoryStream(); |
|
98 | using (var xmlWriter = |
93 | using var xmlWriter = |
|
99 | XmlWriter.Create(memoryStream, |
94 | XmlWriter.Create(memoryStream, |
|
100 | new XmlWriterSettings |
95 | new XmlWriterSettings |
|
101 | { |
96 | { |
|
102 | Async = true, |
97 | Async = true, |
|
103 | Indent = true, |
98 | Indent = true, |
|
104 | IndentChars = " ", |
99 | IndentChars = " ", |
|
105 | OmitXmlDeclaration = false |
100 | OmitXmlDeclaration = false |
|
106 | })) |
- | ||
107 | { |
101 | }); |
|
108 | await xmlWriter.WriteDocTypeAsync(name, |
102 | await xmlWriter.WriteDocTypeAsync(name, |
|
109 | null, |
103 | null, |
|
110 | null, |
104 | null, |
|
Line 111... | Line 105... | |||
111 | subset); |
105 | subset); |
|
Line 112... | Line 106... | |||
112 | |
106 | |
|
113 | xmlSerializer.Serialize(xmlWriter, servers); |
107 | xmlSerializer.Serialize(xmlWriter, servers); |
|
114 | |
108 | |
|
115 | using (var fileStream = |
109 | using var fileStream = |
|
116 | await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write, |
- | ||
117 | FileShare.Write, |
110 | await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write, |
|
Line 118... | Line 111... | |||
118 | cancellationToken)) |
111 | FileShare.Write, |
|
119 | { |
112 | cancellationToken); |
|
120 | memoryStream.Position = 0L; |
- | ||
121 | |
- | ||
122 | await memoryStream.CopyToAsync(fileStream); |
- | ||
123 | } |
113 | memoryStream.Position = 0L; |
|
124 | } |
114 | |
|
125 | } |
115 | await memoryStream.CopyToAsync(fileStream); |
|
126 | } |
116 | } |