Update .NET Framework

ptv-logistics · Mar 10, 2023 · a0c32fa · a0c32fa
1 parent 8fa7440
commit a0c32fa
Show file tree

Hide file tree

Showing 20 changed files with 216 additions and 219 deletions.
diff --git a/SharpMap.Common/SharpMap.Common.csproj b/SharpMap.Common/SharpMap.Common.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap.Common</RootNamespace>
     <AssemblyName>SharpMap.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/SharpMap.Print/App.config b/SharpMap.Print/App.config
@@ -1,22 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
                 <binding name="XMapWSBinding" maxReceivedMessageSize="2147483647">
                   <security mode="Transport">
-                    <transport clientCredentialType="Basic" />
+                    <transport clientCredentialType="Basic"/>
                   </security>
                 </binding>
             </basicHttpBinding>
         </bindings>
         <client>
-            <endpoint address="https://api-eu-test.cloud.ptvgroup.com/xmap/ws/XMap"
-                binding="basicHttpBinding" bindingConfiguration="XMapWSBinding"
-                contract="XMapServiceReference.XMapWS" name="XMapWSPort" />
+            <endpoint address="https://api-eu-test.cloud.ptvgroup.com/xmap/ws/XMap" binding="basicHttpBinding" bindingConfiguration="XMapWSBinding" contract="XMapServiceReference.XMapWS" name="XMapWSPort"/>
         </client>
     </system.serviceModel>
-</configuration>
+</configuration>
diff --git a/SharpMap.Print/Program.cs b/SharpMap.Print/Program.cs
@@ -17,7 +17,7 @@ static void Main(string[] args)
         {
             // this is a time-limited demo token. 
             // You need your own xServer-internet token for your application!
-            var token = "D5F40131-49C6-47BE-BB9E-70657D365F40";
+            var token = "B2B52B12-5271-4079-B0A3-E532C0CD1867";
 
             // bitmap size
             int width = 950;

diff --git a/SharpMap.Print/Service References/XMapServiceReference/Reference.cs b/SharpMap.Print/Service References/XMapServiceReference/Reference.cs
diff --git a/SharpMap.Print/SharpMap.Print.csproj b/SharpMap.Print/SharpMap.Print.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap.Print</RootNamespace>
     <AssemblyName>SharpMap.Print</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/SharpMap.Web/SharpMap.Web.csproj b/SharpMap.Web/SharpMap.Web.csproj
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap.Web</RootNamespace>
     <AssemblyName>SharpMap.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -25,6 +25,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <Use64BitIISExpress />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -105,6 +106,7 @@
       <HintPath>..\packages\SharpMap.1.1.0\lib\net40-client\SharpMap.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data.SQLite, Version=1.0.86.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.SQLite.MSIL.1.0.86.0\lib\net45\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
@@ -119,16 +121,14 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Data\Poi\Bitmaps\einkauf.bmp" />

diff --git a/SharpMap.Web/SharpMap.Web.csproj.user b/SharpMap.Web/SharpMap.Web.csproj.user
@@ -2,6 +2,13 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <UseIISExpress>true</UseIISExpress>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

diff --git a/SharpMap.Web/Web.config b/SharpMap.Web/Web.config
@@ -1,21 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.8" />
+      </system.Web>
+  -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5.2"/>
+    <compilation debug="true" targetFramework="4.8"/>
     <httpRuntime targetFramework="4.5.2"/>
   </system.web>
   <system.codedom>
     <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-        warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-        warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
     </compilers>
   </system.codedom>
 </configuration>
diff --git a/SharpMap.Win/App.config b/SharpMap.Win/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/SharpMap.Win/Form1.cs b/SharpMap.Win/Form1.cs
@@ -29,7 +29,7 @@ public Form1()
 
             // this is a time-limited demo token. 
             // You need your own xServer-internet token for your application!
-            formsMap1.XMapCredentials = "xtok:D5F40131-49C6-47BE-BB9E-70657D365F40";
+            formsMap1.XMapCredentials = "xtok:B2B52B12-5271-4079-B0A3-E532C0CD1867";
 
             // set silkysand as xMap theme
             formsMap1.XMapStyle = "silkysand";

diff --git a/SharpMap.Win/Properties/Resources.Designer.cs b/SharpMap.Win/Properties/Resources.Designer.cs
diff --git a/SharpMap.Win/Properties/Settings.Designer.cs b/SharpMap.Win/Properties/Settings.Designer.cs
diff --git a/SharpMap.Win/SharpMap.Win.csproj b/SharpMap.Win/SharpMap.Win.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpMap.Win</RootNamespace>
     <AssemblyName>SharpMap.Win</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -87,8 +88,11 @@
       <HintPath>..\packages\ProjNET4GeoAPI.1.3.0.3\lib\net403-client\ProjNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ptv.XServer.Controls.Map, Version=1.7.3.0, Culture=neutral, PublicKeyToken=ff6c7957783adf19, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ptv.XServer.Net.1.7.3\lib\Ptv.XServer.Controls.Map.dll</HintPath>
+    <Reference Include="Ptv.Components.Projections, Version=1.7.10.0, Culture=neutral, PublicKeyToken=ff6c7957783adf19, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ptv.XServer.Net.1.7.10\lib\Ptv.Components.Projections.dll</HintPath>
+    </Reference>
+    <Reference Include="Ptv.XServer.Controls.Map, Version=1.7.10.0, Culture=neutral, PublicKeyToken=ff6c7957783adf19, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ptv.XServer.Net.1.7.10\lib\Ptv.XServer.Controls.Map.dll</HintPath>
     </Reference>
     <Reference Include="ReachFramework" />
     <Reference Include="SharpMap, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -144,6 +148,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Content Include="..\SharpMap.Web\Data\Poi\Bitmaps\wikipedia.png">
       <Link>Data\Poi\Bitmaps\wikipedia.png</Link>

diff --git a/SharpMap.Win/packages.config b/SharpMap.Win/packages.config
@@ -7,7 +7,7 @@
   <package id="NetTopologySuite.IO" version="1.13.2" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net452" />
   <package id="ProjNET4GeoAPI" version="1.3.0.3" targetFramework="net452" />
-  <package id="Ptv.XServer.Net" version="1.7.3" targetFramework="net452" />
+  <package id="Ptv.XServer.Net" version="1.7.10" targetFramework="net452" />
   <package id="SharpMap" version="1.1.0" targetFramework="net452" />
   <package id="System.Data.SQLite.MSIL" version="1.0.86.0" targetFramework="net452" />
 </packages>
diff --git a/SharpMap.WinThin/App.config b/SharpMap.WinThin/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/SharpMap.WinThin/Form1.cs b/SharpMap.WinThin/Form1.cs
@@ -27,7 +27,7 @@ public Form1()
 
             // this is a time-limited demo token. 
             // You need your own xServer-internet token for your application!
-            formsMap1.XMapCredentials = "xtok:D5F40131-49C6-47BE-BB9E-70657D365F40";
+            formsMap1.XMapCredentials = "xtok:B2B52B12-5271-4079-B0A3-E532C0CD1867";
 
             // set silkysand as xMap theme
             formsMap1.XMapStyle = "silkysand";