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

Commit 57bacdd

Browse files
siegfriedpammersiegfriedpammer
committed
fix samples/SdaUser and samples/LineCounter
1 parent 06bd0bf commit 57bacdd

13 files changed

Lines changed: 56 additions & 61 deletions

‎samples/LineCounter/LineCounter.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<FileAlignment>4096</FileAlignment>
1818
<WarningLevel>4</WarningLevel>
1919
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
20-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
21+
<TargetFrameworkProfile />
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
2324
<IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
@@ -57,11 +58,6 @@
5758
<SpecificVersion>False</SpecificVersion>
5859
<Private>False</Private>
5960
</Reference>
60-
<Reference Include="ICSharpCode.SharpDevelop.Dom">
61-
<HintPath>..\..\bin\ICSharpCode.SharpDevelop.Dom.dll</HintPath>
62-
<SpecificVersion>False</SpecificVersion>
63-
<Private>False</Private>
64-
</Reference>
6561
<Reference Include="System.Xml.Linq">
6662
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6763
</Reference>

‎samples/LineCounter/LineCounter.sln‎

Lines changed: 3 additions & 3 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.5571
4+
# SharpDevelop 5.0
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LineCounter", "LineCounter.csproj", "{880A7EAF-D0B4-46AC-A9B6-B6156512037A}"
66
EndProject
77
Global
@@ -10,9 +10,9 @@ Global
1010
Release|Any CPU = Release|Any CPU
1111
EndGlobalSection
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1413
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1615
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{880A7EAF-D0B4-46AC-A9B6-B6156512037A}.Release|Any CPU.Build.0 = Release|Any CPU
1717
EndGlobalSection
1818
EndGlobal

‎samples/LineCounter/Src/Command.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,16 @@
2626
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

2828
using System;
29-
using System.Text;
30-
using System.Windows.Forms;
3129
using ICSharpCode.Core;
3230
using ICSharpCode.SharpDevelop;
33-
using ICSharpCode.SharpDevelop.Gui;
3431

3532
namespace LineCounterAddin
3633
{
3734
public class ToolCommand1 : AbstractMenuCommand
3835
{
3936
public override void Run()
4037
{
41-
WorkbenchSingleton.Workbench.ShowView(new LineCounterViewContent());
38+
SD.Workbench.ShowView(new LineCounterViewContent());
4239
}
4340
}
4441
}

‎samples/LineCounter/Src/LineCounterBrowser.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using System.Windows.Forms;
1414

1515
using ICSharpCode.Core;
16+
using ICSharpCode.SharpDevelop.Dom;
1617
using ICSharpCode.SharpDevelop.Project;
1718
using ICSharpCode.SharpDevelop;
1819

@@ -765,7 +766,7 @@ private void ScanSolution()
765766

766767
m_summaryList.Clear();
767768

