change metadatareference check condition

neuecc · neuecc · commit e20518692f65 · 2024-12-17T17:32:40.000+09:00
diff --git a/ReadMe.md b/ReadMe.md
@@ -1016,7 +1016,7 @@ public class PositionOptions
 }
 ```
 
-When `Microsoft.Extensions.Configuration.Abstractions` is imported, `ConfigureEmptyConfiguration` becomes available to call. Additionally, when `Microsoft.Extensions.Configuration.Json` is imported, `ConfigureDefaultConfiguration` becomes available to call. In DefaultConfiguration, `SetBasePath(System.IO.Directory.GetCurrentDirectory())` and `AddJsonFile("appsettings.json", optional: true)` are executed before calling `Action<IConfigurationBuilder> configure`.
+When `Microsoft.Extensions.Configuration` is imported, `ConfigureEmptyConfiguration` becomes available to call. Additionally, when `Microsoft.Extensions.Configuration.Json` is imported, `ConfigureDefaultConfiguration` becomes available to call. In DefaultConfiguration, `SetBasePath(System.IO.Directory.GetCurrentDirectory())` and `AddJsonFile("appsettings.json", optional: true)` are executed before calling `Action<IConfigurationBuilder> configure`.
 
 Furthermore, overloads of `Action<IConfiguration, IServiceCollection> configure` and `Action<IConfiguration, ILoggingBuilder> configure` are added to `ConfigureServices` and `ConfigureLogging`, allowing you to retrieve the Configuration when executing the delegate.
 
diff --git a/sandbox/GeneratorSandbox/GeneratorSandbox.csproj b/sandbox/GeneratorSandbox/GeneratorSandbox.csproj
@@ -16,8 +16,10 @@
 
 	<ItemGroup>
 		<!--<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
-		<PackageReference Include="ZLogger" Version="2.5.9" />-->
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />-->
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+		<!--<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />-->
+		<!--<PackageReference Include="ZLogger" Version="2.5.9" />-->
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/sandbox/GeneratorSandbox/Program.cs b/sandbox/GeneratorSandbox/Program.cs
@@ -1,6 +1,7 @@
 ﻿#nullable enable
 
 using ConsoleAppFramework;
+using Microsoft.Extensions.DependencyInjection;
 //using Microsoft.Extensions.Configuration;
 //using Microsoft.Extensions.DependencyInjection;
 //// using Microsoft.Extensions.Hosting;
@@ -27,6 +28,10 @@
 
 //app.Add<MyCommand>();
 //app.Run(args);
+// sc.BuildServiceProvider()
+
+//IServiceProvider ser;
+//ser.CreateScope()
 
 ConsoleApp.Run(args, () => { });
 
diff --git a/src/ConsoleAppFramework/ConsoleAppGenerator.cs b/src/ConsoleAppFramework/ConsoleAppGenerator.cs
@@ -16,63 +16,56 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         context.RegisterPostInitializationOutput(EmitConsoleAppTemplateSource);
 
         // Emti ConfigureConfiguration/Logging/Services and Host.AsConsoleApp
-        var hasDependencyInjection = context.MetadataReferencesProvider
+        var hasReferences = context.MetadataReferencesProvider
             .Collect()
             .Select((xs, _) =>
             {
                 var hasDependencyInjection = false;
                 var hasLogging = false;
                 var hasConfiguration = false;
                 var hasJsonConfiguration = false;
-                var hasHostAbstraction = false;
                 var hasHost = false;
 
                 foreach (var x in xs)
                 {
                     var name = x.Display;
                     if (name == null) continue;
 
-                    if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.Abstractions.dll"))
+                    if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.dll")) // BuildServiceProvider
                     {
                         hasDependencyInjection = true;
                         continue;
                     }
 
-                    if (!hasLogging && name.EndsWith("Microsoft.Extensions.Logging.Abstractions.dll"))
+                    if (!hasLogging && name.EndsWith("Microsoft.Extensions.Logging.dll")) // AddLogging
                     {
                         hasLogging = true;
                         continue;
                     }
 
-                    if (!hasConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Abstractions.dll"))
+                    if (!hasConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.dll")) // needs ConfigurationBuilder
                     {
                         hasConfiguration = true;
                         continue;
                     }
 
-                    if (!hasJsonConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Json.dll"))
+                    if (!hasJsonConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Json.dll")) // AddJson
                     {
                         hasJsonConfiguration = true;
                         continue;
                     }
 
-                    if (!hasHostAbstraction && name.EndsWith("Microsoft.Extensions.Hosting.Abstractions.dll"))
-                    {
-                        hasHostAbstraction = true;
-                        continue;
-                    }
-
-                    if (!hasHost && name.EndsWith("Microsoft.Extensions.Hosting.dll"))
+                    if (!hasHost && name.EndsWith("Microsoft.Extensions.Hosting.dll")) // IHostBuilder, ApplicationHostBuilder
                     {
                         hasHost = true;
                         continue;
                     }
                 }
 
-                return new DllReference(hasDependencyInjection, hasLogging, hasConfiguration, hasJsonConfiguration, hasHostAbstraction, hasHost);
+                return new DllReference(hasDependencyInjection, hasLogging, hasConfiguration, hasJsonConfiguration, hasHost);
             });
 
-        context.RegisterSourceOutput(hasDependencyInjection, EmitConsoleAppConfigure);
+        context.RegisterSourceOutput(hasReferences, EmitConsoleAppConfigure);
 
         // get Options for Combine
         var generatorOptions = context.CompilationProvider.Select((compilation, token) =>
@@ -291,7 +284,7 @@ static void EmitConsoleAppBuilder(SourceProductionContext sourceProductionContex
 
     static void EmitConsoleAppConfigure(SourceProductionContext sourceProductionContext, DllReference dllReference)
     {
-        if (!dllReference.HasDependencyInjection && !dllReference.HasLogging && !dllReference.HasConfiguration && !dllReference.HasHost && !dllReference.HasHostAbstraction)
+        if (!dllReference.HasDependencyInjection && !dllReference.HasLogging && !dllReference.HasConfiguration && !dllReference.HasHost)
         {
             return;
         }
@@ -312,7 +305,7 @@ static void EmitConsoleAppConfigure(SourceProductionContext sourceProductionCont
             sb.AppendLine("using Microsoft.Extensions.Configuration;");
         }
 
-        if (dllReference.HasHost || dllReference.HasHostAbstraction)
+        if (dllReference.HasHost)
         {
             var sb2 = sb.Clone();
             sb2.AppendLine("using Microsoft.Extensions.Hosting;");
diff --git a/src/ConsoleAppFramework/Emitter.cs b/src/ConsoleAppFramework/Emitter.cs
@@ -839,11 +839,6 @@ public void Dispose()
         }
     }
 
-""");
-
-        if (dllReference.HasHostAbstraction)
-        {
-            sb.AppendLine("""
     internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this IHostBuilder hostBuilder)
     {
         var host = hostBuilder.Build();
@@ -855,12 +850,6 @@ internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this IHostBuild
         return ConsoleApp.Create();
     }
 
-""");
-        }
-
-        if (dllReference.HasHost)
-        {
-            sb.AppendLine("""
     internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this HostApplicationBuilder hostBuilder)
     {
         var host = hostBuilder.Build();
@@ -871,10 +860,8 @@ internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this HostApplic
                 
         return ConsoleApp.Create();
     }
+}
 """);
-
-            sb.AppendLine("}");
-        }
     }
 
     internal record CommandWithId(string? FieldType, Command Command, int Id)
diff --git a/src/ConsoleAppFramework/SourceGeneratorContexts.cs b/src/ConsoleAppFramework/SourceGeneratorContexts.cs
@@ -2,4 +2,4 @@
 
 readonly record struct ConsoleAppFrameworkGeneratorOptions(bool DisableNamingConversion);
 
-readonly record struct DllReference(bool HasDependencyInjection, bool HasLogging, bool HasConfiguration, bool HasJsonConfiguration, bool HasHostAbstraction, bool HasHost);
+readonly record struct DllReference(bool HasDependencyInjection, bool HasLogging, bool HasConfiguration, bool HasJsonConfiguration, bool HasHost);

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ public class PositionOptions`
`1016`	`1016`	`}`
`1017`	`1017`	```
`1018`	`1018`
`1019`		-When `Microsoft.Extensions.Configuration.Abstractions` is imported, `ConfigureEmptyConfiguration` becomes available to call. Additionally, when `Microsoft.Extensions.Configuration.Json` is imported, `ConfigureDefaultConfiguration` becomes available to call. In DefaultConfiguration, `SetBasePath(System.IO.Directory.GetCurrentDirectory())` and `AddJsonFile("appsettings.json", optional: true)` are executed before calling `Action<IConfigurationBuilder> configure`.
	`1019`	+When `Microsoft.Extensions.Configuration` is imported, `ConfigureEmptyConfiguration` becomes available to call. Additionally, when `Microsoft.Extensions.Configuration.Json` is imported, `ConfigureDefaultConfiguration` becomes available to call. In DefaultConfiguration, `SetBasePath(System.IO.Directory.GetCurrentDirectory())` and `AddJsonFile("appsettings.json", optional: true)` are executed before calling `Action<IConfigurationBuilder> configure`.
`1020`	`1020`
`1021`	`1021`	Furthermore, overloads of `Action<IConfiguration, IServiceCollection> configure` and `Action<IConfiguration, ILoggingBuilder> configure` are added to `ConfigureServices` and `ConfigureLogging`, allowing you to retrieve the Configuration when executing the delegate.
`1022`	`1022`
Original file line number	Diff line number	Diff line change
`@@ -16,63 +16,56 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`16`	`16`	`context.RegisterPostInitializationOutput(EmitConsoleAppTemplateSource);`
`17`	`17`
`18`	`18`	`// Emti ConfigureConfiguration/Logging/Services and Host.AsConsoleApp`
`19`		`- var hasDependencyInjection = context.MetadataReferencesProvider`
	`19`	`+ var hasReferences = context.MetadataReferencesProvider`
