Skip to content

Commit 36fa005

Browse files
FObermaierFObermaier
committed
[trunk]
- added missing files to vs2008 project files. - Solution builds alright but does not start in debug mode. Some project setting (TargetFramework/Platform) must be wrong.
1 parent 1caa3e9 commit 36fa005

10 files changed

Lines changed: 74 additions & 12 deletions

File tree

‎Trunk/DemoWinForm/DemoWinForm.VS2008.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<OldToolsVersion>2.0</OldToolsVersion>
2323
<UpgradeBackupLocation>
2424
</UpgradeBackupLocation>
25+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2728
<DebugSymbols>true</DebugSymbols>
@@ -44,6 +45,9 @@
4445
<ItemGroup>
4546
<Reference Include="System" />
4647
<Reference Include="System.configuration" />
48+
<Reference Include="System.Core">
49+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
50+
</Reference>
4751
<Reference Include="System.Data" />
4852
<Reference Include="System.Deployment" />
4953
<Reference Include="System.Drawing" />

‎Trunk/ExampleCodeSnippets/ExampleCodeSnippets.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ExampleCodeSnippets</RootNamespace>
1212
<AssemblyName>ExampleCodeSnippets</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkSubset>
1616
</TargetFrameworkSubset>
@@ -47,6 +47,9 @@
4747
<HintPath>..\ExternalReferences\nunit.framework.dll</HintPath>
4848
</Reference>
4949
<Reference Include="System" />
50+
<Reference Include="System.Core">
51+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
52+
</Reference>
5053
<Reference Include="System.Data" />
5154
<Reference Include="System.Drawing" />
5255
<Reference Include="System.Xml" />

‎Trunk/SharpMap.Extensions/SharpMap.Extensions.VS2008.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<OldToolsVersion>2.0</OldToolsVersion>
2323
<UpgradeBackupLocation>
2424
</UpgradeBackupLocation>
25+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2728
<DebugSymbols>true</DebugSymbols>
@@ -32,7 +33,7 @@
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
3435
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
35-
<PlatformTarget>AnyCPU</PlatformTarget>
36+
<PlatformTarget>x86</PlatformTarget>
3637
</PropertyGroup>
3738
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3839
<DebugType>pdbonly</DebugType>
@@ -84,6 +85,9 @@
8485
</Reference>
8586
<Reference Include="System" />
8687
<Reference Include="System.Configuration" />
88+
<Reference Include="System.Core">
89+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
90+
</Reference>
8791
<Reference Include="System.Data" />
8892
<Reference Include="System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
8993
<SpecificVersion>False</SpecificVersion>

‎Trunk/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.VS2008.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>SharpMap</RootNamespace>
1212
<AssemblyName>SharpMap.SqlServerSpatialObjects</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,6 +40,9 @@
4040
<HintPath>..\ExternalReferences\ProjNET.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
43+
<Reference Include="System.Core">
44+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
45+
</Reference>
4346
<Reference Include="System.Data" />
4447
<Reference Include="System.Xml" />
4548
</ItemGroup>

‎Trunk/SharpMap.UI/SharpMap.UI.VS2008.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<OldToolsVersion>2.0</OldToolsVersion>
2323
<UpgradeBackupLocation>
2424
</UpgradeBackupLocation>
25+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2728
<DebugSymbols>true</DebugSymbols>
@@ -31,7 +32,7 @@
3132
<DefineConstants>TRACE;DEBUG;UseMapBox</DefineConstants>
3233
<ErrorReport>prompt</ErrorReport>
3334
<WarningLevel>4</WarningLevel>
34-
<PlatformTarget>AnyCPU</PlatformTarget>
35+
<PlatformTarget>x86</PlatformTarget>
3536
</PropertyGroup>
3637
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3738
<DebugType>pdbonly</DebugType>
@@ -45,6 +46,9 @@
4546
</PropertyGroup>
4647
<ItemGroup>
4748
<Reference Include="System" />
49+
<Reference Include="System.Core">
50+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
51+
</Reference>
4852
<Reference Include="System.Data" />
4953
<Reference Include="System.Design" />
5054
<Reference Include="System.Drawing" />

‎Trunk/SharpMap/Rendering/Decoration/GoogleMapsDisclamer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,17 @@ private void DownloadDisclaimer(double[] ul, double[] lr, int level)
210210
string txt = "";
211211
if (m_MapType == MapType.Map || m_MapType == MapType.Hybrid)
212212
{
213-
txt = m_MapPrefix + " " + string.Join(",", mstrs);
213+
txt = m_MapPrefix + " " + string.Join(",", mstrs.ToArray());
214214
}
215215
else if ( m_MapType == MapType.Images)
216216
{
217-
txt = m_SatPrefix + " " + string.Join(",",kstrs);
217+
txt = m_SatPrefix + " " + string.Join(",",kstrs.ToArray());
218218
}
219219

