Skip to content

Commit aa2e2ce

Browse files
TianMengLuckyTianMengLucky
authored
Merge pull request #2 from Next-Fast/Next
Preview
2 parents 94fa57f + 3c4940d commit aa2e2ce

80 files changed

Lines changed: 1115 additions & 1887 deletions

File tree

Some content is hidden

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

‎src/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,5 @@ UpgradeLog*.htm
112112
# JetBrains Rider
113113
.idea/
114114
*.sln.iml
115+
116+
Output/

‎src/Impostor.Api.Extension/Commands/CommandEventArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Impostor.Api.Extension;
1+
namespace Impostor.Api.Extension.Commands;
22

33
public class CommandEventArgs(ICommandManager manager, string[] args) : EventArgs
44
{

‎src/Impostor.Api.Extension/Commands/ICommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Impostor.Api.Extension;
1+
namespace Impostor.Api.Extension.Commands;
22

33
public interface ICommand;
44

‎src/Impostor.Api.Extension/Commands/ICommandManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Impostor.Api.Extension;
1+
namespace Impostor.Api.Extension.Commands;
22

33
public interface ICommandManager
44
{

‎src/Impostor.Api.Extension/Commands/NextCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Impostor.Api.Extension;
1+
namespace Impostor.Api.Extension.Commands;
22

33
public class NextCommand(string command, Func<CommandEventArgs, Task> onInvoke) : ISingleCommand
44
{

‎src/Impostor.Api.Extension/Impostor.Api.Extension.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.3.0"/>
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
2526
</ItemGroup>
2627
</Project>

‎src/Impostor.Api.Extension/Plugins/IHttpPlugin.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Impostor.Api.Plugins;
2-
3-
namespace Impostor.Api.Extension;
1+
namespace Impostor.Api.Extension.Plugins;
42

53
/*public interface IHttpPlugin : IPlugin
64
{

‎src/Impostor.Api.Extension/Plugins/IHttpPluginStartup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.AspNetCore.Builder;
33
using Microsoft.AspNetCore.Hosting;
44

5-
namespace Impostor.Api.Extension;
5+
namespace Impostor.Api.Extension.Plugins;
66

77
public interface IHttpPluginStartup : IPluginStartup
88
{

‎src/Impostor.Api.Extension/Utils/ServiceUtils.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Microsoft.Extensions.Configuration;
2+
using Microsoft.Extensions.DependencyInjection;
3+
4+
namespace Impostor.Api.Extension.Utils;
5+
6+
public static class ServiceUtils
7+
{
8+
public static IServiceCollection ConfigureSection<T>(this IServiceCollection collection, IConfiguration configuration, string section) where T : class
9+
{
10+
return collection.Configure<T>(configuration.GetSection(section));
11+
}
12+
}

‎src/Impostor.Api.Extension/packages.lock.json‎

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,23 @@
1313
"Microsoft.Extensions.Hosting.Abstractions": "8.0.1"
1414
}
1515
},
16+
"Microsoft.Extensions.Options.ConfigurationExtensions": {
17+
"type": "Direct",
18+
"requested": "[9.0.3, )",
19+
"resolved": "9.0.3",
20+
"contentHash": "PcyYHQglKnWVZHSPaL6v2qnfsIuFw8tSq7cyXHg3OeuDVn/CqmdWUjRiZomCF/Gi+qCi+ksz0lFphg2cNvB8zQ==",
21+
"dependencies": {
22+
"Microsoft.Extensions.Configuration.Abstractions": "9.0.3",
23+
"Microsoft.Extensions.Configuration.Binder": "9.0.3",
24+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3",
25+
"Microsoft.Extensions.Options": "9.0.3",
26+
"Microsoft.Extensions.Primitives": "9.0.3"
27+
}
28+
},
1629
"JetBrains.Annotations": {
1730
"type": "Transitive",
18-
"resolved": "2024.3.0",
19-
"contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
31+
"resolved": "2025.1.0-eap1",
32+
"contentHash": "5ApJk9xbFOdbz7L8W9LAA63DIMbqC1p81KOYLeLu+d3Pj9yC83aZBQgHce/LCCu9j/mzVZxEUl70rDoUEGs7Gg=="
2033
},
2134
"Microsoft.AspNetCore.Hosting.Server.Abstractions": {
2235
"type": "Transitive",
@@ -32,8 +45,7 @@
3245
"resolved": "2.3.0",
3346
"contentHash": "39r9PPrjA6s0blyFv5qarckjNkaHRA5B+3b53ybuGGNTXEj1/DStQJ4NWjFL6QTRQpL9zt7nDyKxZdJOlcnq+Q==",
3447
"dependencies": {
35-
"Microsoft.AspNetCore.Http.Features": "2.3.0",
36-
"System.Text.Encodings.Web": "8.0.0"
48+
"Microsoft.AspNetCore.Http.Features": "2.3.0"
3749
}
3850
},
3951
"Microsoft.AspNetCore.Http.Features": {
@@ -46,90 +58,93 @@
4658
},
4759
"Microsoft.Extensions.Configuration.Abstractions": {
4860
"type": "Transitive",
49-
"resolved": "9.0.2",
50-
"contentHash": "I0O/270E/lUNqbBxlRVjxKOMZyYjP88dpEgQTveml+h2lTzAP4vbawLVwjS9SC7lKaU893bwyyNz0IVJYsm9EA==",
61+
"resolved": "9.0.3",
62+
"contentHash": "q5qlbm6GRUrle2ZZxy9aqS/wWoc+mRD3JeP6rcpiJTh5XcemYkplAcJKq8lU11ZfPom5lfbZZfnQvDqcUhqD5Q==",
5163
"dependencies": {
52-
"Microsoft.Extensions.Primitives": "9.0.2"
64+
"Microsoft.Extensions.Primitives": "9.0.3"
65+
}
66+
},
67+
"Microsoft.Extensions.Configuration.Binder": {
68+
"type": "Transitive",
69+
"resolved": "9.0.3",
70+
"contentHash": "ad82pYBUSQbd3WIboxsS1HzFdRuHKRa2CpYwie/o6dZAxUjt62yFwjoVdM7Iw2VO5fHV1rJwa7jJZBNZin0E7Q==",
71+
"dependencies": {
72+
"Microsoft.Extensions.Configuration.Abstractions": "9.0.3"
5373
}
5474
},
5575
"Microsoft.Extensions.DependencyInjection.Abstractions": {
5676
"type": "Transitive",
57-
"resolved": "9.0.2",
58-
"contentHash": "MNe7GSTBf3jQx5vYrXF0NZvn6l7hUKF6J54ENfAgCO8y6xjN1XUmKKWG464LP2ye6QqDiA1dkaWEZBYnhoZzjg=="
77+
"resolved": "9.0.3",
78+
"contentHash": "TfaHPSe39NyL2wxkisRxXK7xvHGZYBZ+dy3r+mqGvnxKgAPdHkMu3QMQZI4pquP6W5FIQBqs8FJpWV8ffCgDqQ=="
5979
},
6080
"Microsoft.Extensions.Diagnostics.Abstractions": {
6181
"type": "Transitive",
62-
"resolved": "9.0.2",
63-
"contentHash": "kFwIZEC/37cwKuEm/nXvjF7A/Myz9O7c7P9Csgz6AOiiDE62zdOG5Bu7VkROu1oMYaX0wgijPJ5LqVt6+JKjVg==",
82+
"resolved": "9.0.3",
83+
"contentHash": "/fn0Xe8t+3YbMfwyTk4hFirWyAG1pBA5ogVYsrKAuuD2gbqOWhFuSA28auCmS3z8Y2eq3miDIKq4pFVRWA+J6g==",
6484
"dependencies": {
65-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.2",
66-
"Microsoft.Extensions.Options": "9.0.2"
85+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3",
86+
"Microsoft.Extensions.Options": "9.0.3"
6787
}
6888
},
6989
"Microsoft.Extensions.FileProviders.Abstractions": {
7090
"type": "Transitive",
71-
"resolved": "9.0.2",
72-
"contentHash": "IcOBmTlr2jySswU+3x8c3ql87FRwTVPQgVKaV5AXzPT5u0VItfNU8SMbESpdSp5STwxT/1R99WYszgHWsVkzhg==",
91+
"resolved": "9.0.3",
92+
"contentHash": "umczZ3+QPpzlrW/lkvy+IB0p52+qZ5w++aqx2lTCMOaPKzwcbVdrJgiQ3ajw5QWBp7gChLUiCYkSlWUpfjv24g==",
7393
"dependencies": {
74-
"Microsoft.Extensions.Primitives": "9.0.2"
94+
"Microsoft.Extensions.Primitives": "9.0.3"
7595
}
7696
},
7797
"Microsoft.Extensions.Hosting.Abstractions": {
7898
"type": "Transitive",
79-
"resolved": "9.0.2",
80-
"contentHash": "PvjZW6CMdZbPbOwKsQXYN5VPtIWZQqdTRuBPZiW3skhU3hymB17XSlLVC4uaBbDZU+/3eHG3p80y+MzZxZqR7Q==",
99+
"resolved": "9.0.3",
100+
"contentHash": "rHabYVhQsGYNfgnfnYLqZRx/hLe85i6jW5rnDjA9pjt3x7yjPv8T/EXcgN5T9T38FAVwZRA+RMGUkEHbxvCOBQ==",
81101
"dependencies": {
82-
"Microsoft.Extensions.Configuration.Abstractions": "9.0.2",
83-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.2",
84-
"Microsoft.Extensions.Diagnostics.Abstractions": "9.0.2",
85-
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.2",
86-
"Microsoft.Extensions.Logging.Abstractions": "9.0.2"
102+
"Microsoft.Extensions.Configuration.Abstractions": "9.0.3",
103+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3",
104+
"Microsoft.Extensions.Diagnostics.Abstractions": "9.0.3",
105+
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.3",
106+
"Microsoft.Extensions.Logging.Abstractions": "9.0.3"
87107
}
88108
},
89109
"Microsoft.Extensions.Logging.Abstractions": {
90110
"type": "Transitive",
91-
"resolved": "9.0.2",
92-
"contentHash": "dV9s2Lamc8jSaqhl2BQSPn/AryDIH2sSbQUyLitLXV0ROmsb+SROnn2cH939JFbsNrnf3mIM3GNRKT7P0ldwLg==",
111+
"resolved": "9.0.3",
112+
"contentHash": "H/MBMLt9A/69Ux4OrV7oCKt3DcMT04o5SCqDolulzQA66TLFEpYYb4qedMs/uwrLtyHXGuDGWKZse/oa8W9AZw==",
93113
"dependencies": {
94-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.2"
114+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3"
95115
}
96116
},
97117
"Microsoft.Extensions.Options": {
98118
"type": "Transitive",
99-
"resolved": "9.0.2",
100-
"contentHash": "zr98z+AN8+isdmDmQRuEJ/DAKZGUTHmdv3t0ZzjHvNqvA44nAgkXE9kYtfoN6581iALChhVaSw2Owt+Z2lVbkQ==",
119+
"resolved": "9.0.3",
120+
"contentHash": "xE7MpY70lkw1oiid5y6FbL9dVw8oLfkx8RhSNGN8sSzBlCqGn0SyT3Fqc8tZnDaPIq7Z8R9RTKlS564DS+MV3g==",
101121
"dependencies": {
102-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.2",
103-
"Microsoft.Extensions.Primitives": "9.0.2"
122+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3",
123+
"Microsoft.Extensions.Primitives": "9.0.3"
104124
}
105125
},
106126
"Microsoft.Extensions.Primitives": {
107127
"type": "Transitive",
108-
"resolved": "9.0.2",
109-
"contentHash": "puBMtKe/wLuYa7H6docBkLlfec+h8L35DXqsDKKJgW0WY5oCwJ3cBJKcDaZchv6knAyqOMfsl6VUbaR++E5LXA=="
128+
"resolved": "9.0.3",
129+
"contentHash": "yCCJHvBcRyqapMSNzP+kTc57Eaavq2cr5Tmuil6/XVnipQf5xmskxakSQ1enU6S4+fNg3sJ27WcInV64q24JsA=="
110130
},
111131
"NextFast.Hazel.Abstractions": {
112132
"type": "Transitive",
113-
"resolved": "1.0.2-ci.8",
114-
"contentHash": "eaYyO/+c1l48bjq7ZbGRRohn6FIkDnyMrN8/zO4rxwVeIl6Tbdmw9FnrXXg7BxHzDcuSJP8AZcjXmfq6L8ovvQ=="
133+
"resolved": "1.0.2-ci.11",
134+
"contentHash": "J1rG0f5wWecv3ekxLuju2RD9eGMS7oxnQLFoBacj2QV/pLiQDGEDpdbQLUHHFDcVdvJQKnQfS3ZpU6Jew7xh2g=="
115135
},
116136
"Serilog": {
117137
"type": "Transitive",
118138
"resolved": "4.2.1-dev-02340",
119139
"contentHash": "CCWT2Cnh963brjYZpfFieoXSicgecLMN7+XUL2OSOnxp0NgeWXTDDVcdXEwX3RLUH4UoOJpWsH3qpNdOrfqBTA=="
120140
},
121-
"System.Text.Encodings.Web": {
122-
"type": "Transitive",
123-
"resolved": "8.0.0",
124-
"contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
125-
},
126141
"NextImpostor.Api": {
127142
"type": "Project",
128143
"dependencies": {
129-
"JetBrains.Annotations": "[2024.3.0, )",
130-
"Microsoft.Extensions.Hosting.Abstractions": "[9.0.2, )",
131-
"Microsoft.Extensions.Logging.Abstractions": "[9.0.2, )",
132-
"NextFast.Hazel.Abstractions": "[1.0.2-ci.8, )",
144+
"JetBrains.Annotations": "[2025.1.0-eap1, )",
145+
"Microsoft.Extensions.Hosting.Abstractions": "[9.0.3, )",
146+
"Microsoft.Extensions.Logging.Abstractions": "[9.0.3, )",
147+
"NextFast.Hazel.Abstractions": "[1.0.2-ci.11, )",
133148
"Serilog": "[4.2.1-dev-02340, )"
134149
}
135150
}

0 commit comments

Comments
 (0)