Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit e25c694

Browse files
dgrunwalddgrunwald
committed
Set samples/XamlDesigner to .NET 4.5.
1 parent caaedbd commit e25c694

7 files changed

Lines changed: 26 additions & 78 deletions

File tree

‎samples/XamlDesigner/XamlDesigner.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
<OutputType>WinExe</OutputType>
1010
<RootNamespace>ICSharpCode.XamlDesigner</RootNamespace>
1111
<AssemblyName>XamlDesigner</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<ApplicationManifest>Configuration\app.manifest</ApplicationManifest>
1717
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
1818
<NoStdLib>False</NoStdLib>
1919
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
20+
<TargetFrameworkProfile />
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2223
<DebugSymbols>true</DebugSymbols>
@@ -51,6 +52,9 @@
5152
<Reference Include="ICSharpCode.AvalonEdit">
5253
<HintPath>..\..\bin\ICSharpCode.AvalonEdit.dll</HintPath>
5354
</Reference>
55+
<Reference Include="ICSharpCode.NRefactory">
56+
<HintPath>..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
57+
</Reference>
5458
<Reference Include="ICSharpCode.SharpDevelop.Widgets">
5559
<HintPath>..\..\bin\ICSharpCode.SharpDevelop.Widgets.dll</HintPath>
5660
</Reference>
@@ -142,6 +146,7 @@
142146
<Compile Include="XamlFormatter.cs" />
143147
</ItemGroup>
144148
<ItemGroup>
149+
<None Include="app.config" />
145150
<None Include="NewFileTemplate.xaml">
146151
<SubType>Designer</SubType>
147152
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎samples/XamlDesigner/XamlDesigner.sln‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
# SharpDevelop 4.0.0.5563
4+
# SharpDevelop 5.0
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlDesigner", "XamlDesigner.csproj", "{27DA2B5C-2AAA-4478-AB00-3E184273C241}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "..\..\src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
@@ -22,22 +22,22 @@ Global
2222
{27DA2B5C-2AAA-4478-AB00-3E184273C241}.Debug|Any CPU.Build.0 = Debug|Any CPU
2323
{27DA2B5C-2AAA-4478-AB00-3E184273C241}.Release|Any CPU.ActiveCfg = Release|Any CPU
2424
{27DA2B5C-2AAA-4478-AB00-3E184273C241}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.Build.0 = Debug|Any CPU
2625
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.Build.0 = Debug|Any CPU
2827
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.Build.0 = Release|Any CPU
3029
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
3231
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.Build.0 = Release|Any CPU
3433
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
3635
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Release|Any CPU.Build.0 = Release|Any CPU
3837
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|Any CPU.Build.0 = Debug|Any CPU
4039
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|Any CPU.Build.0 = Release|Any CPU
4141
EndGlobalSection
4242
GlobalSection(SolutionProperties) = preSolution
4343
HideSolutionNode = FALSE

‎samples/XamlDesigner/app.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
</configuration>

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ await Task.Run(
293293
existingResults = results;
294294
}
295295
if (cancellationTokenSource != null && cancellationTokenSource.Token == cancellationToken) {
296-
// Dispose the cancellation token source if it's still the same on as we originally created
296+
// Dispose the cancellation token source if it's still the same one as we originally created
297297
cancellationTokenSource.Dispose();
298298
cancellationTokenSource = null;
299299
}

‎src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/OutlineViewPad.cs‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<Compile Include="Src\ObjectEditor.xaml.cs">
8585
<DependentUpon>ObjectEditor.xaml</DependentUpon>
8686
</Compile>
87-
<Compile Include="Src\OutlineViewPad.cs" />
8887
<Compile Include="Src\ProjectTools.cs" />
8988
<Compile Include="Src\PropertyDescriptionService.cs" />
9089
<Compile Include="Src\WpfAndWinFormsTopLevelWindowService.cs" />

‎src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeNode.cs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -339,19 +339,14 @@ internal IEnumerable<SharpTreeNode> VisibleDescendantsAndSelf()
339339

340340
public IEnumerable<SharpTreeNode> Ancestors()
341341
{
342-
var node = this;
343-
while (node.Parent != null) {
344-
yield return node.Parent;
345-
node = node.Parent;
346-
}
342+
for (SharpTreeNode n = this.Parent; n != null; n = n.Parent)
343+
yield return n;
347344
}
348345

349346
public IEnumerable<SharpTreeNode> AncestorsAndSelf()
350347
{
351-
yield return this;
352-
foreach (var node in Ancestors()) {
353-
yield return node;
354-
}
348+
for (SharpTreeNode n = this; n != null; n = n.Parent)
349+
yield return n;
355350
}
356351

357352
#endregion

0 commit comments

Comments
 (0)