220220

221221
if (m_MapType == MapType.Hybrid)
222222
{
223-
txt += ", " + m_SatPrefix + " " + string.Join(",", kstrs);
223+
txt += ", " + m_SatPrefix + " " + string.Join(",", kstrs.ToArray());
224224
}
225225

226226
m_DisclaymerText = txt;

‎Trunk/SharpMap/Rendering/Symbolizer/ISymbolizer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface ISymbolizer
3838
/// Generic interface for symbolizers that render symbolize specific geometries
3939
/// </summary>
4040
/// <typeparam name="TGeometry">The allowed type of geometries to symbolize</typeparam>
41-
public interface ISymbolizer<in TGeometry> : ISymbolizer
41+
public interface ISymbolizer<TGeometry> : ISymbolizer
4242
where TGeometry : class, IGeometryClassifier
4343
{
4444
/// <summary>

‎Trunk/SharpMap/SharpMap.VS2008.csproj‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
<Compile Include="Geometries\GeometryType.cs" />
9999
<Compile Include="Geometries\IGeometry.cs" />
100100
<Compile Include="Geometries\IGeometryCollection.cs" />
101+
<Compile Include="Geometries\IPuntal.cs" />
101102
<Compile Include="Geometries\ISpatialReference.cs" />
102103
<Compile Include="Geometries\LinearRing.cs" />
103104
<Compile Include="Geometries\LineString.cs" />
@@ -119,6 +120,11 @@
119120
<Compile Include="Layers\Layer.cs" />
120121
<Compile Include="Layers\LayerCollection.cs" />
121122
<Compile Include="Layers\LayerGroup.cs" />
123+
<Compile Include="Layers\Symbolizer\AnyGeometryVectorLayer.cs" />
124+
<Compile Include="Layers\Symbolizer\BaseVectorLayer.cs" />
125+
<Compile Include="Layers\Symbolizer\LinealVectorLayer.cs" />
126+
<Compile Include="Layers\Symbolizer\PolygonalVectorLayer.cs" />
127+
<Compile Include="Layers\Symbolizer\PuntalVectorLayer.cs" />
122128
<Compile Include="Layers\TileAsyncLayer.cs" />
123129
<Compile Include="Layers\TiledWmsLayer.cs" />
124130
<Compile Include="Layers\TileLayer.cs" />
@@ -127,9 +133,40 @@
127133
<Compile Include="Layers\WmsLayer.cs" />
128134
<Compile Include="Map\Map.cs" />
129135
<Compile Include="Properties\AssemblyInfo.cs" />
136+
<Compile Include="Rendering\Decoration\Disclaimer.cs" />
137+
<Compile Include="Rendering\Decoration\EyeOfSight.cs" />
138+
<Compile Include="Rendering\Decoration\GoogleMapsDisclamer.cs" />
139+
<Compile Include="Rendering\Decoration\IMapDecoration.cs" />
140+
<Compile Include="Rendering\Decoration\MapDecoration.cs" />
141+
<Compile Include="Rendering\Decoration\MapDecorationAnchor.cs" />
142+
<Compile Include="Rendering\Decoration\MapDecorationAnchorFlags.cs" />
143+
<Compile Include="Rendering\Decoration\NorthArrow.cs" />
144+
<Compile Include="Rendering\Decoration\ScaleBar\ScaleBar.cs" />
145+
<Compile Include="Rendering\Decoration\ScaleBar\ScaleBarLabelText.cs" />
146+
<Compile Include="Rendering\Decoration\ScaleBar\ScaleBarStyle.cs" />
147+
<Compile Include="Rendering\Decoration\ScaleBar\Unit.cs" />
130148
<Compile Include="Rendering\Label.cs" />
131149
<Compile Include="Rendering\LabelCollisionDetection.cs" />
132150
<Compile Include="Rendering\RenderExceptions.cs" />
151+
<Compile Include="Rendering\Symbolizer\BasicLineSymbolizer.cs" />
152+
<Compile Include="Rendering\Symbolizer\BasicPolygonSymbolizer.cs" />
153+
<Compile Include="Rendering\Symbolizer\CachedLineSymbolizer.cs" />
154+
<Compile Include="Rendering\Symbolizer\CharacterPointSymbolizer.cs" />
155+
<Compile Include="Rendering\Symbolizer\CohenSutherlandLineClipping.cs" />
156+
<Compile Include="Rendering\Symbolizer\GeometrySymbolizer.cs" />
157+
<Compile Include="Rendering\Symbolizer\ILineSymbolizer.cs" />
158+
<Compile Include="Rendering\Symbolizer\IPointSymbolizer.cs" />
159+
<Compile Include="Rendering\Symbolizer\IPolygonSymbolizer.cs" />
160+
<Compile Include="Rendering\Symbolizer\ISymbolizer.cs" />
161+
<Compile Include="Rendering\Symbolizer\LineSymbolizer.cs" />
162+
<Compile Include="Rendering\Symbolizer\ListPointSymbolizer.cs" />
163+
<Compile Include="Rendering\Symbolizer\PathPointSymbolizer.cs" />
164+
<Compile Include="Rendering\Symbolizer\PointSymbolizer.cs" />
165+
<Compile Include="Rendering\Symbolizer\PolygonSymbolizer.cs" />
166+
<Compile Include="Rendering\Symbolizer\RasterPointSymbolizer.cs" />
167+
<Compile Include="Rendering\Symbolizer\Utility.cs" />
168+
<Compile Include="Rendering\Symbolizer\WarpedLineSymbolizer.cs" />
169+
<Compile Include="Rendering\Symbolizer\WarpPathToPath.cs" />
133170
<Compile Include="Rendering\Thematics\ColorBlend.cs" />
134171
<Compile Include="Rendering\Thematics\CustomTheme.cs" />
135172
<Compile Include="Rendering\Thematics\GradientTheme.cs" />
@@ -140,6 +177,7 @@
140177
<Compile Include="Styles\Style.cs" />
141178
<Compile Include="Styles\VectorStyle.cs" />
142179
<Compile Include="Utilities\Algorithms.cs" />
180+
<Compile Include="Utilities\GeoSpatialMath.cs" />
143181
<Compile Include="Utilities\Indexing\BinaryTree.cs" />
144182
<Compile Include="Utilities\Indexing\SpatialIndexing.cs" />
145183
<Compile Include="Utilities\LeastSquaresTransform.cs" />
@@ -191,7 +229,6 @@
191229
<SubType>
192230
</SubType>
193231
</EmbeddedResource>
194-
<None Include="Web\SharpMap.Web.cd" />
195232
<None Include="Web\Wfs\Schemas\1.0.0\OGC-exception.xsd" />
196233
<None Include="Web\Wfs\Schemas\1.0.0\WFS-basic.xsd" />
197234
<None Include="Web\Wfs\Schemas\1.0.0\WFS-capabilities.xsd" />

‎Trunk/UnitTests/UnitTests.VS2008.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<OldToolsVersion>2.0</OldToolsVersion>
2626
<UpgradeBackupLocation>
2727
</UpgradeBackupLocation>
28+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3031
<DebugSymbols>true</DebugSymbols>
@@ -35,7 +36,7 @@
3536
<ErrorReport>prompt</ErrorReport>
3637
<WarningLevel>4</WarningLevel>
3738
<UseVSHostingProcess>false</UseVSHostingProcess>
38-
<PlatformTarget>AnyCPU</PlatformTarget>
39+
<PlatformTarget>x86</PlatformTarget>
3940
</PropertyGroup>
4041
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4142
<DebugType>pdbonly</DebugType>
@@ -62,6 +63,9 @@
6263
<HintPath>..\ExternalReferences\nunit.framework.dll</HintPath>
6364
</Reference>
6465
<Reference Include="System" />
66+
<Reference Include="System.Core">
67+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
68+
</Reference>
6569
<Reference Include="System.Data" />
6670
<Reference Include="System.Drawing" />
6771
<Reference Include="System.Xml" />

‎Trunk/WinFormSamples/WinFormSamples.VS2008.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>WinFormSamples</RootNamespace>
1212
<AssemblyName>WinFormSamples</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>
@@ -46,7 +46,7 @@
4646
<DefineConstants>DEBUG;TRACE</DefineConstants>
4747
<ErrorReport>prompt</ErrorReport>
4848
<WarningLevel>4</WarningLevel>
49-
<PlatformTarget>AnyCPU</PlatformTarget>
49+
<PlatformTarget>x86</PlatformTarget>
5050
</PropertyGroup>
5151
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5252
<DebugType>pdbonly</DebugType>
@@ -68,6 +68,9 @@
6868
</Reference>
6969
<Reference Include="System" />
7070
<Reference Include="System.Configuration" />
71+
<Reference Include="System.Core">
72+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
73+
</Reference>
7174
<Reference Include="System.Data" />
7275
<Reference Include="System.Drawing" />
7376
<Reference Include="System.Windows.Forms" />

0 commit comments

Comments
 (0)