Skip to content

Commit a25d4c4

Browse files
committed
.slnx support and bug fix
- Added support for using the new XML format solution files (.slnx) as documentation sources. - Fixed XML reader creation to consistently close the files so that they don't remain open and cause subsequent builds to fail because they can't be replaced.
1 parent fad3a54 commit a25d4c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+578
-234
lines changed

.editorconfig

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,24 +203,6 @@ dotnet_diagnostic.CA1303.severity = none
203203
# IDE0010: Add missing cases
204204
dotnet_diagnostic.IDE0010.severity = none
205205

206-
# IDE0032: Use auto property
207-
dotnet_diagnostic.IDE0032.severity = none
208-
209-
# IDE0045: Convert to conditional expression
210-
dotnet_diagnostic.IDE0045.severity = none
211-
212-
# IDE0046: Convert to conditional expression
213-
dotnet_diagnostic.IDE0046.severity = none
214-
215-
# IDE0047: Remove unnecessary parentheses
216-
dotnet_diagnostic.IDE0047.severity = none
217-
218-
# IDE0055: Fix formatting
219-
dotnet_diagnostic.IDE0055.severity = none
220-
221-
# IDE0058: Expression value is never used
222-
dotnet_diagnostic.IDE0058.severity = none
223-
224206
# IDE1006: Naming Styles
225207
dotnet_diagnostic.IDE1006.severity = none
226208

@@ -255,6 +237,7 @@ dotnet_diagnostic.CA1846.severity = none
255237
csharp_style_var_elsewhere = false:none
256238
csharp_style_var_for_built_in_types = false:none
257239
csharp_style_var_when_type_is_apparent = false:none
240+
csharp_style_prefer_primary_constructors = false:none
258241

259242
csharp_style_expression_bodied_accessors = true:suggestion
260243
csharp_style_expression_bodied_constructors = false:none

SHFB/Source/BuildAssembler/BuildComponents/Commands/IndexedCache.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ private XPathDocument LoadXmlCommentsFile(string filename)
179179

180180
try
181181
{
182-
document = new XPathDocument(XmlReader.Create(filename, new XmlReaderSettings { CloseInput = true }));
182+
using(var rdr = XmlReader.Create(filename, new XmlReaderSettings { CloseInput = true }))
183+
{
184+
document = new XPathDocument(rdr);
185+
}
183186

184187
// For XML comments files, some versions of the framework redirect the comments files to a
185188
// common location.
@@ -206,7 +209,12 @@ private XPathDocument LoadXmlCommentsFile(string filename)
206209
document = null;
207210
}
208211
else
209-
document = new XPathDocument(XmlReader.Create(path, new XmlReaderSettings { CloseInput = true }));
212+
{
213+
using(var rdr = XmlReader.Create(path, new XmlReaderSettings { CloseInput = true }))
214+
{
215+
document = new XPathDocument(rdr);
216+
}
217+
}
210218
}
211219
}
212220
catch(IOException e)

SHFB/Source/BuildAssembler/BuildComponents/CopyFromFileComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public override void Initialize(XPathNavigator configuration)
9595
// Load a schema, if one is specified
9696
string schemaFile = dataNode.GetAttribute("schema", String.Empty);
9797

98-
XmlReaderSettings settings = new XmlReaderSettings();
98+
XmlReaderSettings settings = new XmlReaderSettings { CloseInput = true };
9999

100100
if(!String.IsNullOrWhiteSpace(schemaFile))
101101
settings.Schemas.Add(null, schemaFile);

SHFB/Source/BuildAssembler/BuildComponents/ExampleComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private void LoadContent(string file)
9696

9797
try
9898
{
99-
XmlReaderSettings settings = new XmlReaderSettings { CheckCharacters = false };
99+
XmlReaderSettings settings = new XmlReaderSettings { CheckCharacters = false, CloseInput = true };
100100
XmlReader reader = XmlReader.Create(file, settings);
101101

102102
try

SHFB/Source/BuildAssembler/BuildComponents/IntelliSenseComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ private void WriteComments()
392392
if(!writers.TryGetValue(comments.AssemblyName, out XmlWriter writer))
393393
{
394394
fullPath = Path.Combine(outputFolder, comments.AssemblyName + ".xml");
395-
XmlWriterSettings settings = new XmlWriterSettings { Indent = true };
395+
XmlWriterSettings settings = new XmlWriterSettings { Indent = true, CloseOutput = true };
396396

397397
try
398398
{

SHFB/Source/BuildAssembler/BuildComponents/SaveComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override BuildComponentCore Create()
5353
#region Private data members
5454
//=====================================================================
5555

56-
private readonly XmlWriterSettings settings = new XmlWriterSettings();
56+
private readonly XmlWriterSettings settings = new XmlWriterSettings { CloseOutput = true };
5757
private XPathExpression pathExpression, selectExpression;
5858

5959
private string basePath, groupId;

SHFB/Source/BuildAssembler/BuildComponents/SharedContentComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private void LoadContent(string file)
258258

259259
try
260260
{
261-
using(XmlReader reader = XmlReader.Create(file))
261+
using(XmlReader reader = XmlReader.Create(file, new XmlReaderSettings { CloseInput = true }))
262262
{
263263
reader.MoveToContent();
264264

SHFB/Source/BuildAssembler/BuildComponents/Targets/TargetTypeDictionary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void DumpTargetDictionary(string targetsFile)
264264
{
265265
LinkTextResolver resolver = new LinkTextResolver(this);
266266

267-
XmlWriterSettings settings = new XmlWriterSettings { Indent = true };
267+
XmlWriterSettings settings = new XmlWriterSettings { Indent = true, CloseOutput = true };
268268

269269
using(XmlWriter writer = XmlWriter.Create(targetsFile, settings))
270270
{

SHFB/Source/BuildAssembler/SyntaxComponents/XamlUsageSyntax.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private void ParseDocument(string file)
232232
{
233233
try
234234
{
235-
using(var xr = XmlReader.Create(file, new XmlReaderSettings()))
235+
using(var xr = XmlReader.Create(file, new XmlReaderSettings { CloseInput = true }))
236236
{
237237
XPathDocument document = new XPathDocument(xr);
238238

SHFB/Source/CodeColorizer/ColorizerLibrary/CodeColorizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ private void BuildSyntax()
11211121
{
11221122
XmlNode needBuildNode, highlightNode;
11231123

1124-
using(var reader = XmlReader.Create(this.LanguageSyntaxFileName, new XmlReaderSettings()))
1124+
using(var reader = XmlReader.Create(this.LanguageSyntaxFileName, new XmlReaderSettings { CloseInput = true }))
11251125
{
11261126
languageSyntax.Load(reader);
11271127
}

0 commit comments

Comments
 (0)