`20`	`20`	`.Collect()`
`21`	`21`	`.Select((xs, _) =>`
`22`	`22`	`{`
`23`	`23`	`var hasDependencyInjection = false;`
`24`	`24`	`var hasLogging = false;`
`25`	`25`	`var hasConfiguration = false;`
`26`	`26`	`var hasJsonConfiguration = false;`
`27`		`- var hasHostAbstraction = false;`
`28`	`27`	`var hasHost = false;`
`29`	`28`
`30`	`29`	`foreach (var x in xs)`
`31`	`30`	`{`
`32`	`31`	`var name = x.Display;`
`33`	`32`	`if (name == null) continue;`
`34`	`33`
`35`		`- if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.Abstractions.dll"))`
	`34`	`+ if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.dll")) // BuildServiceProvider`
`36`	`35`	`{`
`37`	`36`	`hasDependencyInjection = true;`
`38`	`37`	`continue;`
`39`	`38`	`}`
`40`	`39`
`41`		`- if (!hasLogging && name.EndsWith("Microsoft.Extensions.Logging.Abstractions.dll"))`
	`40`	`+ if (!hasLogging && name.EndsWith("Microsoft.Extensions.Logging.dll")) // AddLogging`
`42`	`41`	`{`
`43`	`42`	`hasLogging = true;`
`44`	`43`	`continue;`
`45`	`44`	`}`
`46`	`45`
`47`		`- if (!hasConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Abstractions.dll"))`
	`46`	`+ if (!hasConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.dll")) // needs ConfigurationBuilder`
