Browse Source
Conflicts: src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs src/AddIns/Misc/HelpViewer/Source/Commands.cs src/Main/GlobalAssemblyInfo.cs.template src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/XmlDoc.cs src/Setup/Files.wxs src/Setup/Setup.wxs src/Tools/NUnit/nunit-console-dotnet2-x86.exe src/Tools/NUnit/nunit-console-dotnet2.exe src/Tools/NUnit/nunit-console-x86.exe src/Tools/NUnit/nunit-console.exepull/59/merge
Matt Ward
13 years ago
103 changed files with 5109 additions and 1279 deletions
@ -0,0 +1,38 @@ |
|||||||
|
<html> |
||||||
|
<head> |
||||||
|
<title>SharpDevelop Dependencies</title> |
||||||
|
</head> |
||||||
|
<body> |
||||||
|
|
||||||
|
<p> |
||||||
|
<strong>SharpDevelop can take advantage of the following software if you install it:</strong> |
||||||
|
</p> |
||||||
|
|
||||||
|
<ul> |
||||||
|
<li> |
||||||
|
<a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a> for .NET 4.5 code completion documentation |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B&displaylang=en">Microsoft Windows SDK for Windows 7 and .NET Framework 4</a> (strongly recommended!) |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://www.microsoft.com/downloads/en/details.aspx?FamilyID=effc5bc4-c3df-4172-ad1c-bc62935861c5">Microsoft F#</a> for F# support |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://code.msdn.microsoft.com/sourceanalysis">StyleCop</a> for source analysis support. |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="https://code.google.com/p/tortoisegit/">TortoiseGit</a> for Git source control support. |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://tortoisesvn.net/">TortoiseSVN</a> for Subversion source control support. |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://shfb.codeplex.com/">SHFB</a> for documentation generation support. |
||||||
|
</li> |
||||||
|
<li> |
||||||
|
<a href="http://wixtoolset.org/">WiX</a> for building installers. |
||||||
|
</li> |
||||||
|
</ul> |
||||||
|
</body> |
||||||
|
</html> |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
@ -0,0 +1,184 @@ |
|||||||
|
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
|
||||||
|
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
|
||||||
|
using System; |
||||||
|
using System.Windows; |
||||||
|
using System.Windows.Controls; |
||||||
|
|
||||||
|
using NUnit.Framework; |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.Designer |
||||||
|
{ |
||||||
|
[TestFixture] |
||||||
|
public class NamespaceTests : ModelTestHelper |
||||||
|
{ |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void AddControlFromTestNamespace() |
||||||
|
{ |
||||||
|
DesignItem button = CreateCanvasContext("<Button />"); |
||||||
|
|
||||||
|
DesignItem canvas = button.Parent; |
||||||
|
|
||||||
|
DesignItem customButton = canvas.Services.Component.RegisterComponentForDesigner(new CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customButton); |
||||||
|
|
||||||
|
AssertCanvasDesignerOutput("<Button />\n" + |
||||||
|
"<t:CustomButton />", canvas.Context); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void AddControlWithUndeclaredNamespace() |
||||||
|
{ |
||||||
|
DesignItem button = CreateCanvasContext("<Button />"); |
||||||
|
|
||||||
|
DesignItem canvas = button.Parent; |
||||||
|
|
||||||
|
DesignItem customButton = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.OtherControls.CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customButton); |
||||||
|
|
||||||
|
AssertCanvasDesignerOutput("<Button />\n" + |
||||||
|
"<Controls0:CustomButton />", |
||||||
|
canvas.Context, |
||||||
|
"xmlns:Controls0=\"clr-namespace:ICSharpCode.WpfDesign.Tests.OtherControls;assembly=ICSharpCode.WpfDesign.Tests\""); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void AddControlWithUndeclaredNamespaceThatUsesXmlnsPrefixAttribute() |
||||||
|
{ |
||||||
|
DesignItem button = CreateCanvasContext("<Button />"); |
||||||
|
|
||||||
|
DesignItem canvas = button.Parent; |
||||||
|
|
||||||
|
DesignItem customButton = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.Controls.CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customButton); |
||||||
|
|
||||||
|
AssertCanvasDesignerOutput("<Button />\n" + |
||||||
|
"<sdtcontrols:CustomButton />", |
||||||
|
canvas.Context, |
||||||
|
"xmlns:sdtcontrols=\"http://sharpdevelop.net/WpfDesign/Tests/Controls\""); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void AddMultipleControls() |
||||||
|
{ |
||||||
|
DesignItem button = CreateCanvasContext("<Button />"); |
||||||
|
|
||||||
|
DesignItem canvas = button.Parent; |
||||||
|
|
||||||
|
DesignItem customControl = canvas.Services.Component.RegisterComponentForDesigner(new CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.Controls.CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.OtherControls.CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.SpecialControls.CustomButton()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new CustomCheckBox()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.Controls.CustomCheckBox()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.OtherControls.CustomCheckBox()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
customControl = canvas.Services.Component.RegisterComponentForDesigner(new ICSharpCode.WpfDesign.Tests.SpecialControls.CustomCheckBox()); |
||||||
|
canvas.Properties["Children"].CollectionElements.Add(customControl); |
||||||
|
|
||||||
|
AssertCanvasDesignerOutput("<Button />\n" + |
||||||
|
"<t:CustomButton />\n" + |
||||||
|
"<sdtcontrols:CustomButton />\n" + |
||||||
|
"<Controls0:CustomButton />\n" + |
||||||
|
"<Controls1:CustomButton />\n" + |
||||||
|
"<t:CustomCheckBox />\n" + |
||||||
|
"<sdtcontrols:CustomCheckBox />\n" + |
||||||
|
"<Controls0:CustomCheckBox />\n" + |
||||||
|
"<Controls1:CustomCheckBox />", |
||||||
|
canvas.Context, |
||||||
|
"xmlns:sdtcontrols=\"http://sharpdevelop.net/WpfDesign/Tests/Controls\"", |
||||||
|
"xmlns:Controls0=\"clr-namespace:ICSharpCode.WpfDesign.Tests.OtherControls;assembly=ICSharpCode.WpfDesign.Tests\"", |
||||||
|
"xmlns:Controls1=\"clr-namespace:ICSharpCode.WpfDesign.Tests.SpecialControls;assembly=ICSharpCode.WpfDesign.Tests\""); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public class CustomButton : Button |
||||||
|
{ |
||||||
|
public static readonly DependencyProperty TestAttachedProperty = DependencyProperty.RegisterAttached("TestAttached", typeof(double), typeof(CustomButton), |
||||||
|
new FrameworkPropertyMetadata(Double.NaN)); |
||||||
|
|
||||||
|
public static double GetTestAttached(UIElement element) |
||||||
|
{ |
||||||
|
return (double)element.GetValue(TestAttachedProperty); |
||||||
|
} |
||||||
|
|
||||||
|
public static void SetTestAttached(UIElement element, double value) |
||||||
|
{ |
||||||
|
element.SetValue(TestAttachedProperty, value); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public class CustomCheckBox : CheckBox |
||||||
|
{ |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.Controls |
||||||
|
{ |
||||||
|
public class CustomButton : Button |
||||||
|
{ |
||||||
|
public static readonly DependencyProperty TestAttachedProperty = DependencyProperty.RegisterAttached("TestAttached", typeof(double), typeof(CustomButton), |
||||||
|
new FrameworkPropertyMetadata(Double.NaN)); |
||||||
|
|
||||||
|
public static double GetTestAttached(UIElement element) |
||||||
|
{ |
||||||
|
return (double)element.GetValue(TestAttachedProperty); |
||||||
|
} |
||||||
|
|
||||||
|
public static void SetTestAttached(UIElement element, double value) |
||||||
|
{ |
||||||
|
element.SetValue(TestAttachedProperty, value); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public class CustomCheckBox : CheckBox |
||||||
|
{ |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.OtherControls |
||||||
|
{ |
||||||
|
public class CustomButton : Button |
||||||
|
{ |
||||||
|
public static readonly DependencyProperty TestAttachedProperty = DependencyProperty.RegisterAttached("TestAttached", typeof(double), typeof(CustomButton), |
||||||
|
new FrameworkPropertyMetadata(Double.NaN)); |
||||||
|
|
||||||
|
public static double GetTestAttached(UIElement element) |
||||||
|
{ |
||||||
|
return (double)element.GetValue(TestAttachedProperty); |
||||||
|
} |
||||||
|
|
||||||
|
public static void SetTestAttached(UIElement element, double value) |
||||||
|
{ |
||||||
|
element.SetValue(TestAttachedProperty, value); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public class CustomCheckBox : CheckBox |
||||||
|
{ |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.SpecialControls |
||||||
|
{ |
||||||
|
public class CustomButton : Button |
||||||
|
{ |
||||||
|
} |
||||||
|
|
||||||
|
public class CustomCheckBox : CheckBox |
||||||
|
{ |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,21 @@ |
|||||||
|
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
|
||||||
|
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
|
||||||
|
|
||||||
|
using System; |
||||||
|
using System.Diagnostics; |
||||||
|
using System.Windows.Forms; |
||||||
|
using ICSharpCode.Core; |
||||||
|
using ICSharpCode.Core.WinForms; |
||||||
|
using ICSharpCode.SharpDevelop.Gui; |
||||||
|
|
||||||
|
namespace MSHelpSystem.Controls |
||||||
|
{ |
||||||
|
public class HelpLibraryManagerNotFoundForm : ToolNotFoundDialog |
||||||
|
{ |
||||||
|
public HelpLibraryManagerNotFoundForm() |
||||||
|
: base(StringParser.Parse("${res:AddIns.HelpViewer.HLMNotAvailableDownloadWinSDK}"), |
||||||
|
"http://www.microsoft.com/en-us/download/details.aspx?id=8279", null) |
||||||
|
{ |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue