Skip to content

Commit 57fb0ff

Browse files
liliankasemliliankasem
authored
Refactor CSharp-Isolated templates for V4 (#1240)
1 parent 11d0395 commit 57fb0ff

25 files changed

+77
-829
lines changed

‎Build/PackageFiles/Dotnet_precompiled/ProjectTemplates-Isolated_v4.x.nuspec

+7-21
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,13 @@
1616
</packageTypes>
1717
</metadata>
1818
<files>
19-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/_gitignore" target="content/ProjectTemplate-CSharp/Net6/_gitignore" />
20-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/Company.FunctionApp.csproj" target="content/ProjectTemplate-CSharp/Net6/Company.FunctionApp.csproj" />
21-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/Program.cs" target="content/ProjectTemplate-CSharp/Net6/Program.cs" />
22-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/host.json" target="content/ProjectTemplate-CSharp/Net6/host.json" />
23-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/local.settings.json" target="content/ProjectTemplate-CSharp/Net6/local.settings.json" />
24-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/Properties/launchSettings.json" target="content/ProjectTemplate-CSharp/Net6/Properties/launchSettings.json" />
25-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/.template.config/template.json" target="content/ProjectTemplate-CSharp/Net6/.template.config/template.json" />
26-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/_gitignore" target="content/ProjectTemplate-CSharp/Net7/_gitignore" />
27-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Company.FunctionApp.csproj" target="content/ProjectTemplate-CSharp/Net7/Company.FunctionApp.csproj" />
28-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Program.cs" target="content/ProjectTemplate-CSharp/Net7/Program.cs" />
29-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/host.json" target="content/ProjectTemplate-CSharp/Net7/host.json" />
30-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/local.settings.json" target="content/ProjectTemplate-CSharp/Net7/local.settings.json" />
31-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Properties/launchSettings.json" target="content/ProjectTemplate-CSharp/Net7/Properties/launchSettings.json" />
32-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/.template.config/template.json" target="content/ProjectTemplate-CSharp/Net7/.template.config/template.json" />
33-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/_gitignore" target="content/ProjectTemplate-CSharp/NetFx48/_gitignore" />
34-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/Company.FunctionApp.csproj" target="content/ProjectTemplate-CSharp/NetFx48/Company.FunctionApp.csproj" />
35-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/Program.cs" target="content/ProjectTemplate-CSharp/NetFx48/Program.cs" />
36-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/host.json" target="content/ProjectTemplate-CSharp/NetFx48/host.json" />
37-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/local.settings.json" target="content/ProjectTemplate-CSharp/NetFx48/local.settings.json" />
38-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/Properties/launchSettings.json" target="content/ProjectTemplate-CSharp/NetFx48/Properties/launchSettings.json" />
39-
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/NetFx48/.template.config/template.json" target="content/ProjectTemplate-CSharp/NetFx48/.template.config/template.json" />
19+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/_gitignore" target="content/ProjectTemplate-CSharp/_gitignore" />
20+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Company.FunctionApp.csproj" target="content/ProjectTemplate-CSharp/Company.FunctionApp.csproj" />
21+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Program.cs" target="content/ProjectTemplate-CSharp/Program.cs" />
22+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/host.json" target="content/ProjectTemplate-CSharp/host.json" />
23+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/local.settings.json" target="content/ProjectTemplate-CSharp/local.settings.json" />
24+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Properties/launchSettings.json" target="content/ProjectTemplate-CSharp/Properties/launchSettings.json" />
25+
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/.template.config/template.json" target="content/ProjectTemplate-CSharp/.template.config/template.json" />
4026
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/FSharp-Isolated/_gitignore" target="content/ProjectTemplate-FSharp/_gitignore" />
4127
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/FSharp-Isolated/Company.FunctionApp.fsproj" target="content/ProjectTemplate-FSharp/Company.FunctionApp.fsproj" />
4228
<file src="../../../Functions.Templates/ProjectTemplate_v4.x/FSharp-Isolated/Program.fs" target="content/ProjectTemplate-FSharp/Program.fs" />

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/.template.config/GlobalUsings.cs ‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/.template.config/GlobalUsings.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
global using Microsoft.Azure.Functions.Worker;
2-
global using Microsoft.Azure.Functions.Worker.Http;
3-
global using Microsoft.Extensions.Hosting;
4-
global using Microsoft.Extensions.Logging;
5-
global using System.Net;
1+
global using Microsoft.Azure.Functions.Worker;
2+
global using Microsoft.Azure.Functions.Worker.Http;
3+
global using Microsoft.Extensions.Hosting;
4+
global using Microsoft.Extensions.Logging;
5+
global using System.Net;

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/.template.config/template.json ‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/.template.config/template.json

+29
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,35 @@
1616
},
1717
"sourceName": "Company.FunctionApp",
1818
"symbols": {
19+
"Framework": {
20+
"type": "parameter",
21+
"description": "The target framework for the project.",
22+
"datatype": "choice",
23+
"defaultValue": "net6.0",
24+
"replaces": "TargetFrameworkValue",
25+
"choices": [
26+
{
27+
"choice": "net6.0",
28+
"description": "Target .NET 6"
29+
},
30+
{
31+
"choice": "net7.0",
32+
"description": "Target .NET 7"
33+
},
34+
{
35+
"choice": "net48",
36+
"description": "Target .NET Framework 4.8"
37+
}
38+
]
39+
},
40+
"NetFramework": {
41+
"type": "computed",
42+
"value": "(Framework == \"net48\")"
43+
},
44+
"NetCore": {
45+
"type": "computed",
46+
"value": "(Framework == \"net7.0\" || Framework == \"net6.0\")"
47+
},
1948
"StorageConnectionStringValue": {
2049
"description": "The connection string for your Azure WebJobs Storage.",
2150
"type": "parameter",

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/Company.FunctionApp.csproj ‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Company.FunctionApp.csproj

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>TargetFrameworkValue</TargetFramework>
44
<AzureFunctionsVersion>AzureFunctionsVersionValue</AzureFunctionsVersion>
55
<OutputType>Exe</OutputType>
6+
<!--#if (NetCore)-->
67
<ImplicitUsings>enable</ImplicitUsings>
78
<Nullable>enable</Nullable>
9+
<!--#endif -->
810
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.FunctionApp</RootNamespace>
911
</PropertyGroup>
12+
<!--#if (Framework == "net6.0")-->
1013
<ItemGroup>
14+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
1115
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" />
16+
</ItemGroup>
17+
<!--#endif -->
18+
<!--#if (Framework == "net7.0")-->
19+
<ItemGroup>
1220
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
21+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0-preview2" />
1322
</ItemGroup>
23+
<!--#endif -->
24+
<!--#if (NetFramework)-->
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.8.0-preview3" />
27+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0-preview2" />
28+
</ItemGroup>
29+
<!--#endif -->
1430
<ItemGroup>
1531
<None Update="host.json">
1632
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -20,7 +36,14 @@
2036
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
2137
</None>
2238
</ItemGroup>
39+
<!--#if (NetCore)-->
2340
<ItemGroup>
2441
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext"/>
2542
</ItemGroup>
43+
<!--#endif -->
44+
<!--#if (NetFramework)-->
45+
<ItemGroup>
46+
<Folder Include="Properties\" />
47+
</ItemGroup>
48+
<!--#endif -->
2649
</Project>

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net6/Program.cs

-7
This file was deleted.

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/.template.config/GlobalUsings.cs

-5
This file was deleted.

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/.template.config/template.json

-72
This file was deleted.

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Company.FunctionApp.csproj

-26
This file was deleted.

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Program.cs

-7
This file was deleted.

‎Functions.Templates/ProjectTemplate_v4.x/CSharp-Isolated/Net7/Properties/launchSettings.json

-9
This file was deleted.

0 commit comments

Comments
 (0)