Browse Source

Fixed forum-5573: Error compiling projects created by VS 2005 for .NET 1.1.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1189 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
099643ef83
  1. 36
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeDiscoveryService.cs
  2. 1
      src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets
  3. 19
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs
  4. 5
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
  5. 2
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs

36
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeDiscoveryService.cs

@ -34,22 +34,30 @@ namespace ICSharpCode.FormsDesigner.Services
public ICollection GetTypes(Type baseType, bool excludeGlobalTypes) public ICollection GetTypes(Type baseType, bool excludeGlobalTypes)
{ {
List<Type> types = new List<Type>(); List<Type> types = new List<Type>();
if (baseType != null) {
LoggingService.Debug("TypeDiscoveryService.GetTypes for " + baseType.FullName if (baseType == null) {
+ "excludeGlobalTypes=" + excludeGlobalTypes.ToString()); baseType = typeof(object);
//seek in all assemblies }
//allow to work designers like columns editor in datagridview
// Searching types can cause additional assemblies to be loaded, so we need to use LoggingService.Debug("TypeDiscoveryService.GetTypes for " + baseType.FullName
// ToArray to prevent an exception if the collection changes. + "excludeGlobalTypes=" + excludeGlobalTypes.ToString());
foreach (Assembly asm in TypeResolutionService.DesignerAssemblies.ToArray()) { //seek in all assemblies
AddDerivedTypes(baseType, asm, types); //allow to work designers like columns editor in datagridview
// Searching types can cause additional assemblies to be loaded, so we need to use
// ToArray to prevent an exception if the collection changes.
foreach (Assembly asm in TypeResolutionService.DesignerAssemblies.ToArray()) {
if (excludeGlobalTypes) {
if (FileUtility.IsBaseDirectory(ReflectionProjectContent.GacRootPath, asm.Location)) {
continue;
}
} }
LoggingService.Debug("TypeDiscoveryService returns " + types.Count + " types"); AddDerivedTypes(baseType, asm, types);
// TODO - Don't look in all assemblies.
// Should use the current project and its referenced assemblies
// as well as System.Windows.Forms.
} }
LoggingService.Debug("TypeDiscoveryService returns " + types.Count + " types");
// TODO - Don't look in all assemblies.
// Should use the current project and its referenced assemblies
// as well as System.Windows.Forms.
return types; return types;
} }

1
src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets

@ -17,6 +17,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(SharpDevelopUse1xCompiler)' == 'true' "> <PropertyGroup Condition=" '$(SharpDevelopUse1xCompiler)' == 'true' ">
<UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable> <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
<ErrorReport/>
<PlatformTarget/> <PlatformTarget/>
</PropertyGroup> </PropertyGroup>

19
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs

@ -180,15 +180,16 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
protected void InitTargetFramework(string defaultTargets, string extendedTargets) protected void InitTargetFramework(string defaultTargets, string extendedTargets)
{ {
const string TargetFrameworkProperty = "TargetFrameworkVersion"; const string TargetFrameworkProperty = "TargetFrameworkVersion";
debugInfoBinding = helper.BindStringEnum("targetFrameworkComboBox", TargetFrameworkProperty, ConfigurationGuiBinding targetFrameworkBinding;
"", targetFrameworkBinding = helper.BindStringEnum("targetFrameworkComboBox", TargetFrameworkProperty,
new StringPair("", "Default (.NET 2.0)"), "",
new StringPair("v1.0", ".NET 1.0"), new StringPair("", "Default (.NET 2.0)"),
new StringPair("v1.1", ".NET 1.1"), new StringPair("v1.0", ".NET 1.0"),
new StringPair("v2.0", ".NET 2.0"), new StringPair("v1.1", ".NET 1.1"),
new StringPair("Mono v1.1", "Mono 1.1"), new StringPair("v2.0", ".NET 2.0"),
new StringPair("Mono v2.0", "Mono 2.0")); new StringPair("Mono v1.1", "Mono 1.1"),
debugInfoBinding.CreateLocationButton("targetFrameworkLabel"); new StringPair("Mono v2.0", "Mono 2.0"));
targetFrameworkBinding.CreateLocationButton("targetFrameworkLabel");
helper.Saved += delegate { helper.Saved += delegate {
// Test if SharpDevelop-Build extensions are needed // Test if SharpDevelop-Build extensions are needed
MSBuildProject project = helper.Project; MSBuildProject project = helper.Project;

5
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs

@ -416,6 +416,11 @@ namespace ICSharpCode.SharpDevelop.Project
} }
base.Initialize(); base.Initialize();
} }
protected void BaseInitialize()
{
base.Initialize();
}
void AddParentFolder(string virtualName, string relativeDirectoryPath, Dictionary<string, DirectoryNode> directoryNodeList) void AddParentFolder(string virtualName, string relativeDirectoryPath, Dictionary<string, DirectoryNode> directoryNodeList)
{ {

2
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
public string FileName { public virtual string FileName {
get { get {
return fileName; return fileName;
} }

Loading…
Cancel
Save