Skip to content

Commit 8dcd5c9

Browse files
authored
Flexibility to choose Microsoft.AspNetcore.App on the isolate worker (#547)
1 parent 5fb3b7a commit 8dcd5c9

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Extensions/OpenApiHttpRequestDataExtensions.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
using System.Linq;
33

44
using Microsoft.AspNetCore.Http;
5+
6+
#if NETSTANDARD2_0
7+
58
using Microsoft.AspNetCore.Http.Internal;
9+
10+
#endif
11+
612
using Microsoft.AspNetCore.WebUtilities;
713
using Microsoft.Azure.Functions.Worker.Http;
814
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;

src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.csproj

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\builds\worker.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -21,13 +21,29 @@
2121
<VersionSuffix></VersionSuffix> -->
2222
</PropertyGroup>
2323

24-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
24+
<PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='netstandard2.0'">
2525
<DocumentationFile>bin\Debug\netstandard2.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
2626
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='net6.0'">
28+
<DocumentationFile>bin\Debug\net6.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
29+
</PropertyGroup>
30+
<PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='net7.0'">
31+
<DocumentationFile>bin\Debug\net7.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
32+
</PropertyGroup>
2733

28-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
34+
<PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='netstandard2.0'">
2935
<DocumentationFile>bin\Release\netstandard2.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
3036
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='net6.0'">
38+
<DocumentationFile>bin\Release\net6.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='net7.0'">
41+
<DocumentationFile>bin\Release\net7.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
42+
</PropertyGroup>
43+
44+
<ItemGroup Condition=" '$(TargetFramework)'!='netstandard2.0' ">
45+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
46+
</ItemGroup>
3147

3248
<ItemGroup>
3349
<!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->

test/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77

0 commit comments

Comments
 (0)