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

Fixed unit test and setup. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2315 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
1808336a1c
commit
d3ed55b029
3 changed files with 3 additions and 34 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. 2
      src/Main/Base/Test/CSharpExpressionFinderTests.cs
  2. 33
      src/Setup/Files.wxs
  3. 2
      src/Setup/Setup.wxs

2
src/Main/Base/Test/CSharpExpressionFinderTests.cs
Unescape View File

@ -139,7 +139,7 @@ class Main { @@ -139,7 +139,7 @@ class Main {
[Test]
public void NewException()
{
FindFull(program2, "otFoundException", "NotFoundException()", ExpressionContext.TypeDerivingFrom(ParserService.DefaultProjectContentRegistry.Mscorlib.GetClass("System.Exception"), true));
FindFull(program2, "otFoundException", "NotFoundException()", ExpressionContext.TypeDerivingFrom(ParserService.DefaultProjectContentRegistry.Mscorlib.GetClass("System.Exception", 0), true));
}
}
}

33
src/Setup/Files.wxs
Unescape View File

@ -1084,39 +1084,6 @@ @@ -1084,39 +1084,6 @@
<File Source="..\..\AddIns\AddIns\Misc\ResourceToolkit\Hornung.ResourceToolkit.dll" Name="RESTKT.DLL" Id="Hornung.ResourceToolkit.dll" LongName="Hornung.ResourceToolkit.dll" Assembly=".net" AssemblyApplication="Hornung.ResourceToolkit.dll" AssemblyManifest="Hornung.ResourceToolkit.dll" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="SharpQueryFolder" LongName="SharpQuery" Name="Query">
<Component Guid="94E2FFCE-B59A-4CB8-90C5-A68FEE705DBA" Id="SharpQueryDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpQuery\SharpQuery.dll" Name="SHARPQ_1.DLL" Id="SharpQuery.dll" LongName="SharpQuery.dll" Assembly=".net" AssemblyApplication="SharpQuery.dll" AssemblyManifest="SharpQuery.dll" KeyPath="yes" />
<File Source="..\..\AddIns\AddIns\Misc\SharpQuery\SharpQuery.addin" Name="SHARPQ_1.ADD" Id="SharpQuery.addin" LongName="SharpQuery.addin" />
</Component>
<Component Id="SharpQueryInteropMSDASCDll" Guid="8DA4305C-74C1-4DB7-BE05-9ED5B92ADA73" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpQuery\Interop.MSDASC.dll" Name="INTERO_1.DLL" Id="Interop.MSDASC.dll" LongName="Interop.MSDASC.dll" Assembly=".net" AssemblyApplication="Interop.MSDASC.dll" AssemblyManifest="Interop.MSDASC.dll" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="SharpReportFolder" LongName="SharpReport" Name="Report">
<Component Guid="FCC330AE-1BA6-49AB-8D75-6B056EEBD00D" Id="SharpReportCoreDll" DiskId="1">
<File Source="..\..\AddIns\SharpReport\SharpReportCore.dll" Name="SHARPR_1.DLL" Id="SharpReportCore.dll" LongName="SharpReportCore.dll" Assembly=".net" AssemblyApplication="SharpReportCore.dll" AssemblyManifest="SharpReportCore.dll" KeyPath="yes" />
</Component>
<Component Id="ReportGeneratorDll" Guid="4A37F852-2BBC-40C5-AF32-6DAB8DB5075A" DiskId="1">
<File Source="..\..\AddIns\SharpReport\ReportGenerator.dll" Name="REPORT_1.DLL" Id="ReportGenerator.dll" LongName="ReportGenerator.dll" Assembly=".net" AssemblyApplication="ReportGenerator.dll" AssemblyManifest="ReportGenerator.dll" KeyPath="yes" />
<File Source="..\..\AddIns\SharpReport\ReportGenerator.addin" Name="REPORT_1.ADD" Id="ReportGenerator.addin" LongName="ReportGenerator.addin" />
</Component>
<Component Id="SharpReportDll" Guid="00331644-0A6F-4469-AEE5-2FCEED4F1651" DiskId="1">
<File Source="..\..\AddIns\SharpReport\SharpReport.dll" Name="SHARPR_2.DLL" Id="SharpReport.dll" LongName="SharpReport.dll" Assembly=".net" AssemblyApplication="SharpReport.dll" AssemblyManifest="SharpReport.dll" KeyPath="yes" />
</Component>
<Component Id="SharpReportAddInDll" Guid="9EC747D8-EA22-4C6B-8694-D7FA8029AE46" DiskId="1">
<File Source="..\..\AddIns\SharpReport\SharpReportAddin.addin" Name="SHARPR_1.ADD" Id="SharpReportAddin.addin" LongName="SharpReportAddin.addin" />
<File Source="..\..\AddIns\SharpReport\SharpReportAddin.dll" Name="SHARPR_3.DLL" Id="SharpReportAddin.dll" LongName="SharpReportAddin.dll" Assembly=".net" AssemblyApplication="SharpReportAddin.dll" AssemblyManifest="SharpReportAddin.dll" KeyPath="yes" />
</Component>
<Component Guid="2ADD2FE1-C2FA-428E-896A-E1F119408A3D" Id="PdfSharpDll" DiskId="1">
<File Source="..\..\AddIns\SharpReport\PdfSharp.dll" Name="PdfSharp.dll" Id="PdfSharp.dll" Assembly=".net" AssemblyApplication="PdfSharp.dll" AssemblyManifest="PdfSharp.dll" KeyPath="yes" LongName="PdfSharp.dll" />
</Component>
<Directory Id="PdfSharpResources" Name="de">
<Component Guid="DA561136-80BF-464C-8C30-CCFFEFF926B5" Id="PdfSharpDeResources" DiskId="1">
<File Source="..\..\AddIns\SharpReport\de\PdfSharp.resources.dll" Name="PDFSHA_1.DLL" Id="PdfSharp.resources.dll" LongName="PdfSharp.resources.dll" AssemblyApplication="PdfSharp.resources.dll" AssemblyManifest="PdfSharp.resources.dll" Assembly=".net" KeyPath="yes" />
</Component>
</Directory>
</Directory>
<Directory Id="StartPageAddInFolder" LongName="StartPage" Name="StartPg">
<Component Guid="220967E5-D5AA-4207-9757-79599222D5CF" Id="StartPageAddInFiles" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\StartPage\StartPage.dll" Name="STARTP_1.DLL" Id="StartPage.dll" LongName="StartPage.dll" Assembly=".net" AssemblyApplication="StartPage.dll" AssemblyManifest="StartPage.dll" KeyPath="yes" />

2
src/Setup/Setup.wxs
Unescape View File

@ -316,6 +316,7 @@ @@ -316,6 +316,7 @@
<ComponentRef Id="PInvokeAddInFiles"/>
<ComponentRef Id="RegExToolkitFiles"/>
<ComponentRef Id="ResourceToolkitFiles"/>
<!--
<ComponentRef Id="SharpQueryDll"/>
<ComponentRef Id="SharpQueryInteropMSDASCDll"/>
<ComponentRef Id="SharpReportCoreDll"/>
@ -324,6 +325,7 @@ @@ -324,6 +325,7 @@
<ComponentRef Id="PdfSharpDll"/>
<ComponentRef Id="PdfSharpDeResources"/>
<ComponentRef Id="SharpReportAddInDll"/>
-->
<ComponentRef Id="OracleDbToolsProviderDll"/>
<ComponentRef Id="ServerBrowserToolDll"/>
<ComponentRef Id="SharpDbToolsDll"/>

Write Preview
Loading…
Cancel
Save