Arrange Directory.Build.targets

NetLah · Jan 13, 2024 · 70db452 · 70db452
1 parent a844ae4
commit 70db452
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -57,7 +57,7 @@
     <PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.*-*" />
     <PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.*-*" />
     <PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.*-*" />
-    <PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="0.*-*" />
+    <PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.*-*" />
     <PackageReference Update="Testing.Dynamic.Json" Version="1.*-*" />
 
     <!--tests-->

diff --git a/samples/SampleSpaWebApp/Directory.Build.targets b/samples/SampleSpaWebApp/Directory.Build.targets
diff --git a/samples/SampleSpaWebApp/Program.cs b/samples/SampleSpaWebApp/Program.cs
@@ -1,6 +1,6 @@
 using NetLah.Diagnostics;
 using NetLah.Extensions.Logging;
-using NetLah.Extensions.SpaServices.Hosting;
+using Serilog;
 
 AppLog.InitLogger("SampleWebApp");
 AppLog.Logger.LogInformation("Application starting...");
@@ -15,10 +15,15 @@
     var appInfo = builder.InitializeSpaApp();
     logger.LogApplicationLifetimeEvent("Application initializing...", appInfo);
 
-    IAssemblyInfo assembly = new AssemblyInfo(typeof(ResponseHeadersOptions).Assembly);
-    logger.LogInformation("Library:{title}; Version:{version} BuildTime:{buildTime}; Framework:{framework}",
+
+    IAssemblyInfo assembly = new AssemblyInfo(typeof(WebApplicationBuilderExtensions).Assembly);
+    logger.LogInformation("{title}; Version:{version} BuildTime:{buildTime}; Framework:{framework}",
         assembly.Title, assembly.InformationalVersion, assembly.BuildTimestampLocal, assembly.FrameworkName);
 
+    var asmSerilogAspNetCore = new AssemblyInfo(typeof(SerilogApplicationBuilderExtensions).Assembly);
+    logger.LogInformation("{title}; Version:{version} Framework:{framework}",
+        asmSerilogAspNetCore.Title, asmSerilogAspNetCore.InformationalVersion, asmSerilogAspNetCore.FrameworkName);
+
     builder.Services.AddApplicationInsightsTelemetry();
 
     builder.AddSpaApp();

diff --git a/src/Hosting/Directory.Build.override.targets → src/Directory.Build.override.targets b/src/Hosting/Directory.Build.override.targets → src/Directory.Build.override.targets
diff --git a/src/Hosting/Directory.Build.targets → src/Directory.Build.targets b/src/Hosting/Directory.Build.targets → src/Directory.Build.targets
@@ -36,13 +36,13 @@
     <!--the helpers -->
     <PackageReference Update="NetLah.Abstractions" Version="1.0.0" />
     <PackageReference Update="NetLah.Extensions.CommandLineUtils" Version="0.1.0-a1.2" />
-    <PackageReference Update="NetLah.Extensions.Configuration" Version="0.2.2" />
+    <PackageReference Update="NetLah.Extensions.Configuration" Version="1.0.0-rc1" />
     <PackageReference Update="NetLah.Extensions.EventAggregator" Version="0.2.1" />
     <PackageReference Update="NetLah.Extensions.HttpOverrides" Version="1.0.0-rc1" />
     <PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.0.0-rc1" />
     <PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.0-rc1" />
     <PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0-rc1" />
-    <PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="0.2.3" />
+    <PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.0.0-rc1" />
     <PackageReference Update="Testing.Dynamic.Json" Version="1.0.0-rc3" />
 
     <!--serilog-->

diff --git a/src/WebApp/Directory.Build.targets b/src/WebApp/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../../'))" />
+
+</Project>
diff --git a/src/WebApp/Program.cs b/src/WebApp/Program.cs
@@ -23,8 +23,8 @@
         assembly.Title, assembly.InformationalVersion, assembly.BuildTimestampLocal, assembly.FrameworkName);
 
     var asmSerilogAspNetCore = new AssemblyInfo(typeof(SerilogApplicationBuilderExtensions).Assembly);
-    logger.LogInformation("{title}; Version:{version} BuildTime:{buildTime}; Framework:{framework}",
-        asmSerilogAspNetCore.Title, asmSerilogAspNetCore.InformationalVersion, asmSerilogAspNetCore.BuildTimestampLocal, asmSerilogAspNetCore.FrameworkName);
+    logger.LogInformation("{title}; Version:{version} Framework:{framework}",
+        asmSerilogAspNetCore.Title, asmSerilogAspNetCore.InformationalVersion, asmSerilogAspNetCore.FrameworkName);
 #endif
 
     builder.CustomApplicationInsightsTelemetry(() => new DefaultAzureCredential());