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

Removed SharpDbTools from SD 2.1.x (will be supported only in SD 3.0) 

Fixed forum-16031.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2461 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
e98edfac8c
commit
d30e81daec
4 changed files with 19 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs
  2. 17
      src/Setup/Files.wxs
  3. 4
      src/Setup/Setup.wxs
  4. 22
      src/SharpDevelop.sln

29
src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs
Unescape View File

@ -103,7 +103,12 @@ namespace ICSharpCode.SharpDevelop.Project
get { get {
RegistryKey typeLibsKey = Registry.ClassesRoot.OpenSubKey("TypeLib"); RegistryKey typeLibsKey = Registry.ClassesRoot.OpenSubKey("TypeLib");
foreach (string typeLibKeyName in typeLibsKey.GetSubKeyNames()) { foreach (string typeLibKeyName in typeLibsKey.GetSubKeyNames()) {
RegistryKey typeLibKey = typeLibsKey.OpenSubKey(typeLibKeyName); RegistryKey typeLibKey = null;
try {
typeLibKey = typeLibsKey.OpenSubKey(typeLibKeyName);
} catch (System.Security.SecurityException) {
// ignore type libraries that cannot be read from the registry
}
if (typeLibKey == null) { if (typeLibKey == null) {
continue; continue;
} }
@ -151,7 +156,7 @@ namespace ICSharpCode.SharpDevelop.Project
RegistryKey win32Key = NullKey.OpenSubKey("win32"); RegistryKey win32Key = NullKey.OpenSubKey("win32");
return win32Key == null || win32Key.GetValue(null) == null ? null : GetTypeLibPath(win32Key.GetValue(null).ToString()); return win32Key == null || win32Key.GetValue(null) == null ? null : GetTypeLibPath(win32Key.GetValue(null).ToString());
} }
} }
return null; return null;
} }
@ -168,7 +173,7 @@ namespace ICSharpCode.SharpDevelop.Project
string GetTypeLibName() string GetTypeLibName()
{ {
string name = null; string name = null;
int typeLibLcid; int typeLibLcid;
if (guid != null && lcid != null && Int32.TryParse(lcid, out typeLibLcid)) { if (guid != null && lcid != null && Int32.TryParse(lcid, out typeLibLcid)) {
Guid typeLibGuid = new Guid(this.guid); Guid typeLibGuid = new Guid(this.guid);
@ -226,7 +231,7 @@ namespace ICSharpCode.SharpDevelop.Project
} finally { } finally {
Marshal.ReleaseComObject(typeLib); Marshal.ReleaseComObject(typeLib);
} }
} }
return null; return null;
} }
@ -238,15 +243,15 @@ namespace ICSharpCode.SharpDevelop.Project
[DllImport("oleaut32.dll")] [DllImport("oleaut32.dll")]
static extern int LoadTypeLibEx([MarshalAs(UnmanagedType.BStr)] string szFile, static extern int LoadTypeLibEx([MarshalAs(UnmanagedType.BStr)] string szFile,
RegKind regkind, RegKind regkind,
out ITypeLib pptlib); out ITypeLib pptlib);
[DllImport("oleaut32.dll")] [DllImport("oleaut32.dll")]
static extern int LoadRegTypeLib( static extern int LoadRegTypeLib(
ref Guid rguid, ref Guid rguid,
short wVerMajor, short wVerMajor,
short wVerMinor, short wVerMinor,
int lcid, int lcid,
out ITypeLib pptlib); out ITypeLib pptlib);
} }
} }

17
src/Setup/Files.wxs
Unescape View File

