Skip to content

Commit b769d48

Browse files
committed
Merge branch 'RemoveBom' of https://github.com/ahsonkhan/ReportGenerator into develop
2 parents 3e49288 + 8cea3a1 commit b769d48

File tree

7 files changed

+74
-6
lines changed

7 files changed

+74
-6
lines changed

src/Readme.txt

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ CHANGELOG
6666
4.6.6.0
6767

6868
* New: #379: Added setting to allow saving report types to different directories
69+
* New: #380: Removed UTF-8 BOM from all generated XML files
6970

7071
4.6.5.0
7172

src/ReportGenerator.Core/Reporting/Builders/CloverReportBuilder.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Linq;
6+
using System.Text;
7+
using System.Xml;
68
using System.Xml.Linq;
79
using Palmmedia.ReportGenerator.Core.Common;
810
using Palmmedia.ReportGenerator.Core.Logging;
@@ -407,7 +409,16 @@ public void CreateSummaryReport(SummaryResult summaryResult)
407409

408410
Logger.InfoFormat(Resources.WritingReportFile, targetPath);
409411

410-
result.Save(targetPath);
412+
XmlWriterSettings settings = new XmlWriterSettings()
413+
{
414+
Encoding = new UTF8Encoding(false),
415+
Indent = true
416+
};
417+
418+
using (XmlWriter writer = XmlWriter.Create(targetPath, settings))
419+
{
420+
result.Save(writer);
421+
}
411422
}
412423
}
413424
}

src/ReportGenerator.Core/Reporting/Builders/CoberturaReportBuilder.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Linq;
6+
using System.Text;
7+
using System.Xml;
68
using System.Xml.Linq;
79
using Palmmedia.ReportGenerator.Core.Common;
810
using Palmmedia.ReportGenerator.Core.Logging;
@@ -254,7 +256,16 @@ public void CreateSummaryReport(SummaryResult summaryResult)
254256

255257
Logger.InfoFormat(Resources.WritingReportFile, targetPath);
256258

257-
result.Save(targetPath);
259+
XmlWriterSettings settings = new XmlWriterSettings()
260+
{
261+
Encoding = new UTF8Encoding(false),
262+
Indent = true
263+
};
264+
265+
using (XmlWriter writer = XmlWriter.Create(targetPath, settings))
266+
{
267+
result.Save(writer);
268+
}
258269
}
259270

260271
/// <summary>

src/ReportGenerator.Core/Reporting/Builders/SonarQubeBuilder.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Linq;
6+
using System.Text;
7+
using System.Xml;
68
using System.Xml.Linq;
79
using Palmmedia.ReportGenerator.Core.Common;
810
using Palmmedia.ReportGenerator.Core.Logging;
@@ -112,7 +114,16 @@ public void CreateSummaryReport(SummaryResult summaryResult)
112114

113115
Logger.InfoFormat(Resources.WritingReportFile, targetPath);
114116

115-
this.document.Save(targetPath);
117+
XmlWriterSettings settings = new XmlWriterSettings()
118+
{
119+
Encoding = new UTF8Encoding(false),
120+
Indent = true
121+
};
122+
123+
using (XmlWriter writer = XmlWriter.Create(targetPath, settings))
124+
{
125+
this.document.Save(writer);
126+
}
116127
}
117128

118129
/// <summary>

src/ReportGenerator.Core/Reporting/Builders/XmlReportBuilder.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Linq;
6+
using System.Text;
7+
using System.Xml;
68
using System.Xml.Linq;
79
using Palmmedia.ReportGenerator.Core.Logging;
810
using Palmmedia.ReportGenerator.Core.Parser.Analysis;
@@ -149,7 +151,16 @@ public override void CreateClassReport(Class @class, IEnumerable<FileAnalysis> f
149151

150152
Logger.InfoFormat(Resources.WritingReportFile, targetPath);
151153

152-
result.Save(targetPath);
154+
XmlWriterSettings settings = new XmlWriterSettings()
155+
{
156+
Encoding = new UTF8Encoding(false),
157+
Indent = true
158+
};
159+
160+
using (XmlWriter writer = XmlWriter.Create(targetPath, settings))
161+
{
162+
result.Save(writer);
163+
}
153164
}
154165

155166
/// <summary>

src/ReportGenerator.Core/Reporting/Builders/XmlSummaryReportBuilder.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Globalization;
44
using System.IO;
55
using System.Linq;
6+
using System.Text;
7+
using System.Xml;
68
using System.Xml.Linq;
79
using Palmmedia.ReportGenerator.Core.Common;
810
using Palmmedia.ReportGenerator.Core.Logging;
@@ -159,7 +161,16 @@ public void CreateSummaryReport(SummaryResult summaryResult)
159161

160162
Logger.InfoFormat(Resources.WritingReportFile, targetPath);
161163

162-
result.Save(targetPath);
164+
XmlWriterSettings settings = new XmlWriterSettings()
165+
{
166+
Encoding = new UTF8Encoding(false),
167+
Indent = true
168+
};
169+
170+
using (XmlWriter writer = XmlWriter.Create(targetPath, settings))
171+
{
172+
result.Save(writer);
173+
}
163174
}
164175

165176
/// <summary>

src/ReportGenerator.Core/Reporting/History/HistoryReportGenerator.cs

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System.Collections.Generic;
33
using System.Globalization;
44
using System.IO;
5+
using System.Text;
6+
using System.Xml;
57
using System.Xml.Linq;
68
using Palmmedia.ReportGenerator.Core.Common;
79
using Palmmedia.ReportGenerator.Core.Logging;
@@ -87,7 +89,17 @@ internal void CreateReport(IEnumerable<Assembly> assemblies, DateTime executionT
8789
{
8890
using (var stream = new MemoryStream())
8991
{
90-
document.Save(stream);
92+
XmlWriterSettings settings = new XmlWriterSettings()
93+
{
94+
Encoding = new UTF8Encoding(false),
95+
Indent = true
96+
};
97+
98+
using (XmlWriter writer = XmlWriter.Create(stream, settings))
99+
{
100+
document.Save(writer);
101+
}
102+
91103
stream.Position = 0;
92104
this.historyStorage.SaveFile(stream, fileName);
93105
}

0 commit comments

Comments
 (0)