#99: Upversion .Net dependency to 4.6.2 to resolve TLS issue

salesagility · Jun 24, 2019 · e14fe96 · e14fe96
1 parent 1b632a8
commit e14fe96
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 35 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "SuiteCRM Outlook Add-in"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.0.19.113
+PROJECT_NUMBER         = 3.0.19.119
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### What's in this repository 
 
-SuiteCRM Outlook Plug-In v 3.0.19.113
+SuiteCRM Outlook Plug-In v 3.0.19.119
 
 This repository has been created to allow community members to collaborate and contribute to the project.
 

diff --git a/SuiteCRMAddIn/Properties/AssemblyInfo.cs b/SuiteCRMAddIn/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.19.113")]
+[assembly: AssemblyVersion("3.0.19.119")]
 [assembly: AssemblyFileVersion("3.0.1")]
 
diff --git a/SuiteCRMAddIn/Properties/Settings.Designer.cs b/SuiteCRMAddIn/Properties/Settings.Designer.cs
diff --git a/SuiteCRMAddIn/SuiteCRMAddIn.csproj b/SuiteCRMAddIn/SuiteCRMAddIn.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!--
     This section defines project-level properties.
@@ -28,7 +28,7 @@
     <NoStandardLibraries>false</NoStandardLibraries>
     <RootNamespace>SuiteCRMAddIn</RootNamespace>
     <AssemblyName>SuiteCRMAddIn</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <DefineConstants>VSTO40</DefineConstants>
     <IsWebBootstrapper>False</IsWebBootstrapper>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -147,7 +147,7 @@
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NGettext, Version=0.6.1.0, Culture=neutral, PublicKeyToken=08d3d1c89dfd2985, processorArchitecture=MSIL">
@@ -513,7 +513,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.11.2\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\TidyHtml5ManagedRepack.1.1.4\build\TidyHtml5ManagedRepack.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\TidyHtml5ManagedRepack.1.1.4\build\TidyHtml5ManagedRepack.targets'))" />
   </Target>
   <UsingTask TaskName="BumpVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">

diff --git a/SuiteCRMAddIn/app.config b/SuiteCRMAddIn/app.config
@@ -8,19 +8,19 @@
     <userSettings>
         <SuiteCRMAddIn.Properties.Settings>
             <setting name="ExcludedEmails" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="PublicKey" serializeAs="String">
                 <value>b8794235718652747b82fd713deac078</value>
             </setting>
             <setting name="Username" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Password" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Host" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ArchiveAttachments" serializeAs="String">
                 <value>False</value>
@@ -47,7 +47,7 @@
                 <value>False</value>
             </setting>
             <setting name="LDAPKey" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ShowConfirmationMessageArchive" serializeAs="String">
                 <value>True</value>
@@ -59,7 +59,7 @@
                 <value>10</value>
             </setting>
             <setting name="LicenceKey" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="RestTimeout" serializeAs="String">
                 <value>300000</value>
@@ -74,11 +74,11 @@
                 <value>30</value>
             </setting>
             <setting name="ShowExceptions" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </SuiteCRMAddIn.Properties.Settings>
     </userSettings>
     <system.net>
       <defaultProxy useDefaultCredentials="true"/>
     </system.net>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/SuiteCRMAddIn/packages.config b/SuiteCRMAddIn/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="NGettext" version="0.6.3" targetFramework="net461" />
-  <package id="NUnit3TestAdapter" version="3.11.2" targetFramework="net461" />
-  <package id="TidyHtml5ManagedRepack" version="1.1.4" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
+  <package id="NGettext" version="0.6.3" targetFramework="net462" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net462" />
+  <package id="TidyHtml5ManagedRepack" version="1.1.4" targetFramework="net462" />
 </packages>
diff --git a/SuiteCRMAddInTests/SuiteCRMAddInTests.csproj b/SuiteCRMAddInTests/SuiteCRMAddInTests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SuiteCRMAddInTests</RootNamespace>
     <AssemblyName>SuiteCRMAddInTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/SuiteCRMAddInTests/app.config b/SuiteCRMAddInTests/app.config
@@ -42,4 +42,4 @@
             </setting>
         </SuiteCRMAddInTests.Properties.Settings>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/SuiteCRMAddInWixSetup/Product.wxs b/SuiteCRMAddInWixSetup/Product.wxs
@@ -4,7 +4,7 @@
     Id="A784C437-58CF-4495-BE4A-F77657600001" 
     Name="SuiteCRMAddIn" 
     Language="1033" 
-    Version="3.0.19.113"
+    Version="3.0.19.119"
     Manufacturer="SalesAgility" 
     UpgradeCode="F50E9CEB-D641-4FC6-8E16-483505C3455A">
 

diff --git a/SuiteCRMClient/Properties/AssemblyInfo.cs b/SuiteCRMClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.19.113")]
+[assembly: AssemblyVersion("3.0.19.119")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SuiteCRMClient/SuiteCRMClient.csproj b/SuiteCRMClient/SuiteCRMClient.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SuiteCRMClient</RootNamespace>
     <AssemblyName>SuiteCRMClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>

diff --git a/SuiteCRMClient/app.config b/SuiteCRMClient/app.config
@@ -19,4 +19,4 @@
         <bindings/>
         <client/>
     </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/SuiteCRMClient/packages.config b/SuiteCRMClient/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="NGettext" version="0.6.3" targetFramework="net461" />
+  <package id="NGettext" version="0.6.3" targetFramework="net462" />
 </packages>