Winify – Diff between revs 44 and 61

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
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();
60   58  
61 using (var stringWriter = new StringWriter(stringBuilder)) 59 using (var stringWriter = new StringWriter(stringBuilder))
Line 62... Line 60...
62 { 60 {
63 while (await xmlReader.ReadAsync()) 61 while (await xmlReader.ReadAsync())
64 await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync()); 62 await stringWriter.WriteAsync(await xmlReader.ReadOuterXmlAsync());
65 } 63 }
66   64  
67 using (var stringReader = new StringReader(stringBuilder.ToString())) -  
68 { -  
69 servers = 65 using (var stringReader = new StringReader(stringBuilder.ToString()))
70 (T)xmlSerializer 66 {
71 .Deserialize(stringReader); 67 servers =
72 } 68 (T)xmlSerializer
73 } 69 .Deserialize(stringReader);
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 -  
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, -  
118 cancellationToken)) 95 new XmlWriterSettings
-   96 {
-   97 Async = true,
-   98 Indent = true,
-   99 IndentChars = " ",
-   100 OmitXmlDeclaration = false
-   101 });
-   102 await xmlWriter.WriteDocTypeAsync(name,
-   103 null,
-   104 null,
-   105 subset);
-   106  
-   107 xmlSerializer.Serialize(xmlWriter, servers);
-   108  
-   109 using var fileStream =
-   110 await Miscellaneous.GetFileStream(file, FileMode.Create, FileAccess.Write,
-   111 FileShare.Write,
119 { 112 cancellationToken);
Line 120... Line 113...
120 memoryStream.Position = 0L; 113 memoryStream.Position = 0L;
121   -  
122 await memoryStream.CopyToAsync(fileStream); -  
123 } -  
124 } 114  
125 } 115 await memoryStream.CopyToAsync(fileStream);
126 } 116 }
127 catch (Exception exception) 117 catch (Exception exception)
128 { 118 {