Move to .Net 4.7.2 to properly handle SSL and HTTPS

erdomke · Jun 25, 2021 · 0b3e866 · 0b3e866
1 parent c3f0d18
commit 0b3e866
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 34 deletions.
diff --git a/InnovatorAdmin.Cmd/App.config b/InnovatorAdmin.Cmd/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.7.2"/>
     </startup>
 </configuration>
diff --git a/InnovatorAdmin.Cmd/InnovatorAdmin.Cmd.csproj b/InnovatorAdmin.Cmd/InnovatorAdmin.Cmd.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>InnovatorAdmin.Cmd</RootNamespace>
     <AssemblyName>InnovatorAdmin.Cmd</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />

diff --git a/InnovatorAdmin.Cmd/packages.config b/InnovatorAdmin.Cmd/packages.config
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
-  <package id="Innovator.Client" version="2019.5.11.21" targetFramework="net452" />
+  <package id="Innovator.Client" version="2019.5.11.21" targetFramework="net452" requireReinstallation="true" />
   <package id="Microsoft.Web.Xdt" version="2.1.2" targetFramework="net452" />
   <package id="System.Collections" version="4.0.11" targetFramework="net461" />
   <package id="System.Console" version="4.0.0" targetFramework="net461" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
   <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
-  <package id="System.IO" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
+  <package id="System.IO" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
-  <package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
 </packages>
diff --git a/InnovatorAdmin/AssemblyInfo.Version.cs b/InnovatorAdmin/AssemblyInfo.Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("21.174.36131")]
-[assembly: AssemblyFileVersion("21.174.36131")]
+[assembly: AssemblyVersion("21.176.35082")]
+[assembly: AssemblyFileVersion("21.176.35082")]
diff --git a/InnovatorAdmin/InnovatorAdmin.csproj b/InnovatorAdmin/InnovatorAdmin.csproj
@@ -30,7 +30,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>

diff --git a/InnovatorAdmin/Program.cs b/InnovatorAdmin/Program.cs
@@ -31,7 +31,6 @@ static void Main(string[] args)
     {
       try
       {
-        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
 

diff --git a/InnovatorAdmin/Properties/Settings.Designer.cs b/InnovatorAdmin/Properties/Settings.Designer.cs
diff --git a/InnovatorAdmin/app.config b/InnovatorAdmin/app.config
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="InnovatorAdmin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-            <section name="ImportExportTest.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="InnovatorAdmin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="ImportExportTest.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -18,19 +18,19 @@
                 <value>0, 0</value>
             </setting>
             <setting name="FindReplace_LastMode" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="LastConnection" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="EditorWindowPanelCollapsed" serializeAs="String">
                 <value>True</value>
             </setting>
             <setting name="DiffToolCommand" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="MergeToolCommand" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="BatchCount" serializeAs="String">
                 <value>30</value>
@@ -42,34 +42,34 @@
                 <value>1</value>
             </setting>
             <setting name="RecentDocument" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="LastEditorSplitOrientation" serializeAs="String">
                 <value>Horizontal</value>
             </setting>
         </InnovatorAdmin.Properties.Settings>
         <ImportExportTest.Properties.Settings>
             <setting name="Server" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="UserName" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Aml" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </ImportExportTest.Properties.Settings>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
+        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0" />
+        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/InnovatorAdmin/packages.config b/InnovatorAdmin/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
-  <package id="Innovator.Client" version="2019.5.11.21" targetFramework="net45" />
+  <package id="Innovator.Client" version="2019.5.11.21" targetFramework="net45" requireReinstallation="true" />
   <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
   <package id="Mvp.Xml" version="2.3.0" targetFramework="net40" />
   <package id="Nancy" version="1.4.4" targetFramework="net45" />

diff --git a/InnovatorAdmin/resources/Messages.Designer.cs b/InnovatorAdmin/resources/Messages.Designer.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ static void Main(string[] args) @@
         {
           try
           {
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
@@ Expand Down @@