xml元素内容转义

xljiulang · xljiulang · commit 50459cb1227e · 2024-09-27T14:07:33.000+08:00
diff --git a/WebApiClientCore.OpenApi.SourceGenerator/Views/HttpApi.cshtml b/WebApiClientCore.OpenApi.SourceGenerator/Views/HttpApi.cshtml
@@ -1,5 +1,6 @@
 ﻿@inherits HtmlTempate<HttpApi>
 @using NSwag;
+@using System.Security;
 @using WebApiClientCore.OpenApi.SourceGenerator;
 
 <HttpApi>
@@ -26,8 +27,8 @@
                 {
                     <div>/// &lt;summary&gt;</div>
                     foreach (var line in Model.Summary.Split(new[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))
-                    {
-                        <div>/// @line</div>
+                    { 
+                        <div>/// @SecurityElement.Escape(line)</div>
                     }
                     <div>/// &lt;/summary&gt;</div>
                 }
@@ -48,18 +49,19 @@
                     {
                         <div>/// &lt;summary&gt;</div>
                         foreach (var line in method.Summary.Split(new[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))
-                        {
-                            <div>/// @line</div>
+                        { 
+                            <div>/// @SecurityElement.Escape(line)</div>
                         }
                         <div>/// &lt;/summary&gt;</div>
 
                         foreach (var parameter in method.Parameters)
                         {
                             var description = parameter.HasDescription ? parameter.Description.Replace("\r", "\t").Replace("\n", "\t") : null;
-                            <div>/// &lt;param name="@(parameter.VariableName)"&gt;@(description)&lt;/param&gt;</div>
+               
+                            <div>/// &lt;param name="@(parameter.VariableName)"&gt;@(SecurityElement.Escape(description))&lt;/param&gt;</div>
                         }
                         <div>/// &lt;param name="cancellationToken"&gt;cancellationToken&lt;/param&gt;</div>
-                        <div>/// &lt;returns&gt;@(method.ResultDescription)&lt;/returns&gt;</div>
+                        <div>/// &lt;returns&gt;@(SecurityElement.Escape(method.ResultDescription))&lt;/returns&gt;</div>
                     }
                 </summary>
 
@@ -91,7 +93,7 @@
                             {
                                 var schema = parameter.Schema as OpenApiParameter;
                                 if (schema != null && schema.CollectionFormat != OpenApiParameterCollectionFormat.Undefined
-                                    && schema.CollectionFormat != OpenApiParameterCollectionFormat.Multi)
+                                && schema.CollectionFormat != OpenApiParameterCollectionFormat.Multi)
                                 {
                                     <span>[PathQuery(CollectionFormat = CollectionFormat.@(schema.CollectionFormat))]</span>
                                 }
diff --git a/WebApiClientCore.OpenApi.SourceGenerator/Views/HttpModel.cshtml b/WebApiClientCore.OpenApi.SourceGenerator/Views/HttpModel.cshtml
@@ -1,4 +1,5 @@
 ﻿@inherits HtmlTempate<HttpModel>
+@using System.Security;
 @using WebApiClientCore.OpenApi.SourceGenerator;
 
 <HttpModel>
@@ -17,7 +18,7 @@
         <class>
             @foreach (var line in Model.Lines)
             {
-                <div>@line</div>
+                <div>@SecurityElement.Escape(line)</div>
             }
         </class>
         <div>}</div>
diff --git a/WebApiClientCore.OpenApi.SourceGenerator/WebApiClientCore.OpenApi.SourceGenerator.csproj b/WebApiClientCore.OpenApi.SourceGenerator/WebApiClientCore.OpenApi.SourceGenerator.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<Nullable>enable</Nullable>
+		<Version>2.1.4.1</Version>
 		<TargetFrameworks>netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
 
 		<Summary>将本地或远程OpenApi文档解析生成WebApiClientCore的接口定义代码文件的工具</Summary>
@@ -24,16 +25,11 @@
 		<None Update="petstore.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Update="Views\HttpApi.cshtml">
+		<None Update="Views\*.cshtml">
 			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 			<Pack>$(IncludeRazorContentInPack)</Pack>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="Views\HttpModel.cshtml">
-			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-			<Pack>$(IncludeRazorContentInPack)</Pack>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None> 
+	</ItemGroup> 
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`@inherits HtmlTempate<HttpApi>`
`2`	`2`	`@using NSwag;`
	`3`	`+@using System.Security;`
`3`	`4`	`@using WebApiClientCore.OpenApi.SourceGenerator;`
`4`	`5`
`5`	`6`	`<HttpApi>`
`@@ -26,8 +27,8 @@`
`26`	`27`	`{`
`27`	`28`	`<div>/// <summary></div>`
`28`	`29`	`foreach (var line in Model.Summary.Split(new[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))`
`29`		`- {`
`30`		`- <div>/// @line</div>`
	`30`	`+ {`
	`31`	`+ <div>/// @SecurityElement.Escape(line)</div>`
`31`	`32`	`}`
`32`	`33`	`<div>/// </summary></div>`
`33`	`34`	`}`
`@@ -48,18 +49,19 @@`
`48`	`49`	`{`
`49`	`50`	`<div>/// <summary></div>`
`50`	`51`	`foreach (var line in method.Summary.Split(new[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))`
`51`		`- {`
`52`		`- <div>/// @line</div>`
	`52`	`+ {`
	`53`	`+ <div>/// @SecurityElement.Escape(line)</div>`
`53`	`54`	`}`
`54`	`55`	`<div>/// </summary></div>`
`55`	`56`
`56`	`57`	`foreach (var parameter in method.Parameters)`
`57`	`58`	`{`
`58`	`59`	`var description = parameter.HasDescription ? parameter.Description.Replace("\r", "\t").Replace("\n", "\t") : null;`
`59`		`- <div>/// <param name="@(parameter.VariableName)">@(description)</param></div>`
	`60`	`+`
	`61`	`+ <div>/// <param name="@(parameter.VariableName)">@(SecurityElement.Escape(description))</param></div>`
`60`	`62`	`}`
`61`	`63`	`<div>/// <param name="cancellationToken">cancellationToken</param></div>`
`62`		`- <div>/// <returns>@(method.ResultDescription)</returns></div>`
	`64`	`+ <div>/// <returns>@(SecurityElement.Escape(method.ResultDescription))</returns></div>`
`63`	`65`	`}`
`64`	`66`	`</summary>`
`65`	`67`
`@@ -91,7 +93,7 @@`
`91`	`93`	`{`
`92`	`94`	`var schema = parameter.Schema as OpenApiParameter;`
`93`	`95`	`if (schema != null && schema.CollectionFormat != OpenApiParameterCollectionFormat.Undefined`
`94`		`- && schema.CollectionFormat != OpenApiParameterCollectionFormat.Multi)`
	`96`	`+ && schema.CollectionFormat != OpenApiParameterCollectionFormat.Multi)`
`95`	`97`	`{`
`96`	`98`	`<span>[PathQuery(CollectionFormat = CollectionFormat.@(schema.CollectionFormat))]</span>`
`97`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@inherits HtmlTempate<HttpModel>`
	`2`	`+@using System.Security;`
`2`	`3`	`@using WebApiClientCore.OpenApi.SourceGenerator;`
`3`	`4`
`4`	`5`	`<HttpModel>`
`@@ -17,7 +18,7 @@`
`17`	`18`	`<class>`
`18`	`19`	`@foreach (var line in Model.Lines)`
`19`	`20`	`{`
`20`		`- <div>@line</div>`
	`21`	`+ <div>@SecurityElement.Escape(line)</div>`
`21`	`22`	`}`
`22`	`23`	`</class>`
`23`	`24`	`<div>}</div>`