`48`	`47`	`{`
`49`	`48`	`hasConfiguration = true;`
`50`	`49`	`continue;`
`51`	`50`	`}`
`52`	`51`
`53`		`- if (!hasJsonConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Json.dll"))`
	`52`	`+ if (!hasJsonConfiguration && name.EndsWith("Microsoft.Extensions.Configuration.Json.dll")) // AddJson`
`54`	`53`	`{`
`55`	`54`	`hasJsonConfiguration = true;`
`56`	`55`	`continue;`
`57`	`56`	`}`
`58`	`57`
`59`		`- if (!hasHostAbstraction && name.EndsWith("Microsoft.Extensions.Hosting.Abstractions.dll"))`
`60`		`- {`
`61`		`- hasHostAbstraction = true;`
`62`		`- continue;`
`63`		`- }`
`64`		`-`
`65`		`- if (!hasHost && name.EndsWith("Microsoft.Extensions.Hosting.dll"))`
	`58`	`+ if (!hasHost && name.EndsWith("Microsoft.Extensions.Hosting.dll")) // IHostBuilder, ApplicationHostBuilder`
`66`	`59`	`{`
`67`	`60`	`hasHost = true;`
`68`	`61`	`continue;`
`69`	`62`	`}`
`70`	`63`	`}`
`71`	`64`
`72`		`- return new DllReference(hasDependencyInjection, hasLogging, hasConfiguration, hasJsonConfiguration, hasHostAbstraction, hasHost);`
	`65`	`+ return new DllReference(hasDependencyInjection, hasLogging, hasConfiguration, hasJsonConfiguration, hasHost);`
