调整插件项目中应用构建的编译条件。 🉑

Zongsoft · Dec 2, 2023 · 46bc7d5 · 46bc7d5
1 parent 765c342
commit 46bc7d5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Zongsoft.Plugins.Web/src/Application.cs b/Zongsoft.Plugins.Web/src/Application.cs
@@ -39,7 +39,7 @@ namespace Zongsoft.Web
 {
 	public static class Application
 	{
-#if NET7_0
+#if NET7_0_OR_GREATER
 		public static WebApplication Web(Action<Microsoft.AspNetCore.Builder.WebApplicationBuilder> configure = null) => Web(null, null, configure);
 		public static WebApplication Web(string[] args, Action<Microsoft.AspNetCore.Builder.WebApplicationBuilder> configure = null) => Web(null, args, configure);
 		public static WebApplication Web(string name, Action<Microsoft.AspNetCore.Builder.WebApplicationBuilder> configure = null) => Web(name, null, configure);

diff --git a/Zongsoft.Plugins.Web/src/WebApplicationBuilder.cs b/Zongsoft.Plugins.Web/src/WebApplicationBuilder.cs
@@ -49,7 +49,7 @@
 
 namespace Zongsoft.Web
 {
-#if NET7_0
+#if NET7_0_OR_GREATER
 	public partial class WebApplicationBuilder : ApplicationBuilderBase<WebApplication>
 	{
 		private readonly Microsoft.AspNetCore.Builder.WebApplicationBuilder _builder;

diff --git a/Zongsoft.Plugins/src/Hosting/Application.Daemon.cs b/Zongsoft.Plugins/src/Hosting/Application.Daemon.cs
@@ -39,7 +39,7 @@ partial class Application
 	{
 		private sealed class DaemonApplicationBuilder : ApplicationBuilder
 		{
-#if NET7_0
+#if NET7_0_OR_GREATER
 			public DaemonApplicationBuilder(string name, string[] args, Action<HostApplicationBuilder> configure = null) : base(name, args, configure)
 			{
 				_logger = Zongsoft.Diagnostics.Logger.GetLogger(this.Environment.ApplicationName);

diff --git a/Zongsoft.Plugins/src/Hosting/Application.Terminal.cs b/Zongsoft.Plugins/src/Hosting/Application.Terminal.cs
@@ -42,7 +42,7 @@ partial class Application
 	{
 		private sealed class TerminalApplicationBuilder : ApplicationBuilder
 		{
-#if NET7_0
+#if NET7_0_OR_GREATER
 			public TerminalApplicationBuilder(string name, string[] args, Action<HostApplicationBuilder> configure = null) : base(name, args, configure)
 			{
 				_logger = Zongsoft.Diagnostics.Logger.GetLogger(this.Environment.ApplicationName);

diff --git a/Zongsoft.Plugins/src/Hosting/Application.cs b/Zongsoft.Plugins/src/Hosting/Application.cs
@@ -37,7 +37,7 @@ namespace Zongsoft.Plugins.Hosting
 {
 	public static partial class Application
 	{
-#if NET7_0
+#if NET7_0_OR_GREATER
 		public static IHost Daemon(Action<HostApplicationBuilder> configure = null) => Daemon(null, null, configure);
 		public static IHost Daemon(string[] args, Action<HostApplicationBuilder> configure = null) => Daemon(null, args, configure);
 		public static IHost Daemon(string name, Action<HostApplicationBuilder> configure = null) => Daemon(name, null, configure);

diff --git a/Zongsoft.Plugins/src/Hosting/ApplicationBuilder.cs b/Zongsoft.Plugins/src/Hosting/ApplicationBuilder.cs
@@ -134,7 +134,7 @@ protected static string GetApplicationName()
 
 	public class ApplicationBuilder : ApplicationBuilderBase<IHost>
 	{
-#if NET7_0
+#if NET7_0_OR_GREATER
 		private readonly HostApplicationBuilder _builder;
 		private readonly Action<HostApplicationBuilder> _configure;