@ -1153,21 +1153,6 @@
<File Source="..\..\AddIns\AddIns\Misc\CodeCoverage\CodeCoverage.addin" Name="ccover.add" Id="CodeCoverage.addin" LongName="CodeCoverage.addin" /> <File Source="..\..\AddIns\AddIns\Misc\CodeCoverage\CodeCoverage.addin" Name="ccover.add" Id="CodeCoverage.addin" LongName="CodeCoverage.addin" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="SharpServerTools" Name="SvrTool" LongName="SharpServerTools">
<Component Guid="222C0F80-D2BC-4C35-B829-64E33CED573D" Id="OracleDbToolsProviderDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpServerTools\OracleDbToolsProvider.dll" Name="ORACLEDB.DLL" Id="OracleDbToolsProvider.dll" LongName="OracleDbToolsProvider.dll" Assembly=".net" AssemblyApplication="OracleDbToolsProvider.dll" AssemblyManifest="OracleDbToolsProvider.dll" KeyPath="yes" />
</Component>
<Component Guid="C4CE7F6D-0ABF-418B-B5BF-486FB6FEBABC" Id="ServerBrowserToolDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpServerTools\ServerBrowserTool.dll" Name="SVRBROWS.DLL" Id="ServerBrowserTool.dll" LongName="ServerBrowserTool.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ServerBrowserTool.dll" AssemblyManifest="ServerBrowserTool.dll" />
</Component>
<Component Guid="DE8B6825-3F51-4E8D-80CA-459E3BE6A9B9" Id="SharpDbToolsDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpServerTools\SharpDbTools.dll" Name="DBTOOLS.DLL" Id="SharpDbTools.dll" LongName="SharpDbTools.dll" Assembly=".net" AssemblyApplication="SharpDbTools.dll" AssemblyManifest="SharpDbTools.dll" KeyPath="yes" />
<File Source="..\..\AddIns\AddIns\Misc\SharpServerTools\SharpServerTools.addin" Name="SVRTOOLS.ADD" Id="SharpServerTools.addin" LongName="SharpServerTools.addin" />
</Component>
<Component Guid="770BE2AE-2B65-4EEF-A36B-316D8A4BD47E" Id="SQLServerDbToolsProviderDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\SharpServerTools\SQLServerDbToolsProvider.dll" Name="SQLDB.DLL" Id="SQLServerDbToolsProvider.dll" LongName="SQLServerDbToolsProvider.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SQLServerDbToolsProvider.dll" AssemblyManifest="SQLServerDbToolsProvider.dll" />
</Component>
</Directory>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
@ -1254,4 +1239,4 @@
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
</Wix> </Wix>

4
src/Setup/Setup.wxs
Unescape View File

@ -322,10 +322,6 @@
<ComponentRef Id="SharpDevelopReportsAddInDll"/> <ComponentRef Id="SharpDevelopReportsAddInDll"/>
<ComponentRef Id="PdfSharpDll"/> <ComponentRef Id="PdfSharpDll"/>
<ComponentRef Id="PdfSharpDeResources"/> <ComponentRef Id="PdfSharpDeResources"/>
<ComponentRef Id="OracleDbToolsProviderDll"/>
<ComponentRef Id="ServerBrowserToolDll"/>
<ComponentRef Id="SharpDbToolsDll"/>
<ComponentRef Id="SQLServerDbToolsProviderDll"/>
<ComponentRef Id="StartPageAddInFiles"/> <ComponentRef Id="StartPageAddInFiles"/>
<ComponentRef Id="SubversionAddInDll"/> <ComponentRef Id="SubversionAddInDll"/>
<ComponentRef Id="SubversionUtilsDll"/> <ComponentRef Id="SubversionUtilsDll"/>

22
src/SharpDevelop.sln
Unescape View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
# SharpDevelop 2.1.0.2080 # SharpDevelop 2.1.0.2429
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
@ -48,18 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLServerDbToolsProvider", "AddIns\Misc\SharpServerTools\SQLServerDbToolsProvider\SQLServerDbToolsProvider.csproj", "{8C692BAF-108E-4346-B41E-6EE7D20E2E9D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleDbToolsProvider", "AddIns\Misc\SharpServerTools\OracleDbToolsProvider\OracleDbToolsProvider.csproj", "{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDbTools", "AddIns\Misc\SharpServerTools\SharpDbTools\SharpDbTools.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
@ -417,7 +403,6 @@ Global
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
@ -446,11 +431,6 @@ Global
{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
{8C692BAF-108E-4346-B41E-6EE7D20E2E9D} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} {000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} {869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} {E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}

Write Preview
Loading…
Cancel
Save