build
This commit is contained in:
parent
45514010f2
commit
f17202e3bb
4 changed files with 20 additions and 13 deletions
|
|
@ -38,6 +38,7 @@
|
||||||
<PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
|
<PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
|
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
|
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
|
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
|
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
|
||||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||||
|
|
@ -58,4 +59,4 @@
|
||||||
<PackageVersion Include="xunit" Version="2.9.3" />
|
<PackageVersion Include="xunit" Version="2.9.3" />
|
||||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
|
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace cli.Commands
|
||||||
});
|
});
|
||||||
loginCommand.OnExecute(async () =>
|
loginCommand.OnExecute(async () =>
|
||||||
{
|
{
|
||||||
string? authUrl = Program.AppConfiguration.GetValue<String>("ConnectionSettings:ServerApi:Authority");
|
string? authHostName = Program.AppConfiguration.GetRequiredSection("ConnectionSettings:ServerApi")["Authority"];
|
||||||
|
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,19 @@ namespace cli.Commands
|
||||||
{
|
{
|
||||||
public class GenerationCommander : ICommander
|
public class GenerationCommander : ICommander
|
||||||
{
|
{
|
||||||
|
private MvcGenerator mvcGenerator;
|
||||||
|
private ILoggerFactory loggerFactory;
|
||||||
|
private IOptions<GenMvcSettings> options;
|
||||||
|
|
||||||
public GenerationCommander()
|
public GenerationCommander(
|
||||||
|
MvcGenerator mvcGenerator,
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
IOptions<GenMvcSettings> options
|
||||||
|
)
|
||||||
{
|
{
|
||||||
|
this.mvcGenerator = mvcGenerator;
|
||||||
|
this.loggerFactory = loggerFactory;
|
||||||
|
this.options = options;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CommandLineApplication Integrate(CommandLineApplication rootApp)
|
public CommandLineApplication Integrate(CommandLineApplication rootApp)
|
||||||
|
|
@ -35,13 +45,7 @@ namespace cli.Commands
|
||||||
});
|
});
|
||||||
cmd.OnExecute(() => {
|
cmd.OnExecute(() => {
|
||||||
|
|
||||||
var mailer = Program.AppHost.Services.GetService<MvcGenerator>();
|
|
||||||
var loggerFactory = Program.AppHost.Services.GetService<ILoggerFactory>();
|
|
||||||
var logger = loggerFactory.CreateLogger<GenerationCommander>();
|
var logger = loggerFactory.CreateLogger<GenerationCommander>();
|
||||||
var options = Program.AppHost.Services.GetService<IOptions<GenMvcSettings>>();
|
|
||||||
|
|
||||||
MvcGenerator generator = Program.AppHost.Services.GetService<MvcGenerator>();
|
|
||||||
|
|
||||||
var modelFullName = mdClass?.Value ?? options?.Value.ModelFullName;
|
var modelFullName = mdClass?.Value ?? options?.Value.ModelFullName;
|
||||||
var nameSpace = nameSpaceArg?.Value?? options?.Value.NameSpace;
|
var nameSpace = nameSpaceArg?.Value?? options?.Value.NameSpace;
|
||||||
var dbContext = dbCtx?.Value?? options?.Value.DbContextFullName;
|
var dbContext = dbCtx?.Value?? options?.Value.DbContextFullName;
|
||||||
|
|
@ -51,7 +55,7 @@ namespace cli.Commands
|
||||||
logger.LogInformation("Starting generation");
|
logger.LogInformation("Starting generation");
|
||||||
logger.LogInformation($"Using parameters : modelFullName:{modelFullName} nameSpace:{nameSpace} dbContext:{dbContext} controllerName:{controllerName} relativePath:{relativePath}");
|
logger.LogInformation($"Using parameters : modelFullName:{modelFullName} nameSpace:{nameSpace} dbContext:{dbContext} controllerName:{controllerName} relativePath:{relativePath}");
|
||||||
|
|
||||||
generator.Generate(modelFullName,
|
mvcGenerator.Generate(modelFullName,
|
||||||
dbContext,
|
dbContext,
|
||||||
controllerName,
|
controllerName,
|
||||||
relativePath);
|
relativePath);
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,12 @@
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" />
|
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" />
|
||||||
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
|
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Hosting" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" />
|
||||||
<PackageReference Include="Newtonsoft.Json" />
|
<PackageReference Include="Newtonsoft.Json" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
|
<ProjectReference Include="..\Abstract\Abstract.csproj" />
|
||||||
<ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
|
<ProjectReference Include="..\Server\Server.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue