Update NuGet Package (#94)

justinyoo · web-flow · commit 47c94462aef1 · 2020-07-16T14:02:22.000+09:00
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV1IoC/local.settings.json b/samples/Aliencube.AzureFunctions.FunctionAppV1IoC/local.settings.json
@@ -6,7 +6,7 @@
 
     "OpenApi__Info__Version": "1.0.0",
     "OpenApi__Info__Title": "Open API Sample on Azure Functions (IoC)",
-    "OpenApi__Info__Description": "A sample API that runs on Azure Functions (STATIC) 1.x using Open API specification - from **local.settings.json**.",
+    "OpenApi__Info__Description": "A sample API that runs on Azure Functions (IoC) 1.x using Open API specification - from **local.settings.json**.",
     "OpenApi__Info__TermsOfService": "https://github.com/aliencube/AzureFunctions.Extensions",
     "OpenApi__Info__Contact__Name": "Aliencube Community",
     "OpenApi__Info__Contact__Email": "no-reply@aliencube.org",
@@ -16,4 +16,4 @@
 
     "OpenApi__ApiKey": ""
   }
-}
+}
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV3IoC/Aliencube.AzureFunctions.FunctionAppV3IoC.csproj b/samples/Aliencube.AzureFunctions.FunctionAppV3IoC/Aliencube.AzureFunctions.FunctionAppV3IoC.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
diff --git a/src/Aliencube.AzureFunctions.Extensions.OpenApi/Aliencube.AzureFunctions.Extensions.OpenApi.csproj b/src/Aliencube.AzureFunctions.Extensions.OpenApi/Aliencube.AzureFunctions.Extensions.OpenApi.csproj
@@ -72,4 +72,27 @@
     <EmbeddedResource Include="dist/swagger-ui-bundle.js" />
     <EmbeddedResource Include="dist/swagger-ui-standalone-preset.js" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\..\templates\OpenApiEndpints\IOpenApiHttpTriggerContext.cs">
+      <Pack>true</Pack>
+      <BuildAction>Compile</BuildAction>
+      <PackagePath>contentFiles\any\net461\OpenApi\;contentFiles\any\netstandard2.0\OpenApi\;</PackagePath>
+    </Content>
+    <Content Include="..\..\templates\OpenApiEndpints\OpenApiHttpTriggerContext.cs">
+      <Pack>true</Pack>
+      <BuildAction>Compile</BuildAction>
+      <PackagePath>contentFiles\any\net461\OpenApi\;contentFiles\any\netstandard2.0\OpenApi\;</PackagePath>
+    </Content>
+    <Content Include="..\..\templates\OpenApiEndpints\OpenApiHttpTrigger.cs">
+      <Pack>true</Pack>
+      <BuildAction>Compile</BuildAction>
+      <PackagePath>contentFiles\any\netstandard2.0\OpenApi\;</PackagePath>
+    </Content>
+    <Content Include="..\..\templates\OpenApiEndpints\OpenApiHttpTriggerV1.cs">
+      <Pack>true</Pack>
+      <BuildAction>Compile</BuildAction>
+      <PackagePath>contentFiles\any\net461\OpenApi\;</PackagePath>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/templates/OpenApiEndpints/IOpenApiHttpTriggerContext.cs b/templates/OpenApiEndpints/IOpenApiHttpTriggerContext.cs
@@ -7,7 +7,7 @@
 using Microsoft.OpenApi;
 using Microsoft.OpenApi.Models;
 
-namespace <# NAMESPACE #>
+namespace Aliencube.AzureFunctions.Extensions.OpenApi
 {
     /// <summary>
     /// This provides interfaces to <see cref="OpenApiHttpTriggerContext"/>.
diff --git a/templates/OpenApiEndpints/OpenApiHttpTrigger.cs b/templates/OpenApiEndpints/OpenApiHttpTrigger.cs
@@ -1,4 +1,5 @@
-﻿using System.Net;
+﻿#if !NET461
+using System.Net;
 using System.Threading.Tasks;
 
 using Aliencube.AzureFunctions.Extensions.OpenApi.Attributes;
@@ -10,7 +11,7 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace <# NAMESPACE #>
+namespace Aliencube.AzureFunctions.Extensions.OpenApi
 {
     /// <summary>
     /// This represents the HTTP trigger entity for Open API documents.
@@ -126,3 +127,4 @@ public static async Task<IActionResult> RenderSwaggerUI(
         }
     }
 }