`73`	`66`	`});`
`74`	`67`
`75`		`- context.RegisterSourceOutput(hasDependencyInjection, EmitConsoleAppConfigure);`
	`68`	`+ context.RegisterSourceOutput(hasReferences, EmitConsoleAppConfigure);`
`76`	`69`
`77`	`70`	`// get Options for Combine`
`78`	`71`	`var generatorOptions = context.CompilationProvider.Select((compilation, token) =>`
`@@ -291,7 +284,7 @@ static void EmitConsoleAppBuilder(SourceProductionContext sourceProductionContex`
`291`	`284`
`292`	`285`	`static void EmitConsoleAppConfigure(SourceProductionContext sourceProductionContext, DllReference dllReference)`
`293`	`286`	`{`
`294`		`- if (!dllReference.HasDependencyInjection && !dllReference.HasLogging && !dllReference.HasConfiguration && !dllReference.HasHost && !dllReference.HasHostAbstraction)`
	`287`	`+ if (!dllReference.HasDependencyInjection && !dllReference.HasLogging && !dllReference.HasConfiguration && !dllReference.HasHost)`
`295`	`288`	`{`
`296`	`289`	`return;`
`297`	`290`	`}`
`@@ -312,7 +305,7 @@ static void EmitConsoleAppConfigure(SourceProductionContext sourceProductionCont`
`312`	`305`	`sb.AppendLine("using Microsoft.Extensions.Configuration;");`
`313`	`306`	`}`
`314`	`307`
`315`		`- if (dllReference.HasHost \|\| dllReference.HasHostAbstraction)`
	`308`	`+ if (dllReference.HasHost)`
`316`	`309`	`{`
`317`	`310`	`var sb2 = sb.Clone();`
`318`	`311`	`sb2.AppendLine("using Microsoft.Extensions.Hosting;");`
Original file line number	Diff line number	Diff line change
`@@ -839,11 +839,6 @@ public void Dispose()`
`839`	`839`	`}`
`840`	`840`	`}`
`841`	`841`
`842`		`-""");`
`843`		`-`
`844`		`- if (dllReference.HasHostAbstraction)`
`845`		`- {`
`846`		`- sb.AppendLine("""`
`847`	`842`	`internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this IHostBuilder hostBuilder)`
`848`	`843`	`{`
`849`	`844`	`var host = hostBuilder.Build();`
`@@ -855,12 +850,6 @@ internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this IHostBuild`
`855`	`850`	`return ConsoleApp.Create();`
`856`	`851`	`}`
`857`	`852`
`858`		`-""");`
`859`		`- }`
`860`		`-`
`861`		`- if (dllReference.HasHost)`
`862`		`- {`
`863`		`- sb.AppendLine("""`
`864`	`853`	`internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this HostApplicationBuilder hostBuilder)`
`865`	`854`	`{`
`866`	`855`	`var host = hostBuilder.Build();`
`@@ -871,10 +860,8 @@ internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this HostApplic`
`871`	`860`
`872`	`861`	`return ConsoleApp.Create();`
`873`	`862`	`}`
	`863`	`+}`
`874`	`864`	`""");`
`875`		`-`
`876`		`- sb.AppendLine("}");`
`877`		`- }`
`878`	`865`	`}`
`879`	`866`
`880`	`867`	`internal record CommandWithId(string? FieldType, Command Command, int Id)`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`readonly record struct ConsoleAppFrameworkGeneratorOptions(bool DisableNamingConversion);`
`4`	`4`
`5`		`-readonly record struct DllReference(bool HasDependencyInjection, bool HasLogging, bool HasConfiguration, bool HasJsonConfiguration, bool HasHostAbstraction, bool HasHost);`
	`5`	`+readonly record struct DllReference(bool HasDependencyInjection, bool HasLogging, bool HasConfiguration, bool HasJsonConfiguration, bool HasHost);`