Version 4: Upgrade to VS 2017

SampleApps/UniversalApp/MainPage.xaml.cs

@@ -1,4 +1,6 @@
-using ViewModel;
+using MapControl;
+using MapControl.Caching;
+using ViewModel;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -11,8 +13,8 @@ namespace UniversalApp
 
         public MainPage()
         {
-            //MapControl.TileImageLoader.Cache = new MapControl.Caching.ImageFileCache();
-            //MapControl.TileImageLoader.Cache = new MapControl.Caching.FileDbCache();
+            TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new FileDbCache(TileImageLoader.DefaultCacheFolder);
 
             InitializeComponent();
             DataContext = ViewModel;

SampleApps/UniversalApp/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2017 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.4.1")]
-[assembly: AssemblyFileVersion("3.4.1")]
+[assembly: AssemblyVersion("3.3.0")]
+[assembly: AssemblyFileVersion("3.3.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: ComVisible(false)]

SampleApps/UniversalApp/Properties/Default.rd.xml

@@ -1,31 +1,5 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
+	<Application>
+		<Assembly Name="*Application*" Dynamic="Required All" />
+	</Application>
 </Directives>

SampleApps/UniversalApp/UniversalApp.csproj

@@ -11,13 +11,14 @@
     <AssemblyName>UniversalApp</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>UniversalApp_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>5DCEEAF8B009D22AA0D41EA61710C9CB80E66BD4</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -102,10 +103,10 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Common\MapLayers.cs">
+    <Compile Include="..\Shared\MapLayers.cs">
       <Link>MapLayers.cs</Link>
     </Compile>
-    <Compile Include="..\Common\MapViewModel.cs">
+    <Compile Include="..\Shared\MapViewModel.cs">
       <Link>MapViewModel.cs</Link>
     </Compile>
     <Compile Include="App.xaml.cs">
@@ -124,7 +125,7 @@
     <None Include="UniversalApp_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\Common\10_535_330.jpg">
+    <Content Include="..\Shared\10_535_330.jpg">
       <Link>10_535_330.jpg</Link>
     </Content>
     <Content Include="Properties\Default.rd.xml" />
@@ -147,17 +148,13 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Caching\FileDbCache.WinRT\FileDbCache.WinRT.csproj">
-      <Project>{c7bf2b18-cc74-430b-bcb2-600304efa3d8}</Project>
-      <Name>FileDbCache.WinRT</Name>
+    <ProjectReference Include="..\..\Caching\FileDbCache.UWP\FileDbCache.UWP.csproj">
+      <Project>{3ff37d40-f770-45b2-95dd-7a84093e1425}</Project>
+      <Name>FileDbCache.UWP</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Caching\ImageFileCache.WinRT\ImageFileCache.WinRT.csproj">
-      <Project>{f789647e-96f7-43e3-a895-fa3fe8d01260}</Project>
-      <Name>ImageFileCache.WinRT</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\MapControl\WinRT\MapControl.WinRT.csproj">
-      <Project>{63cefdf7-5170-43b6-86f8-5c4a383a1615}</Project>
-      <Name>MapControl.WinRT</Name>
+    <ProjectReference Include="..\..\MapControl\UWP\MapControl.UWP.csproj">
+      <Project>{951bc5d2-d653-42d9-9a91-21dc50de0182}</Project>
+      <Name>MapControl.UWP</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

SampleApps/UniversalApp/project.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0"
   },
   "frameworks": {
     "uap10.0": {}