+#endif
diff --git a/templates/OpenApiEndpints/OpenApiHttpTriggerContext.cs b/templates/OpenApiEndpints/OpenApiHttpTriggerContext.cs
@@ -11,7 +11,7 @@
 using Microsoft.OpenApi;
 using Microsoft.OpenApi.Models;
 
-namespace <# NAMESPACE #>
+namespace Aliencube.AzureFunctions.Extensions.OpenApi
 {
     /// <summary>
     /// This represents the context entity for <see cref="OpenApiHttpTrigger"/>.
diff --git a/templates/OpenApiEndpints/OpenApiHttpTriggerV1.cs b/templates/OpenApiEndpints/OpenApiHttpTriggerV1.cs
@@ -1,4 +1,5 @@
-﻿using System.Net;
+﻿#if NET461
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,7 +11,7 @@
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
-namespace <# NAMESPACE #>
+namespace Aliencube.AzureFunctions.Extensions.OpenApi
 {
     /// <summary>
     /// This represents the HTTP trigger entity for Open API documents.
@@ -220,3 +221,4 @@ public static async Task<HttpResponseMessage> RenderSwaggerUI(
         }
     }
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<TargetFramework>netcoreapp3.1</TargetFramework>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.OpenApi;`
`8`	`8`	`using Microsoft.OpenApi.Models;`
`9`	`9`
`10`		`-namespace <# NAMESPACE #>`
	`10`	`+namespace Aliencube.AzureFunctions.Extensions.OpenApi`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// This provides interfaces to <see cref="OpenApiHttpTriggerContext"/>.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Net;`
	`1`	`+#if !NET461`
	`2`	`+using System.Net;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`using Aliencube.AzureFunctions.Extensions.OpenApi.Attributes;`
`@@ -10,7 +11,7 @@`
`10`	`11`	`using Microsoft.Azure.WebJobs.Extensions.Http;`
`11`	`12`	`using Microsoft.Extensions.Logging;`
`12`	`13`
`13`		`-namespace <# NAMESPACE #>`
	`14`	`+namespace Aliencube.AzureFunctions.Extensions.OpenApi`
`14`	`15`	`{`
`15`	`16`	`/// <summary>`
`16`	`17`	`/// This represents the HTTP trigger entity for Open API documents.`
`@@ -126,3 +127,4 @@ public static async Task<IActionResult> RenderSwaggerUI(`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`	`}`
	`130`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`using Microsoft.OpenApi;`
`12`	`12`	`using Microsoft.OpenApi.Models;`
`13`	`13`
`14`		`-namespace <# NAMESPACE #>`
	`14`	`+namespace Aliencube.AzureFunctions.Extensions.OpenApi`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// This represents the context entity for <see cref="OpenApiHttpTrigger"/>.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Net;`
	`1`	`+#if NET461`
	`2`	`+using System.Net;`
`2`	`3`	`using System.Net.Http;`
`3`	`4`	`using System.Text;`
`4`	`5`	`using System.Threading.Tasks;`
`@@ -10,7 +11,7 @@`
`10`	`11`	`using Microsoft.Azure.WebJobs.Extensions.Http;`
`11`	`12`	`using Microsoft.Extensions.Logging;`
`12`	`13`
`13`		`-namespace <# NAMESPACE #>`
	`14`	`+namespace Aliencube.AzureFunctions.Extensions.OpenApi`
`14`	`15`	`{`
`15`	`16`	`/// <summary>`
`16`	`17`	`/// This represents the HTTP trigger entity for Open API documents.`
`@@ -220,3 +221,4 @@ public static async Task<HttpResponseMessage> RenderSwaggerUI(`
`220`	`221`	`}`
`221`	`222`	`}`
`222`	`223`	`}`
	`224`	`+#endif`