From dfceb70567dda72e81dc97a42c1a51f461abd9b0 Mon Sep 17 00:00:00 2001 From: Nice3point Date: Sun, 10 Mar 2024 14:24:40 +0300 Subject: [PATCH] Update directives --- build/Build.CI.GitHub.cs | 5 +++- build/Build.Configuration.cs | 2 +- .../Application.cs | 6 ++--- .../Config/LoggerConfigurator.cs | 16 ++++++------- .../Host.cs | 24 +++++++++---------- .../Nice3point.Revit.AddIn.addin | 8 +++---- .../Nice3point.Revit.AddIn.csproj | 1 + .../CommandHandlers/ShowWindowHandler.cs | 8 +++---- .../Commands/StartupCommand.cs | 14 +++++------ .../Nice3point.Revit.AddIn.sln | 6 ++--- .../azure-pipelines.yml | 4 ++-- .../build/Build.Bundle.cs | 4 ++-- .../build/Build.CI.GitHub.cs | 4 ++-- .../build/Build.Configuration.cs | 8 +++---- .../build/Build.Installer.cs | 2 +- .../build/Build.Regex.cs | 6 ++--- .../build/Build.cs | 10 ++++---- source/Nice3point.Revit.AddIn/Application.cs | 6 ++--- .../Commands/StartupCommand.cs | 24 +++++++++---------- .../Config/LoggerConfigurator.cs | 16 ++++++------- source/Nice3point.Revit.AddIn/Host.cs | 10 ++++---- .../Nice3point.Revit.AddIn.addin | 8 +++---- .../Nice3point.Revit.AddInViewModel.cs | 6 ++--- 23 files changed, 101 insertions(+), 97 deletions(-) diff --git a/build/Build.CI.GitHub.cs b/build/Build.CI.GitHub.cs index 73fca9f..141980e 100644 --- a/build/Build.CI.GitHub.cs +++ b/build/Build.CI.GitHub.cs @@ -31,7 +31,10 @@ sealed partial class Build { Name = Version, Body = changelog, - TargetCommitish = GitRepository.Commit + TargetCommitish = GitRepository.Commit, + Prerelease = Version.Contains("-beta") || + Version.Contains("-dev") || + Version.Contains("-preview") }; var release = await GitHubTasks.GitHubClient.Repository.Release.Create(gitHubOwner, gitHubName, newRelease); diff --git a/build/Build.Configuration.cs b/build/Build.Configuration.cs index 9b9dc39..7b5aaac 100644 --- a/build/Build.Configuration.cs +++ b/build/Build.Configuration.cs @@ -1,6 +1,6 @@ sealed partial class Build { - const string Version = "4.0.0"; + const string Version = "4.0.0-preview.1.0"; readonly AbsolutePath ArtifactsDirectory = RootDirectory / "output"; readonly AbsolutePath ChangeLogPath = RootDirectory / "Changelog.md"; diff --git a/source/Nice3point.Revit.AddIn.Application/Application.cs b/source/Nice3point.Revit.AddIn.Application/Application.cs index 067e38d..0c4bf7f 100644 --- a/source/Nice3point.Revit.AddIn.Application/Application.cs +++ b/source/Nice3point.Revit.AddIn.Application/Application.cs @@ -14,7 +14,7 @@ public class Application : ExternalApplication { public override void OnStartup() { -#if UseIoc +#if (UseIoc) Host.Start(); #endif #if (log && !UseIoc) @@ -26,9 +26,9 @@ public override void OnStartup() public override void OnShutdown() { -#if Hosting +#if (Hosting) Host.Stop(); -#elseif log +#elseif (log) Log.CloseAndFlush(); #endif } diff --git a/source/Nice3point.Revit.AddIn.Application/Config/LoggerConfigurator.cs b/source/Nice3point.Revit.AddIn.Application/Config/LoggerConfigurator.cs index ab4f3b7..cf4b2cd 100644 --- a/source/Nice3point.Revit.AddIn.Application/Config/LoggerConfigurator.cs +++ b/source/Nice3point.Revit.AddIn.Application/Config/LoggerConfigurator.cs @@ -1,7 +1,7 @@ -#if Container +#if (Container) using Microsoft.Extensions.DependencyInjection; #endif -#if Hosting +#if (Hosting) using Microsoft.Extensions.Logging; #endif using Serilog.Core; @@ -11,13 +11,13 @@ namespace Nice3point.Revit.AddIn.Config; public static class LoggerConfigurator { -#if Container +#if (Container) private const string LogTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}]: {Message:lj}{NewLine}{Exception}"; -#elseif Hosting +#elseif (Hosting) private const string LogTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] {SourceContext}: {Message:lj}{NewLine}{Exception}"; #endif -#if Container +#if (Container) public static void AddSerilogConfiguration(this IServiceCollection services) { var logger = CreateDefaultLogger(); @@ -25,7 +25,7 @@ public static void AddSerilogConfiguration(this IServiceCollection services) AppDomain.CurrentDomain.UnhandledException += OnOnUnhandledException; } -#elseif Hosting +#elseif (Hosting) public static void AddSerilogConfiguration(this ILoggingBuilder builder) { var logger = CreateDefaultLogger(); @@ -43,14 +43,14 @@ private static Logger CreateDefaultLogger() .CreateLogger(); } -#if Container +#if (Container) private static void OnOnUnhandledException(object sender, UnhandledExceptionEventArgs args) { var exception = (Exception)args.ExceptionObject; var logger = Host.GetService(); logger.Fatal(exception, "Domain unhandled exception"); } -#elseif Hosting +#elseif (Hosting) private static void OnOnUnhandledException(object sender, UnhandledExceptionEventArgs args) { var exception = (Exception)args.ExceptionObject; diff --git a/source/Nice3point.Revit.AddIn.Application/Host.cs b/source/Nice3point.Revit.AddIn.Application/Host.cs index 2ab0202..70a4fbe 100644 --- a/source/Nice3point.Revit.AddIn.Application/Host.cs +++ b/source/Nice3point.Revit.AddIn.Application/Host.cs @@ -1,12 +1,12 @@ -#if Hosting -using System.IO +#if (Hosting) +using System.IO; using System.Reflection; using Microsoft.Extensions.Hosting; #endif #if (log && Hosting) using Microsoft.Extensions.Logging; #endif -#if Container +#if (Container) using Microsoft.Extensions.DependencyInjection; #endif #if (log && UseIoc) @@ -20,10 +20,10 @@ namespace Nice3point.Revit.AddIn; /// public static class Host { -#if Container +#if (Container) private static IServiceProvider _serviceProvider; #endif -#if Hosting +#if (Hosting) private static IHost _host; #endif @@ -32,22 +32,22 @@ public static class Host /// public static void Start() { -#if Container +#if (Container) var services = new ServiceCollection(); -#if log +#if (log) services.AddSerilogConfiguration(); #endif _serviceProvider = services.BuildServiceProvider(); #endif -#if Hosting +#if (Hosting) var builder = Microsoft.Extensions.Hosting.Host.CreateApplicationBuilder(new HostApplicationBuilderSettings { ContentRootPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly()!.Location), DisableDefaults = true }); -#if log +#if (log) builder.Logging.ClearProviders(); builder.Logging.AddSerilogConfiguration(); @@ -57,7 +57,7 @@ public static void Start() _host.Start(); #endif } -#if Hosting +#if (Hosting) /// /// Stops the host. @@ -75,10 +75,10 @@ public static void Stop() /// A service object of type T or null if there is no such service. public static T GetService() where T : class { -#if Container +#if (Container) return _serviceProvider.GetService(typeof(T)) as T; #endif -#if Hosting +#if (Hosting) return _host.Services.GetService(typeof(T)) as T; #endif } diff --git a/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.addin b/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.addin index e299b33..d6d850c 100644 --- a/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.addin +++ b/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.addin @@ -1,16 +1,16 @@  -#if Command +#if (Command) -#elseif Application +#elseif (Application) #endif Nice3point.Revit.AddIn Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.dll AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA -#if Command +#if (Command) Nice3point.Revit.AddIn.Commands.StartupCommand Nice3point.Revit.AddIn -#elseif Application +#elseif (Application) Nice3point.Revit.AddIn.Application #endif Development diff --git a/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.csproj b/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.csproj index 5b37aa2..98e18cd 100644 --- a/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.csproj +++ b/source/Nice3point.Revit.AddIn.Application/Nice3point.Revit.AddIn.csproj @@ -105,6 +105,7 @@ + diff --git a/source/Nice3point.Revit.AddIn.Module/CommandHandlers/ShowWindowHandler.cs b/source/Nice3point.Revit.AddIn.Module/CommandHandlers/ShowWindowHandler.cs index 86d84e4..c3a036c 100644 --- a/source/Nice3point.Revit.AddIn.Module/CommandHandlers/ShowWindowHandler.cs +++ b/source/Nice3point.Revit.AddIn.Module/CommandHandlers/ShowWindowHandler.cs @@ -1,6 +1,6 @@ using Nice3point.Revit.Toolkit.External; using Nice3point.Revit.AddIn.Views; -#if Modeless +#if (Modeless) using Nice3point.Revit.AddIn.Utils; using Microsoft.Extensions.DependencyInjection; #endif @@ -10,7 +10,7 @@ namespace Nice3point.Revit.AddIn.CommandHandlers; /// /// Command entry point invoked from the Revit AddIn Application /// -#if Modeless +#if (Modeless) public class ShowWindowHandler(IServiceProvider serviceProvider) #else public class ShowWindowHandler(Nice3point.Revit.AddInView view) @@ -18,12 +18,12 @@ public class ShowWindowHandler(Nice3point.Revit.AddInView view) { public void Execute(ExternalCommand shell) { -#if Modeless +#if (Modeless) if (WindowController.Focus()) return; var view = serviceProvider.GetService(); WindowController.Show(view, shell.UiApplication.MainWindowHandle); -#elseif Modal +#elseif (Modal) view.ShowDialog(); #endif } diff --git a/source/Nice3point.Revit.AddIn.Module/Commands/StartupCommand.cs b/source/Nice3point.Revit.AddIn.Module/Commands/StartupCommand.cs index 153c778..30278ae 100644 --- a/source/Nice3point.Revit.AddIn.Module/Commands/StartupCommand.cs +++ b/source/Nice3point.Revit.AddIn.Module/Commands/StartupCommand.cs @@ -1,15 +1,15 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -#if NoWindow +#if (NoWindow) using Autodesk.Revit.UI; #endif -#if !NoWindow +#if (!NoWindow) using Nice3point.Revit.AddIn.ViewModels; #endif -#if !NoWindow +#if (!NoWindow) using Nice3point.Revit.AddIn.Views; #endif -#if Modeless +#if (Modeless) using Nice3point.Revit.AddIn.Utils; #endif @@ -24,17 +24,17 @@ public class StartupCommand : ExternalCommand { public override void Execute() { -#if Modeless +#if (Modeless) if (WindowController.Focus()) return; var viewModel = new Nice3point.Revit.AddInViewModel(); var view = new Nice3point.Revit.AddInView(viewModel); WindowController.Show(view, UiApplication.MainWindowHandle); -#elseif Modal +#elseif (Modal) var viewModel = new Nice3point.Revit.AddInViewModel(); var view = new Nice3point.Revit.AddInView(viewModel); view.ShowDialog(); -#elseif NoWindow +#elseif (NoWindow) TaskDialog.Show(Document.Title, "Nice3point.Revit.AddIn"); #endif } diff --git a/source/Nice3point.Revit.AddIn.Solution/Nice3point.Revit.AddIn.sln b/source/Nice3point.Revit.AddIn.Solution/Nice3point.Revit.AddIn.sln index cbffe8c..a2cc39f 100644 --- a/source/Nice3point.Revit.AddIn.Solution/Nice3point.Revit.AddIn.sln +++ b/source/Nice3point.Revit.AddIn.Solution/Nice3point.Revit.AddIn.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore -#if GitHubPipeline +#if (GitHubPipeline) Changelog.md = Changelog.md #endif Readme.md = Readme.md @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA}") = "Build", "build\Build.csproj", "{CCCCCCCC-CCCC-CCCC-CCCC-CCCCCCCCCCCC}" EndProject -#if installer +#if (installer) Project("{AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA}") = "Installer", "install\Installer.csproj", "{BBBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB}" EndProject #endif @@ -30,7 +30,7 @@ Global Release R23|Any CPU = Release R23|Any CPU Release R24|Any CPU = Release R24|Any CPU Release R25|Any CPU = Release R25|Any CPU -#if installer +#if (installer) Installer|Any CPU = Installer|Any CPU #endif EndGlobalSection diff --git a/source/Nice3point.Revit.AddIn.Solution/azure-pipelines.yml b/source/Nice3point.Revit.AddIn.Solution/azure-pipelines.yml index d36d631..86e00b4 100644 --- a/source/Nice3point.Revit.AddIn.Solution/azure-pipelines.yml +++ b/source/Nice3point.Revit.AddIn.Solution/azure-pipelines.yml @@ -18,9 +18,9 @@ stages: inputs: #if (bundle && installer) script: './.nuke/build.cmd CreateBundle CreateInstaller' -#elseif installer +#elseif (installer) script: './.nuke/build.cmd CreateInstaller' -#elseif bundle +#elseif (bundle) script: './.nuke/build.cmd CreateBundle' #else script: './.nuke/build.cmd' diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.Bundle.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.Bundle.cs index 07eac88..4d35e25 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.Bundle.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.Bundle.cs @@ -1,6 +1,6 @@ using Autodesk.PackageBuilder; using System.Xml.Linq; -#if !NoPipeline +#if (!NoPipeline) using Nuke.Common.Git; #endif using Nuke.Common.ProjectModel; @@ -10,7 +10,7 @@ sealed partial class Build { Target CreateBundle => _ => _ .DependsOn(Compile) -#if !NoPipeline +#if (!NoPipeline) .OnlyWhenStatic(() => IsLocalBuild || GitRepository.IsOnMainOrMasterBranch()) #endif .Executes(() => diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.CI.GitHub.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.CI.GitHub.cs index 8fe3ff8..e4b2cb0 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.CI.GitHub.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.CI.GitHub.cs @@ -9,9 +9,9 @@ sealed partial class Build Target PublishGitHub => _ => _ #if (installer && bundle) .DependsOn(CreateInstaller, CreateBundle) -#elseif installer +#elseif (installer) .DependsOn(CreateInstaller) -#elseif bundle +#elseif (bundle) .DependsOn(CreateBundle) #else .DependsOn(Compile) diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.Configuration.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.Configuration.cs index 5c5eddd..490d91b 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.Configuration.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.Configuration.cs @@ -4,7 +4,7 @@ #if (bundle || installer || GitHubPipeline) readonly AbsolutePath ArtifactsDirectory = RootDirectory / "output"; #endif -#if GitHubPipeline +#if (GitHubPipeline) readonly AbsolutePath ChangeLogPath = RootDirectory / "Changelog.md"; #endif @@ -13,18 +13,18 @@ protected override void OnBuildInitialized() Configurations = [ "Release*", -#if installer +#if (installer) "Installer*" #endif ]; -#if bundle +#if (bundle) Bundles = [ Solution.Nice3point.Revit.AddIn ]; #endif -#if installer +#if (installer) InstallersMap = new() { diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.Installer.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.Installer.cs index 9d3b3b9..da536e7 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.Installer.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.Installer.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -#if !NoPipeline +#if (!NoPipeline) using Nuke.Common.Git; #endif using Nuke.Common.Tooling; diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.Regex.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.Regex.cs index a404285..0eac639 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.Regex.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.Regex.cs @@ -2,13 +2,13 @@ sealed partial class Build { -#if bundle +#if (bundle) readonly Regex YearRegex = YearRegexGenerator(); #endif -#if installer +#if (installer) readonly Regex ArgumentsRegex = ArgumentsRegexGenerator(); #endif -#if bundle +#if (bundle) [GeneratedRegex(@"\d{4}")] private static partial Regex YearRegexGenerator(); diff --git a/source/Nice3point.Revit.AddIn.Solution/build/Build.cs b/source/Nice3point.Revit.AddIn.Solution/build/Build.cs index faeb556..7831e22 100644 --- a/source/Nice3point.Revit.AddIn.Solution/build/Build.cs +++ b/source/Nice3point.Revit.AddIn.Solution/build/Build.cs @@ -1,4 +1,4 @@ -#if !NoPipeline +#if (!NoPipeline) using Nuke.Common.Git; #endif using Nuke.Common.ProjectModel; @@ -6,17 +6,17 @@ sealed partial class Build : NukeBuild { string[] Configurations; -#if bundle +#if (bundle) Project[] Bundles; #endif -#if installer +#if (installer) Dictionary InstallersMap; #endif -#if GitHubPipeline +#if (GitHubPipeline) [Secret] [Parameter] string GitHubToken; #endif -#if !NoPipeline +#if (!NoPipeline) [GitRepository] readonly GitRepository GitRepository; #endif [Solution(GenerateProjects = true)] Solution Solution; diff --git a/source/Nice3point.Revit.AddIn/Application.cs b/source/Nice3point.Revit.AddIn/Application.cs index 067e38d..0c4bf7f 100644 --- a/source/Nice3point.Revit.AddIn/Application.cs +++ b/source/Nice3point.Revit.AddIn/Application.cs @@ -14,7 +14,7 @@ public class Application : ExternalApplication { public override void OnStartup() { -#if UseIoc +#if (UseIoc) Host.Start(); #endif #if (log && !UseIoc) @@ -26,9 +26,9 @@ public override void OnStartup() public override void OnShutdown() { -#if Hosting +#if (Hosting) Host.Stop(); -#elseif log +#elseif (log) Log.CloseAndFlush(); #endif } diff --git a/source/Nice3point.Revit.AddIn/Commands/StartupCommand.cs b/source/Nice3point.Revit.AddIn/Commands/StartupCommand.cs index 0b65713..e695215 100644 --- a/source/Nice3point.Revit.AddIn/Commands/StartupCommand.cs +++ b/source/Nice3point.Revit.AddIn/Commands/StartupCommand.cs @@ -1,18 +1,18 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -#if NoWindow +#if (NoWindow) using Autodesk.Revit.UI; #endif -#if !NoWindow && !UseIoc +#if (!NoWindow && !UseIoc) using Nice3point.Revit.AddIn.ViewModels; #endif -#if !NoWindow +#if (!NoWindow) using Nice3point.Revit.AddIn.Views; #endif -#if Modeless +#if (Modeless) using Nice3point.Revit.AddIn.Utils; #endif -#if log && Command +#if (log && Command) using Serilog.Events; #endif @@ -27,7 +27,7 @@ public class StartupCommand : ExternalCommand { public override void Execute() { -#if log && Command && !UseIoc +#if (log && Command && !UseIoc) var logger = CreateLogger(); #endif #if (Modeless && UseIoc) @@ -35,26 +35,26 @@ public override void Execute() var view = Host.GetService(); WindowController.Show(view, UiApplication.MainWindowHandle); -#elseif Modal && UseIoc +#elseif (Modal && UseIoc) var view = Host.GetService(); view.ShowDialog(); -#elseif NoWindow && UseIoc +#elseif (NoWindow && UseIoc) TaskDialog.Show(Document.Title, "Nice3point.Revit.AddIn"); -#elseif Modeless +#elseif (Modeless) if (WindowController.Focus()) return; var viewModel = new Nice3point.Revit.AddInViewModel(); var view = new Nice3point.Revit.AddInView(viewModel); WindowController.Show(view, UiApplication.MainWindowHandle); -#elseif Modal +#elseif (Modal) var viewModel = new Nice3point.Revit.AddInViewModel(); var view = new Nice3point.Revit.AddInView(viewModel); view.ShowDialog(); -#elseif NoWindow +#elseif (NoWindow) TaskDialog.Show(Document.Title, "Nice3point.Revit.AddIn"); #endif } -#if log && Command && !UseIoc +#if (log && Command && !UseIoc) private static ILogger CreateLogger() { diff --git a/source/Nice3point.Revit.AddIn/Config/LoggerConfigurator.cs b/source/Nice3point.Revit.AddIn/Config/LoggerConfigurator.cs index ab4f3b7..cf4b2cd 100644 --- a/source/Nice3point.Revit.AddIn/Config/LoggerConfigurator.cs +++ b/source/Nice3point.Revit.AddIn/Config/LoggerConfigurator.cs @@ -1,7 +1,7 @@ -#if Container +#if (Container) using Microsoft.Extensions.DependencyInjection; #endif -#if Hosting +#if (Hosting) using Microsoft.Extensions.Logging; #endif using Serilog.Core; @@ -11,13 +11,13 @@ namespace Nice3point.Revit.AddIn.Config; public static class LoggerConfigurator { -#if Container +#if (Container) private const string LogTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}]: {Message:lj}{NewLine}{Exception}"; -#elseif Hosting +#elseif (Hosting) private const string LogTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] {SourceContext}: {Message:lj}{NewLine}{Exception}"; #endif -#if Container +#if (Container) public static void AddSerilogConfiguration(this IServiceCollection services) { var logger = CreateDefaultLogger(); @@ -25,7 +25,7 @@ public static void AddSerilogConfiguration(this IServiceCollection services) AppDomain.CurrentDomain.UnhandledException += OnOnUnhandledException; } -#elseif Hosting +#elseif (Hosting) public static void AddSerilogConfiguration(this ILoggingBuilder builder) { var logger = CreateDefaultLogger(); @@ -43,14 +43,14 @@ private static Logger CreateDefaultLogger() .CreateLogger(); } -#if Container +#if (Container) private static void OnOnUnhandledException(object sender, UnhandledExceptionEventArgs args) { var exception = (Exception)args.ExceptionObject; var logger = Host.GetService(); logger.Fatal(exception, "Domain unhandled exception"); } -#elseif Hosting +#elseif (Hosting) private static void OnOnUnhandledException(object sender, UnhandledExceptionEventArgs args) { var exception = (Exception)args.ExceptionObject; diff --git a/source/Nice3point.Revit.AddIn/Host.cs b/source/Nice3point.Revit.AddIn/Host.cs index 05d67a3..0744a45 100644 --- a/source/Nice3point.Revit.AddIn/Host.cs +++ b/source/Nice3point.Revit.AddIn/Host.cs @@ -1,15 +1,15 @@ -#if Hosting +#if (Hosting) using System.IO; using System.Reflection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; #endif -#if !NoWindow +#if (!NoWindow) using Microsoft.Extensions.DependencyInjection; #endif using Nice3point.Revit.AddIn.Views; using Nice3point.Revit.AddIn.ViewModels; -#if log && UseIoc +#if (log && UseIoc) using Nice3point.Revit.AddIn.Config; #endif @@ -38,7 +38,7 @@ public static void Start() services.AddSerilogConfiguration(); #endif -#if !NoWindow +#if (!NoWindow) services.AddTransient(); services.AddTransient(); @@ -57,7 +57,7 @@ public static void Start() builder.Logging.ClearProviders(); builder.Logging.AddSerilogConfiguration(); #endif -#if !NoWindow +#if (!NoWindow) builder.Services.AddTransient(); builder.Services.AddTransient(); diff --git a/source/Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.addin b/source/Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.addin index e299b33..d6d850c 100644 --- a/source/Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.addin +++ b/source/Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.addin @@ -1,16 +1,16 @@  -#if Command +#if (Command) -#elseif Application +#elseif (Application) #endif Nice3point.Revit.AddIn Nice3point.Revit.AddIn/Nice3point.Revit.AddIn.dll AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA -#if Command +#if (Command) Nice3point.Revit.AddIn.Commands.StartupCommand Nice3point.Revit.AddIn -#elseif Application +#elseif (Application) Nice3point.Revit.AddIn.Application #endif Development diff --git a/source/Nice3point.Revit.AddIn/ViewModels/Nice3point.Revit.AddInViewModel.cs b/source/Nice3point.Revit.AddIn/ViewModels/Nice3point.Revit.AddInViewModel.cs index 2656f88..339d590 100644 --- a/source/Nice3point.Revit.AddIn/ViewModels/Nice3point.Revit.AddInViewModel.cs +++ b/source/Nice3point.Revit.AddIn/ViewModels/Nice3point.Revit.AddInViewModel.cs @@ -8,11 +8,11 @@ namespace Nice3point.Revit.AddIn.ViewModels; -#if !log +#if (!log) public sealed class Nice3point.Revit.AddInViewModel : ObservableObject -#elseif Container +#elseif (Container) public sealed class Nice3point.Revit.AddInViewModel(ILogger logger) : ObservableObject -#elseif Hosting +#elseif (Hosting) public sealed class Nice3point.Revit.AddInViewModel(ILogger logger) : ObservableObject #else public sealed class Nice3point.Revit.AddInViewModel : ObservableObject