From b9edec2902b9540fa9a023d9cf5f3f50c94c9edf Mon Sep 17 00:00:00 2001 From: "Dahan, Udi" Date: Thu, 1 Jan 2009 20:51:20 +0000 Subject: [PATCH] Fixed references in distributor and tools as well as misnamed assemblies in merges. --- merge_with_strong_name.bat | 2 +- merge_without_strong_name.bat | 2 +- .../NServiceBus.Unicast.Distributor.Runner.csproj | 4 ---- src/tools/management/Grid/UI/UI.csproj | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/merge_with_strong_name.bat b/merge_with_strong_name.bat index 40289ef5dcf..bf1f0f20f0e 100644 --- a/merge_with_strong_name.bat +++ b/merge_with_strong_name.bat @@ -1,6 +1,6 @@ xcopy build build\merge /Q /Y xcopy external-bin build\merge /Q /Y -external-bin\ilmerge /keyfile:NServiceBus.snk /log:build\output.txt /target:library /xmldocs /out:NServiceBus.dll build\merge\NServiceBus.dll build\merge\antlr.runtime.dll build\merge\Castle.Core.dll build\merge\Castle.DynamicProxy2.dll build\merge\Castle.MicroKernel.dll build\merge\Castle.Windsor.dll build\merge\Common.Logging.dll build\merge\Common.Logging.Log4Net.dll build\merge\Spring.Core.dll build\merge\Spring.Aop.dll build\merge\NServiceBus.Config.dll build\merge\Interop.MSMQ.dll build\merge\ NServiceBus.Grid.MessageHandlers.dll build\merge\ NServiceBus.Grid.Messages.dll build\merge\ NServiceBus.MessageInterfaces.dll build\merge\ NServiceBus.MessageInterfaces.MessageMapper.Reflection.dll build\merge\ NServiceBus.Multicast.dll build\merge\NServiceBus.Multicast.Transport.dll build\merge\NServiceBus.ObjectBuilder.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.Config.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.dll build\merge\NServiceBus.ObjectBuilder.Common.Config.dll build\merge\NServiceBus.ObjectBuilder.Common.dll build\merge\NServiceBus.ObjectBuilder.Spring.Config.dll build\merge\NServiceBus.ObjectBuilder.Spring.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.Config.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.dll build\merge\ NServiceBus.Saga.dll build\merge\ NServiceBus.SagaPersisters.NHibernate.dll build\merge\NServiceBus.SagaPersisters.NHibernate.Config.dll build\merge\ NServiceBus.Serialization.dll build\merge\ NServiceBus.Serializers.Binary.dll build\merge\ NServiceBus.Serializers.Binary.Configure.dll build\merge\ NServiceBus.Serializers.XML.dll build\merge\ NServiceBus.Serializers.XML.Configure.dll build\merge\ NServiceBus.Unicast.Config.dll build\merge\ NServiceBus.Unicast.dll build\merge\ NServiceBus.Unicast.Subscriptions.DB.dll build\merge\NServiceBus.Unicast.Subscriptions.DB.Config.dll build\merge\ NServiceBus.Unicast.Subscriptions.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.Config.dll build\merge\ NServiceBus.Unicast.Transport.dll build\merge\ NServiceBus.Unicast.Transport.Msmq.dll build\merge\NServiceBus.Unicast.Transport.Msmq.Config.dll build\merge\ NServiceBus.Utils.dll +external-bin\ilmerge /keyfile:NServiceBus.snk /log:build\output.txt /target:library /xmldocs /out:NServiceBus.dll build\merge\NServiceBus.dll build\merge\antlr.runtime.dll build\merge\Castle.Core.dll build\merge\Castle.DynamicProxy2.dll build\merge\Castle.MicroKernel.dll build\merge\Castle.Windsor.dll build\merge\Common.Logging.dll build\merge\Common.Logging.Log4Net.dll build\merge\Spring.Core.dll build\merge\Spring.Aop.dll build\merge\NServiceBus.Config.dll build\merge\Interop.MSMQ.dll build\merge\ NServiceBus.Grid.MessageHandlers.dll build\merge\ NServiceBus.Grid.Messages.dll build\merge\ NServiceBus.MessageInterfaces.dll build\merge\ NServiceBus.MessageInterfaces.MessageMapper.Reflection.dll build\merge\ NServiceBus.Multicast.dll build\merge\NServiceBus.Multicast.Transport.dll build\merge\NServiceBus.ObjectBuilder.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.Config.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.dll build\merge\NServiceBus.ObjectBuilder.Common.Config.dll build\merge\NServiceBus.ObjectBuilder.Common.dll build\merge\NServiceBus.ObjectBuilder.Spring.Config.dll build\merge\NServiceBus.ObjectBuilder.Spring.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.Config.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.dll build\merge\ NServiceBus.Saga.dll build\merge\ NServiceBus.SagaPersisters.NHibernate.dll build\merge\NServiceBus.SagaPersisters.NHibernate.Config.dll build\merge\ NServiceBus.Serialization.dll build\merge\ NServiceBus.Serializers.Binary.dll build\merge\ NServiceBus.Serializers.Binary.Config.dll build\merge\ NServiceBus.Serializers.XML.dll build\merge\ NServiceBus.Serializers.XML.Config.dll build\merge\ NServiceBus.Unicast.Config.dll build\merge\ NServiceBus.Unicast.dll build\merge\ NServiceBus.Unicast.Subscriptions.DB.dll build\merge\NServiceBus.Unicast.Subscriptions.DB.Config.dll build\merge\ NServiceBus.Unicast.Subscriptions.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.Config.dll build\merge\ NServiceBus.Unicast.Transport.dll build\merge\ NServiceBus.Unicast.Transport.Msmq.dll build\merge\NServiceBus.Unicast.Transport.Msmq.Config.dll build\merge\ NServiceBus.Utils.dll echo NServiceBus.dll merged move NServiceBus.dll external-bin move NServiceBus.pdb external-bin diff --git a/merge_without_strong_name.bat b/merge_without_strong_name.bat index 9ac1e0492f7..8d101233c6f 100644 --- a/merge_without_strong_name.bat +++ b/merge_without_strong_name.bat @@ -1,6 +1,6 @@ xcopy build build\merge /Q /Y xcopy external-bin build\merge /Q /Y -external-bin\ilmerge /target:library /xmldocs /log:build\output.txt /out:NServiceBus.dll build\merge\NServiceBus.dll build\merge\antlr.runtime.dll build\merge\Castle.Core.dll build\merge\Castle.DynamicProxy2.dll build\merge\Castle.MicroKernel.dll build\merge\Castle.Windsor.dll build\merge\Common.Logging.dll build\merge\Common.Logging.Log4Net.dll build\merge\Spring.Core.dll build\merge\Spring.Aop.dll build\merge\NServiceBus.Config.dll build\merge\Interop.MSMQ.dll build\merge\ NServiceBus.Grid.MessageHandlers.dll build\merge\ NServiceBus.Grid.Messages.dll build\merge\ NServiceBus.MessageInterfaces.dll build\merge\ NServiceBus.MessageInterfaces.MessageMapper.Reflection.dll build\merge\ NServiceBus.Multicast.dll build\merge\NServiceBus.Multicast.Transport.dll build\merge\NServiceBus.ObjectBuilder.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.Config.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.dll build\merge\NServiceBus.ObjectBuilder.Common.Config.dll build\merge\NServiceBus.ObjectBuilder.Common.dll build\merge\NServiceBus.ObjectBuilder.Spring.Config.dll build\merge\NServiceBus.ObjectBuilder.Spring.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.Config.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.dll build\merge\ NServiceBus.Saga.dll build\merge\ NServiceBus.SagaPersisters.NHibernate.dll build\merge\NServiceBus.SagaPersisters.NHibernate.Config.dll build\merge\ NServiceBus.Serialization.dll build\merge\ NServiceBus.Serializers.Binary.dll build\merge\ NServiceBus.Serializers.Binary.Configure.dll build\merge\ NServiceBus.Serializers.XML.dll build\merge\ NServiceBus.Serializers.XML.Configure.dll build\merge\ NServiceBus.Unicast.Config.dll build\merge\ NServiceBus.Unicast.dll build\merge\ NServiceBus.Unicast.Subscriptions.DB.dll build\merge\NServiceBus.Unicast.Subscriptions.DB.Config.dll build\merge\ NServiceBus.Unicast.Subscriptions.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.Config.dll build\merge\ NServiceBus.Unicast.Transport.dll build\merge\ NServiceBus.Unicast.Transport.Msmq.dll build\merge\NServiceBus.Unicast.Transport.Msmq.Config.dll build\merge\ NServiceBus.Utils.dll +external-bin\ilmerge /target:library /xmldocs /log:build\output.txt /out:NServiceBus.dll build\merge\NServiceBus.dll build\merge\antlr.runtime.dll build\merge\Castle.Core.dll build\merge\Castle.DynamicProxy2.dll build\merge\Castle.MicroKernel.dll build\merge\Castle.Windsor.dll build\merge\Common.Logging.dll build\merge\Common.Logging.Log4Net.dll build\merge\Spring.Core.dll build\merge\Spring.Aop.dll build\merge\NServiceBus.Config.dll build\merge\Interop.MSMQ.dll build\merge\ NServiceBus.Grid.MessageHandlers.dll build\merge\ NServiceBus.Grid.Messages.dll build\merge\ NServiceBus.MessageInterfaces.dll build\merge\ NServiceBus.MessageInterfaces.MessageMapper.Reflection.dll build\merge\ NServiceBus.Multicast.dll build\merge\NServiceBus.Multicast.Transport.dll build\merge\NServiceBus.ObjectBuilder.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.Config.dll build\merge\NServiceBus.ObjectBuilder.CastleWindsor.dll build\merge\NServiceBus.ObjectBuilder.Common.Config.dll build\merge\NServiceBus.ObjectBuilder.Common.dll build\merge\NServiceBus.ObjectBuilder.Spring.Config.dll build\merge\NServiceBus.ObjectBuilder.Spring.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.Config.dll build\merge\NServiceBus.ObjectBuilder.Synchronized.dll build\merge\ NServiceBus.Saga.dll build\merge\ NServiceBus.SagaPersisters.NHibernate.dll build\merge\NServiceBus.SagaPersisters.NHibernate.Config.dll build\merge\ NServiceBus.Serialization.dll build\merge\ NServiceBus.Serializers.Binary.dll build\merge\ NServiceBus.Serializers.Binary.Config.dll build\merge\ NServiceBus.Serializers.XML.dll build\merge\ NServiceBus.Serializers.XML.Config.dll build\merge\ NServiceBus.Unicast.Config.dll build\merge\ NServiceBus.Unicast.dll build\merge\ NServiceBus.Unicast.Subscriptions.DB.dll build\merge\NServiceBus.Unicast.Subscriptions.DB.Config.dll build\merge\ NServiceBus.Unicast.Subscriptions.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.dll build\merge\ NServiceBus.Unicast.Subscriptions.Msmq.Config.dll build\merge\ NServiceBus.Unicast.Transport.dll build\merge\ NServiceBus.Unicast.Transport.Msmq.dll build\merge\NServiceBus.Unicast.Transport.Msmq.Config.dll build\merge\ NServiceBus.Utils.dll echo NServiceBus.dll merged move NServiceBus.dll build\output move NServiceBus.pdb build\output diff --git a/src/distributor/NServiceBus.Unicast.Distributor.Runner/NServiceBus.Unicast.Distributor.Runner.csproj b/src/distributor/NServiceBus.Unicast.Distributor.Runner/NServiceBus.Unicast.Distributor.Runner.csproj index 6c6890f357a..0c2b388644c 100644 --- a/src/distributor/NServiceBus.Unicast.Distributor.Runner/NServiceBus.Unicast.Distributor.Runner.csproj +++ b/src/distributor/NServiceBus.Unicast.Distributor.Runner/NServiceBus.Unicast.Distributor.Runner.csproj @@ -47,10 +47,6 @@ False ..\..\..\build\output\NServiceBus.dll - - False - ..\..\..\build\NServiceBus.ObjectBuilder.dll - False ..\build\NServiceBus.Unicast.Distributor.dll diff --git a/src/tools/management/Grid/UI/UI.csproj b/src/tools/management/Grid/UI/UI.csproj index 8384780e534..c5d9b67e5c4 100644 --- a/src/tools/management/Grid/UI/UI.csproj +++ b/src/tools/management/Grid/UI/UI.csproj @@ -42,10 +42,6 @@ False ..\..\..\..\..\build\output\NServiceBus.dll - - False - ..\..\..\..\..\external-bin\ObjectBuilder.dll -