768-
Solution solution = ProjectService.OpenSolution;
769+
ISolution solution = ProjectService.OpenSolution;
769770
if (solution != null) // OpenSolution is null when no solution is opened
770771
{
771772
FileInfo fiSolution = new FileInfo(solution.FileName);
@@ -783,11 +784,12 @@ private void ScanSolution()
783784
tsprgTask.Value = 0;
784785
foreach (IProject fiProject in projects) {
785786
tsprgTotal.PerformStep();
786-
string projName, lang;
787-
if (fiProject.FileName.IndexOf("://") != -1)
787+
string projName;
788+
Guid lang;
789+
if (fiProject.FileName.ToString().IndexOf("://") != -1)
788790
{
789791
projName = fiProject.FileName; // this is a web project
790-
lang = "{00000001-0000-0000-0000-000000000000}";
792+
lang = Guid.Parse("{00000001-0000-0000-0000-000000000000}");
791793
} else {
792794
projName = fiProject.Name;
793795
lang = fiProject.TypeGuid;
@@ -823,7 +825,7 @@ private void ScanSolution()
823825
/// <param name="projectItems">The ProjectItems collection to scan.</param>
824826
/// <param name="summary">The root summary data object that these
825827
/// files belong to.</param>
826-
private void ScanProjectItems(IList<ProjectItem> projectItems, LineCountSummary summary)
828+
private void ScanProjectItems(IMutableModelCollection<ProjectItem> projectItems, LineCountSummary summary)
827829
{
828830
tsprgTask.Maximum += projectItems.Count;
829831
foreach (ProjectItem projectItem in projectItems)

‎samples/LineCounter/Src/LineCounterBrowser.resx‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
44
Microsoft ResX Schema
@@ -112,20 +112,21 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121+
<data name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
121122
<value>365, 17</value>
122-
</metadata>
123-
<metadata name="cmsFileList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
123+
</data>
124+
<data name="cmsFileList.TrayLocation" type="System.Drawing.Point, System.Drawing">
124125
<value>126, 17</value>
125-
</metadata>
126-
<metadata name="imgFileTypes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
126+
</data>
127+
<data name="imgFileTypes.TrayLocation" type="System.Drawing.Point, System.Drawing">
127128
<value>464, 17</value>
128-
</metadata>
129+
</data>
129130
<data name="imgFileTypes.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
130131
<value>
131132
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
@@ -612,9 +613,9 @@
612613
AQMI/ws=
613614
</value>
614615
</data>
615-
<metadata name="imgProjectTypes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
616+
<data name="imgProjectTypes.TrayLocation" type="System.Drawing.Point, System.Drawing">
616617
<value>231, 17</value>
617-
</metadata>
618+
</data>
618619
<data name="imgProjectTypes.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
619620
<value>
620621
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
@@ -774,7 +775,7 @@
774775
AQECAAj/Cw==
775776
</value>
776777
</data>
777-
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
778+
<data name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
778779
<value>17, 17</value>
779-
</metadata>
780+
</data>
780781
</root>

‎samples/LineCounter/Src/LineCounterViewContent.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

2828
using System;
29-
using System.Windows.Forms;
30-
using ICSharpCode.SharpDevelop.Gui;
29+
using ICSharpCode.SharpDevelop.Workbench;
3130

3231
namespace LineCounterAddin
3332
{

‎samples/SdaUser/MainForm.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@
2626
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727

2828
using System;
29-
using System.Collections.Generic;
30-
using System.Drawing;
3129
using System.IO;
32-
using System.Reflection;
3330
using System.Windows.Forms;
3431
using ICSharpCode.SharpDevelop.Sda;
3532

‎samples/SdaUser/MainForm.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
</root>

‎samples/SdaUser/SdaUser.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<WarningLevel>4</WarningLevel>
1818
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1919
<SourceAnalysisOverrideSettingsFile>C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
20-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
21+
<TargetFrameworkProfile />
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
2324
<IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
@@ -39,6 +40,9 @@
3940
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
4041
</PropertyGroup>
4142
<ItemGroup>
43+
<Reference Include="SharpDevelop">
44+
<HintPath>..\..\bin\SharpDevelop.exe</HintPath>
45+
</Reference>
4246
<Reference Include="System" />
4347
<Reference Include="System.Core">
4448
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -50,10 +54,6 @@
5054
<Reference Include="System.Drawing" />
5155
<Reference Include="System.Windows.Forms" />
5256
<Reference Include="System.Xml" />
53-
<Reference Include="ICSharpCode.SharpDevelop.Sda">
54-
<HintPath>..\..\bin\ICSharpCode.SharpDevelop.Sda.dll</HintPath>
55-
<SpecificVersion>False</SpecificVersion>
56-
</Reference>
5757
<Reference Include="System.Xml.Linq">
5858
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5959
</Reference>
@@ -89,5 +89,8 @@
8989
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9090
</Content>
9191
</ItemGroup>
92+
<ItemGroup>
93+
<None Include="app.config" />
94+
</ItemGroup>
9295
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
9396
</Project>

‎samples/SdaUser/SdaUser.sln‎

Lines changed: 5 additions & 5 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.5584
4+
# SharpDevelop 5.0
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdaUser", "SdaUser.csproj", "{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelopInteraction", "SharpDevelopInteraction\SharpDevelopInteraction.csproj", "{84054D5E-0B81-4C4B-AABB-DCC43030830B}"
@@ -12,13 +12,13 @@ Global
1212
Release|Any CPU = Release|Any CPU
1313
EndGlobalSection
1414
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
1615
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
1817
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{3FF48818-69D2-4884-8F4F-62EC72F0D5F0}.Release|Any CPU.Build.0 = Release|Any CPU
2019
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Debug|Any CPU.Build.0 = Debug|Any CPU
2221
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{84054D5E-0B81-4C4B-AABB-DCC43030830B}.Release|Any CPU.Build.0 = Release|Any CPU
2323
EndGlobalSection
2424
EndGlobal

0 commit comments

Comments
 (0)