Skip to content

Commit 4bbffcd

Browse files
committed
Updated to MapWinGIS version 5.5 and updated to .NET 8
1 parent fa8ee4e commit 4bbffcd

3 files changed

Lines changed: 17 additions & 20 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gdal/@EntryIndexedValue">True</s:Boolean>
23
<s:Boolean x:Key="/Default/UserDictionary/Words/=Polyline/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

MapWinGisTests-net6/MapWinGisTests/MapWinGisTests.csproj

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0-windows8.0</TargetFramework>
@@ -14,24 +14,19 @@
1414

1515
<ImplicitUsings>enable</ImplicitUsings>
1616

17+
<EnableNativeDebugging>true</EnableNativeDebugging>
1718
</PropertyGroup>
1819

1920
<ItemGroup>
20-
<Compile Remove="TestData\**" />
21-
<EmbeddedResource Remove="TestData\**" />
22-
<None Remove="TestData\**" />
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<COMReference Include="MapWinGIS">
27-
<WrapperTool>tlbimp</WrapperTool>
28-
<VersionMinor>4</VersionMinor>
29-
<VersionMajor>5</VersionMajor>
30-
<Guid>c368d713-cc5f-40ed-9f53-f84fe197b96a</Guid>
31-
<Lcid>0</Lcid>
32-
<Isolated>false</Isolated>
33-
<EmbedInteropTypes>False</EmbedInteropTypes>
34-
</COMReference>
21+
<COMReference Include="MapWinGIS">
22+
<WrapperTool>tlbimp</WrapperTool>
23+
<VersionMinor>5</VersionMinor>
24+
<VersionMajor>5</VersionMajor>
25+
<Guid>c368d713-cc5f-40ed-9f53-f84fe197b96a</Guid>
26+
<Lcid>0</Lcid>
27+
<Isolated>false</Isolated>
28+
<EmbedInteropTypes>False</EmbedInteropTypes>
29+
</COMReference>
3530
</ItemGroup>
3631

3732
<ItemGroup>

MapWinGisTests-net6/WinFormsApp1/WinFormsApp1.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows8.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<UseWindowsForms>true</UseWindowsForms>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Platforms>x86;x64</Platforms>
10+
<SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
1011
</PropertyGroup>
1112

1213
<ItemGroup>
1314
<COMReference Include="AxMapWinGIS">
1415
<Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
1516
<VersionMajor>5</VersionMajor>
16-
<VersionMinor>4</VersionMinor>
17+
<VersionMinor>5</VersionMinor>
1718
<Lcid>0</Lcid>
1819
<WrapperTool>aximp</WrapperTool>
1920
<Isolated>False</Isolated>
2021
</COMReference>
2122
<COMReference Include="MapWinGIS">
2223
<WrapperTool>tlbimp</WrapperTool>
23-
<VersionMinor>4</VersionMinor>
24+
<VersionMinor>5</VersionMinor>
2425
<VersionMajor>5</VersionMajor>
2526
<Guid>c368d713-cc5f-40ed-9f53-f84fe197b96a</Guid>
2627
<Lcid>0</Lcid>
@@ -45,7 +46,7 @@
4546
</ItemGroup>
4647

4748
<ItemGroup>
48-
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
49+
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="8.0.0" />
4950
</ItemGroup>
5051

5152
</Project>

0 commit comments

Comments
 (0)