pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Removed NUnit's log4net.dll from the installer since it is no longer used. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3030 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 18 years ago
parent
6228c14e07
commit
8b84f4ce72
2 changed files with 2 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Setup/Files.wxs
  2. 6
      src/Setup/Setup.wxs

3
src/Setup/Files.wxs
Unescape View File

@ -395,9 +395,6 @@ @@ -395,9 +395,6 @@
<Component Guid="D67E8EC9-2D98-4889-856F-78FD2BE35947" Id="NUnitCoreInterfacesDll" DiskId="1">
<File Id="nunit.core.interfaces.dll" KeyPath="yes" Name="nunit.core.interfaces.dll" Assembly=".net" AssemblyApplication="nunit.core.interfaces.dll" AssemblyManifest="nunit.core.interfaces.dll" Source="..\..\bin\Tools\NUnit\nunit.core.interfaces.dll" />
</Component>
<Component Guid="1746BE13-1435-4547-B46C-9B0222736EE9" Id="NUnitLog4NetDll" DiskId="1">
<File Source="..\..\bin\Tools\NUnit\log4net.dll" Name="log4net.dll" Id="NUnit.log4net.dll" Assembly=".net" AssemblyApplication="NUnit.log4net.dll" AssemblyManifest="NUnit.log4net.dll" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="PartCover" Name="PartCover">
<Component Guid="CD9AB556-51BD-4DB2-9AC5-C047022991DD" Id="InteropPartCoverDll" DiskId="1">

6
src/Setup/Setup.wxs
Unescape View File

@ -65,11 +65,10 @@ @@ -65,11 +65,10 @@
<!--
Check the user has elevated permissions. We need admin rights to NGen
SharpDevelop.exe, to install NUnit into the GAC and to register the Help
collection.
SharpDevelop.exe and to register the Help collection.
At the moment we do not need admin rights since the installer only tries
to NGen and add NUnit to the GAC if we have admin rights. So as long
to NGen if we have admin rights. So as long
as the user does not try to install it into Program Files then the
install will finish successfully.
@ -259,7 +258,6 @@ @@ -259,7 +258,6 @@
<ComponentRef Id="NUnitFrameworkDll"/>
<ComponentRef Id="NunitConsoleRunnerDll"/>
<ComponentRef Id="NUnitCoreInterfacesDll"/>
<ComponentRef Id="NUnitLog4NetDll"/>
<ComponentRef Id="ConversionStyleSheetFiles"/>
<ComponentRef Id="TextLibOptionsFiles"/>
<ComponentRef Id="OptionsFiles"/>

Write Preview
Loading…
Cancel
Save