From 42f2675b73f3d0e02a645351f98c23e691f0d0dc Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 14 Jun 2009 14:34:47 +0000
Subject: [PATCH] ComponentInspector does not need log4net.dll anymore.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4310 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../ComponentInspector/ComponentInspector/PostBuildEvent.proj | 1 -
 .../Project/Src/Services/PropertyService/PropertyService.cs   | 4 ++--
 src/Setup/Files.wxs                                           | 3 ---
 src/Setup/Setup.wxs                                           | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj b/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj
index a5ab5e2f4f..4cc84621ea 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj
+++ b/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj
@@ -9,7 +9,6 @@
 	works correctly without this postbuild workaround. -->
 	<ItemGroup>
 		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\..\..\..\bin\ICSharpCode.Core.dll" />
-		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\..\..\..\bin\log4net.dll" />
 	</ItemGroup>
 	<Target Name="MyPostBuildTarget">
 		<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
diff --git a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
index 9736a45951..cdb20a33d5 100644
--- a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
+++ b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
@@ -76,7 +76,7 @@ namespace ICSharpCode.Core
 		{
 			if (properties == null)
 				throw new InvalidOperationException("Service is not initialized.");
-			if (string.IsNullOrEmpty(configDirectory) || string.IsNullOrEmpty(dataDirectory) || string.IsNullOrEmpty(propertyXmlRootNodeName))
+			if (string.IsNullOrEmpty(configDirectory) || string.IsNullOrEmpty(propertyXmlRootNodeName))
 				throw new InvalidOperationException("No file name was specified on service creation");
 			if (!Directory.Exists(configDirectory)) {
 				Directory.CreateDirectory(configDirectory);
@@ -113,7 +113,7 @@ namespace ICSharpCode.Core
 		
 		public static void Save()
 		{
-			if (string.IsNullOrEmpty(configDirectory) || string.IsNullOrEmpty(dataDirectory) || string.IsNullOrEmpty(propertyXmlRootNodeName))
+			if (string.IsNullOrEmpty(configDirectory) || string.IsNullOrEmpty(propertyXmlRootNodeName))
 				throw new InvalidOperationException("No file name was specified on service creation");
 			using (MemoryStream ms = new MemoryStream()) {
 				XmlTextWriter writer = new XmlTextWriter(ms, Encoding.UTF8);
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 63c28efdbf..590bf5a890 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -219,9 +219,6 @@
 									<Component Guid="F2643529-834A-4EDE-B0C2-36E0A031E997" Id="ComponentInspectorICSharpCodeCoreDll" DiskId="1">
 										<File Source="..\..\bin\Tools\ComponentInspector\ICSharpCode.Core.dll" Id="ComponentInspector.ICSharpCode.Core.dll" Name="ICSharpCode.Core.dll" Assembly=".net" AssemblyApplication="ComponentInspector.ICSharpCode.Core.dll" AssemblyManifest="ComponentInspector.ICSharpCode.Core.dll" KeyPath="yes" />
 									</Component>
-									<Component Id="ComponentInspectorLog4NetDll" Guid="56394DB5-3D3A-47ED-B99A-24AB2D0C5E88" DiskId="1">
-										<File Source="..\..\bin\Tools\ComponentInspector\log4net.dll" Name="log4net.dll" Id="ComponentInspector.log4net.dll" Assembly=".net" AssemblyApplication="ComponentInspector.log4net.dll" AssemblyManifest="ComponentInspector.log4net.dll" KeyPath="yes" />
-									</Component>
 								</Directory>
 								<Directory Id="WixFolder" Name="Wix">
 									<Component Guid="78F8DB04-62B1-4A2F-A0D5-D8D890FE5D02" Id="WixVSExtension" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index f1857f8420..4e8bff6611 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -177,7 +177,6 @@
 				<ComponentRef Id="ComponentInspectorExe"/>
 				<ComponentRef Id="ComponentInspectorCoreDll"/>
 				<ComponentRef Id="ComponentInspectorICSharpCodeCoreDll"/>
-				<ComponentRef Id="ComponentInspectorLog4NetDll"/>
 				<ComponentRef Id="SharpDevelopProgramMenuItems"/>
 				<ComponentRef Id="DesktopFolderItems"/>