Skip to content

Commit bd847d4

Browse files
FObermaierFObermaier
committed
[Trunk]
- Updated to BruTile 0.7.3 nuget package If I'm not mistaken, ExternalReferences Folder is obsolete git-tfs-id: [https://tfs.codeplex.com/tfs/TFS01]$/SharpMap/Trunk;C101953
1 parent 593089e commit bd847d4

13 files changed

Lines changed: 63 additions & 21 deletions

File tree

‎Examples/DemoWebSite/Web.Config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@
100100
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
101101
<bindingRedirect oldVersion="0.0.0.0-1.0.84.0" newVersion="1.0.84.0" />
102102
</dependentAssembly>
103+
<dependentAssembly>
104+
<assemblyIdentity name="BruTile" publicKeyToken="00e75fd79e391f40" culture="neutral" />
105+
<bindingRedirect oldVersion="0.0.0.0-0.7.3.0" newVersion="0.7.3.0" />
106+
</dependentAssembly>
103107
</assemblyBinding>
104108
</runtime>
105109
</configuration>

‎Examples/DemoWinForm/DemoWinForm.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@
111111
<DependentUpon>Resources.resx</DependentUpon>
112112
<DesignTime>True</DesignTime>
113113
</Compile>
114-
<None Include="app.config" />
114+
<None Include="app.config">
115+
<SubType>Designer</SubType>
116+
</None>
115117
<None Include="packages.config" />
116118
<None Include="Properties\Settings.settings">
117119
<Generator>SettingsSingleFileGenerator</Generator>

‎Examples/WinFormSamples/Samples/TiledWmsSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static Map InitializeMap()
2626
TileAsyncLayer tileLayer;
2727
//BruTile.Web.TmsTileSource source2 = new TmsTileSource(url);
2828

29-
var source = WmscTileSource.TileSourceBuilder(new System.Uri(url), null);
29+
var source = new List<ITileSource>(WmscTileSource.CreateFromWmscCapabilties(new System.Uri(url)));
3030

3131
// foreach (ITileSource src in source)
3232
// {

‎Examples/WinFormSamples/WinFormSamples.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,15 @@
8282
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
8383
</PropertyGroup>
8484
<ItemGroup>
85-
<Reference Include="BruTile, Version=0.6.4.0, Culture=neutral, PublicKeyToken=00e75fd79e391f40, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\BruTile.0.6.4\lib\net35\BruTile.dll</HintPath>
85+
<Reference Include="BruTile, Version=0.7.3.0, Culture=neutral, PublicKeyToken=00e75fd79e391f40, processorArchitecture=MSIL">
86+
<SpecificVersion>False</SpecificVersion>
87+
<HintPath>..\..\packages\BruTile.0.7.3\lib\net40\BruTile.dll</HintPath>
88+
</Reference>
89+
<Reference Include="BruTile.Desktop">
90+
<HintPath>..\..\packages\BruTile.0.7.3\lib\net40\BruTile.Desktop.dll</HintPath>
91+
</Reference>
92+
<Reference Include="BruTile.MbTiles">
93+
<HintPath>..\..\packages\BruTile.0.7.3\lib\net40\BruTile.MbTiles.dll</HintPath>
8794
</Reference>
8895
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
8996
<HintPath>..\..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll</HintPath>
@@ -127,6 +134,7 @@
127134
<Reference Include="System.Drawing" />
128135
<Reference Include="System.Windows.Forms" />
129136
<Reference Include="System.Xml" />
137+
<Reference Include="System.Xml.Linq" />
130138
</ItemGroup>
131139
<ItemGroup>
132140
<Compile Include="DlgSamplesMenu.cs">

‎Examples/WinFormSamples/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="BruTile" version="0.6.4" />
3+
<package id="BruTile" version="0.7.3" targetFramework="net40" />
44
<package id="Common.Logging" version="2.0.0" />
55
<package id="Common.Logging.Log4Net" version="2.0.1" />
66
<package id="DotSpatial.Projections" version="1.2" />

‎SharpMap.Serialization/SharpMap.Serialization.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,14 @@
4242
<WarningLevel>4</WarningLevel>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="BruTile, Version=0.6.4.0, Culture=neutral, PublicKeyToken=00e75fd79e391f40, processorArchitecture=MSIL">
46-
<HintPath>..\Packages\BruTile.0.6.4\lib\net35\BruTile.dll</HintPath>
45+
<Reference Include="BruTile">
46+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.dll</HintPath>
47+
</Reference>
48+
<Reference Include="BruTile.Desktop">
49+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.Desktop.dll</HintPath>
50+
</Reference>
51+
<Reference Include="BruTile.MbTiles">
52+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.MbTiles.dll</HintPath>
4753
</Reference>
4854
<Reference Include="Common.Logging">
4955
<HintPath>..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll</HintPath>
@@ -78,7 +84,9 @@
7884
</ProjectReference>
7985
</ItemGroup>
8086
<ItemGroup>
81-
<None Include="packages.config" />
87+
<None Include="packages.config">
88+
<SubType>Designer</SubType>
89+
</None>
8290
</ItemGroup>
8391
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8492
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

‎SharpMap.Serialization/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="BruTile" version="0.7.3" targetFramework="net40-Client" />
34
<package id="Common.Logging" version="2.0.0" />
45
<package id="GeoAPI" version="1.7.1" targetFramework="net40-Client" />
56
</packages>

‎SharpMap/SharpMap.csproj‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,15 @@
7777
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
7878
</PropertyGroup>
7979
<ItemGroup>
80-
<Reference Include="BruTile, Version=0.6.4.0, Culture=neutral, PublicKeyToken=00e75fd79e391f40, processorArchitecture=MSIL">
81-
<HintPath>..\packages\BruTile.0.6.4\lib\net35\BruTile.dll</HintPath>
80+
<Reference Include="BruTile, Version=0.7.3.0, Culture=neutral, PublicKeyToken=00e75fd79e391f40, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.dll</HintPath>
83+
</Reference>
84+
<Reference Include="BruTile.Desktop">
85+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.Desktop.dll</HintPath>
86+
</Reference>
87+
<Reference Include="BruTile.MbTiles">
88+
<HintPath>..\packages\BruTile.0.7.3\lib\net40\BruTile.MbTiles.dll</HintPath>
8289
</Reference>
8390
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
8491
<HintPath>..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll</HintPath>
@@ -277,6 +284,9 @@
277284
<Compile Include="Web\Wms\Capabilities.cs" />
278285
</ItemGroup>
279286
<ItemGroup>
287+
<None Include="App.config">
288+
<SubType>Designer</SubType>
289+
</None>
280290
<None Include="COPYING.txt" />
281291
<EmbeddedResource Include="Styles\DefaultSymbol.png" />
282292
</ItemGroup>

‎SharpMap/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="BruTile" version="0.6.4" />
3+
<package id="BruTile" version="0.7.3" targetFramework="net40-Client" />
44
<package id="Common.Logging" version="2.0.0" />
55
<package id="DotSpatial.Projections" version="1.2" targetFramework="net40" />
66
<package id="GeoAPI" version="1.7.1" targetFramework="net40-Client" />

‎UnitTests/Serialization/BaseSerializationTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ protected static IFormatter GetFormatter()
2222
if (formatter.SurrogateSelector == null)
2323
formatter.SurrogateSelector = new SurrogateSelector();
2424
formatter.SurrogateSelector.ChainSelector(SharpMap.Utilities.Surrogates.GetSurrogateSelectors());
25+
BruTile.Utility.AddBruTileSurrogates(formatter);
2526
return formatter;
2627
}
2728
}

0 commit comments

Comments
 (0)