Skip to content

Commit 0a2ad16

Browse files
authored
Merge pull request #70 from Cysharp/v4
v4 Minimal API support
2 parents 724d5b3 + 7948915 commit 0a2ad16

File tree

73 files changed

+2433
-3273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2433
-3273
lines changed

.github/workflows/build-debug.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ jobs:
1919
NUGET_XMLDOC_MODE: skip
2020
steps:
2121
- uses: actions/checkout@v2
22+
- uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: 6.0.x
2225
- run: dotnet build -c Debug
2326
- run: dotnet test -c Debug --no-build < /dev/null

.github/workflows/build-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ jobs:
2424
NUGET_XMLDOC_MODE: skip
2525
steps:
2626
- uses: actions/checkout@v2
27+
- uses: actions/setup-dotnet@v1
28+
with:
29+
dotnet-version: 6.0.x
2730
# pack nuget
2831
- run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
2932
- run: dotnet test -c Release --no-build
3033
- run: dotnet pack ./src/ConsoleAppFramework/ConsoleAppFramework.csproj -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
31-
- run: dotnet pack ./src/ConsoleAppFramework.WebHosting/ConsoleAppFramework.WebHosting.csproj -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
3234
- uses: actions/upload-artifact@v2
3335
with:
3436
name: nuget

ConsoleAppFramework.sln

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29728.190
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1F399F98-7439-4F05-847B-CC1267B4B7F2}"
77
EndProject
@@ -19,12 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AAD2D900
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppFramework.Tests", "tests\ConsoleAppFramework.Tests\ConsoleAppFramework.Tests.csproj", "{AF15C841-5D45-4E61-BFCE-A6E6B7BA7629}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppFramework.WebHosting", "src\ConsoleAppFramework.WebHosting\ConsoleAppFramework.WebHosting.csproj", "{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A}"
23-
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHostingApp", "sandbox\WebHostingApp\WebHostingApp.csproj", "{2B7CDEFC-3D92-4B72-8898-2494D7B087AD}"
25-
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppFramework.Integration.Test", "tests\ConsoleAppFramework.Integration.Test\ConsoleAppFramework.Integration.Test.csproj", "{6A39E146-8CDF-4B04-88ED-395C56A32722}"
27-
EndProject
2822
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6DF6534A-0F9D-44A4-BF89-AE1F3B243914}"
2923
ProjectSection(SolutionItems) = preProject
3024
.dockerignore = .dockerignore
@@ -34,9 +28,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3428
ReadMe.md = ReadMe.md
3529
EndProjectSection
3630
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppFramework.Template", "src\ConsoleAppFramework.Template\ConsoleAppFramework.Template.csproj", "{A76D1521-AB66-4B00-8C7B-069052EFB212}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetApp", "sandbox\AspNetApp\AspNetApp.csproj", "{E065696C-9DF6-4E68-933B-BFA0165781DD}"
32+
EndProject
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6WebApp", "sandbox\Net6WebApp\Net6WebApp.csproj", "{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A}"
3834
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetApp", "sandbox\AspNetApp\AspNetApp.csproj", "{E065696C-9DF6-4E68-933B-BFA0165781DD}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6Console", "sandbox\Net6Console\Net6Console.csproj", "{19E33348-979A-4283-A74D-0844CC384A88}"
4036
EndProject
4137
Global
4238
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,26 +60,18 @@ Global
6460
{AF15C841-5D45-4E61-BFCE-A6E6B7BA7629}.Debug|Any CPU.Build.0 = Debug|Any CPU
6561
{AF15C841-5D45-4E61-BFCE-A6E6B7BA7629}.Release|Any CPU.ActiveCfg = Release|Any CPU
6662
{AF15C841-5D45-4E61-BFCE-A6E6B7BA7629}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A}.Release|Any CPU.Build.0 = Release|Any CPU
71-
{2B7CDEFC-3D92-4B72-8898-2494D7B087AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72-
{2B7CDEFC-3D92-4B72-8898-2494D7B087AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{2B7CDEFC-3D92-4B72-8898-2494D7B087AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
74-
{2B7CDEFC-3D92-4B72-8898-2494D7B087AD}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{6A39E146-8CDF-4B04-88ED-395C56A32722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{6A39E146-8CDF-4B04-88ED-395C56A32722}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{6A39E146-8CDF-4B04-88ED-395C56A32722}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{6A39E146-8CDF-4B04-88ED-395C56A32722}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{A76D1521-AB66-4B00-8C7B-069052EFB212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{A76D1521-AB66-4B00-8C7B-069052EFB212}.Debug|Any CPU.Build.0 = Debug|Any CPU
81-
{A76D1521-AB66-4B00-8C7B-069052EFB212}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{A76D1521-AB66-4B00-8C7B-069052EFB212}.Release|Any CPU.Build.0 = Release|Any CPU
8363
{E065696C-9DF6-4E68-933B-BFA0165781DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8464
{E065696C-9DF6-4E68-933B-BFA0165781DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
8565
{E065696C-9DF6-4E68-933B-BFA0165781DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
8666
{E065696C-9DF6-4E68-933B-BFA0165781DD}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A}.Release|Any CPU.Build.0 = Release|Any CPU
71+
{19E33348-979A-4283-A74D-0844CC384A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{19E33348-979A-4283-A74D-0844CC384A88}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{19E33348-979A-4283-A74D-0844CC384A88}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{19E33348-979A-4283-A74D-0844CC384A88}.Release|Any CPU.Build.0 = Release|Any CPU
8775
EndGlobalSection
8876
GlobalSection(SolutionProperties) = preSolution
8977
HideSolutionNode = FALSE
@@ -94,11 +82,9 @@ Global
9482
{5E16EBD8-3396-4952-9B2D-DD2E2E3C883B} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
9583
{0B3BE82E-753A-415D-AD4E-90350C6E5C3D} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
9684
{AF15C841-5D45-4E61-BFCE-A6E6B7BA7629} = {AAD2D900-C305-4449-A9FC-6C7696FFEDFA}
97-
{9AC1CAE2-E717-472A-BBFB-0FE5590E5C7A} = {1F399F98-7439-4F05-847B-CC1267B4B7F2}
98-
{2B7CDEFC-3D92-4B72-8898-2494D7B087AD} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
99-
{6A39E146-8CDF-4B04-88ED-395C56A32722} = {AAD2D900-C305-4449-A9FC-6C7696FFEDFA}
100-
{A76D1521-AB66-4B00-8C7B-069052EFB212} = {1F399F98-7439-4F05-847B-CC1267B4B7F2}
10185
{E065696C-9DF6-4E68-933B-BFA0165781DD} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
86+
{48781D9F-D3E0-4A72-ADD1-A47ECDC23F0A} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
87+
{19E33348-979A-4283-A74D-0844CC384A88} = {A2CF2984-E8E2-48FC-B5A1-58D74A2467E6}
10288
EndGlobalSection
10389
GlobalSection(ExtensibilityGlobals) = postSolution
10490
SolutionGuid = {7F3E353A-C125-4020-8481-11DC6496358C}

0 commit comments

Comments
 (0)