Merge pull request #266 from K-Society/develop

Develop
K-Society · May 27, 2024 · c75c94a · c75c94a
2 parents ecf786c + 8d7e6d0
commit c75c94a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/00/Log/KSociety.Log.Install/Bundle.wxs b/src/00/Log/KSociety.Log.Install/Bundle.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Bundle Name="KSociety.Log $(Version) $(NetVersion)" 
           Manufacturer="K-Society" 
           Version="$(AssemblyFileVersion)" 
@@ -23,6 +23,6 @@
         Compressed="yes"
         SourceFile="..\..\..\..\build\KSociety.LogWebApp.MsiSetup\bin\Release\$(NetVersion)\en-US\KSociety.LogWebApp-$(Version)-$(NetVersion).msi" />
     </Chain>
-
+    <Log Disable="yes"></Log>
   </Bundle>
 </Wix>
diff --git a/src/00/Log/KSociety.LogWebApp.MsiSetup/File.wxs b/src/00/Log/KSociety.LogWebApp.MsiSetup/File.wxs
@@ -20,7 +20,7 @@
           Account="LocalSystem"
           Start="auto"
           Interactive="no">
-            <ServiceDependency Id="LogServerService" Group="false"/>
+            <ServiceDependency Id="LogServer" Group="false"/>
         </ServiceInstall>
         <ServiceControl
           Id="LogServerServiceControl"

diff --git a/src/00/Log/KSociety.LogWebApp.MsiSetup/Package.wxs b/src/00/Log/KSociety.LogWebApp.MsiSetup/Package.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package Name="KSociety.LogWebApp.MsiSetup $(Version) $(NetVersion)" 
            Manufacturer="K-Society" 

diff --git a/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs b/src/01/02/Host/KSociety.Log.Srv.Host/Startup.cs
@@ -72,12 +72,6 @@ public void ConfigureContainer(ContainerBuilder builder)
 
                 //RabbitMQ.
                 builder.RegisterModule(new KSociety.Log.EventBus.MessageBroker(this.MessageBrokerOptions, this.DebugFlag));
-                    //new MessageBroker<
-                    //    IExchangeDeclareParameters, IQueueDeclareParameters,
-                    //    IEventBusParameters, IConnectionFactory,
-                    //    Base.EventBus.ExchangeDeclareParameters,
-                    //    Base.EventBus.QueueDeclareParameters,
-                    //    EventBusParameters>(this.MessageBrokerOptions, this.DebugFlag));
 
                 //Transaction, don't move this line.
                 builder.RegisterModule(new Bindings.Biz.Biz(this.DebugFlag));