updated libraries and version

davidegironi · Jun 20, 2019 · 0b58177 · 0b58177
1 parent 2fc61fc
commit 0b58177
Show file tree

Hide file tree

Showing 40 changed files with 192 additions and 180 deletions.
diff --git a/DentneD/App.config b/DentneD/App.config
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-  </configSections>
+
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
   <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <connectionStrings>
     <!-- database connection string -->
-    <add name="dentnedEntities" connectionString="" providerName="System.Data.EntityClient"/>
+    <add name="dentnedEntities" connectionString="" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <appSettings>
     <!-- language -->
-    <add key="language" value="en"/>
+    <add key="language" value="en" />
     <!-- patient content folder -->
-    <add key="patientsDatadir" value="..\..\..\DataTemp\Datas"/>
+    <add key="patientsDatadir" value="..\..\..\DataTemp\Datas" />
     <!-- patient attachements folder -->
-    <add key="patientsAttachmentsdir" value="..\..\..\DataTemp\Attachments"/>
+    <add key="patientsAttachmentsdir" value="..\..\..\DataTemp\Attachments" />
     <!-- invoices folder -->
-    <add key="invoicesdir" value="..\..\..\DataTemp\Invoices"/>
+    <add key="invoicesdir" value="..\..\..\DataTemp\Invoices" />
     <!-- temporary folder -->
-    <add key="tmpdir" value="..\..\..\DataTemp\Temp"/>
+    <add key="tmpdir" value="..\..\..\DataTemp\Temp" />
     <!-- do secure delete (needs the srm.exe executable) -->
-    <add key="doSecureDelete" value="false"/>
+    <add key="doSecureDelete" value="false" />
     <!-- purge the temporary folder at startup, disable this if it's enabled by service -->
-    <add key="cleanTmpdirAtStartup" value="false"/>
+    <add key="cleanTmpdirAtStartup" value="false" />
     <!-- backup script -->
-    <add key="backupscript" value="backup\db-backup.bat"/>
+    <add key="backupscript" value="backup\db-backup.bat" />
     <!-- password protected forms and actions -->
-    <add key="passwordProtectedForms" value=""/>
+    <add key="passwordProtectedForms" value="" />
     <!-- password protected forms check code -->
-    <add key="passwordProtectedFormsCheck" value="E6LMm2BaLe60XJjh2SAG3w=="/>
+    <add key="passwordProtectedFormsCheck" value="E6LMm2BaLe60XJjh2SAG3w==" />
     <!-- password for protected forms -->
-    <add key="passwordProtectedFormsPassword" value="Y+jKvnVBnIyTD+Y8YVWD2Q=="/>
+    <add key="passwordProtectedFormsPassword" value="Y+jKvnVBnIyTD+Y8YVWD2Q==" />
     <!-- password for protected reports -->
-    <add key="passwordProtectedReports" value="Y+jKvnVBnIyTD+Y8YVWD2Q=="/>
+    <add key="passwordProtectedReports" value="Y+jKvnVBnIyTD+Y8YVWD2Q==" />
     <!-- set the patient payment reference: 'N' for nothing, 'T' if you plain to refer payment to treatments, 'I' for invoices -->
-    <add key="paymentReference" value="T"/>
+    <add key="paymentReference" value="T" />
     <!-- reset the patient treatments filter on patient change -->
-    <add key="resetPatientstreatmentsFilterOnChange" value="false"/>
+    <add key="resetPatientstreatmentsFilterOnChange" value="false" />
     <!-- reset the patient treatments filter on patients treatment save -->
-    <add key="resetPatientstreatmentsFilterOnSave" value="false"/>
+    <add key="resetPatientstreatmentsFilterOnSave" value="false" />
     <!-- set the patient default filter: 'A' for all, 'N' for not archived, 'C' for archived -->
-    <add key="patientsDefaultFilter" value="N"/>
+    <add key="patientsDefaultFilter" value="N" />
     <!-- select the action on open attachment button click, open file folder 'F', open with default application 'A' -->
-    <add key="patientsAttachmentsOpenMode" value="A"/>
+    <add key="patientsAttachmentsOpenMode" value="A" />
     <!-- when saving a new attachment, open that on edit mode to add a file -->
-    <add key="patientsAttachmentsSaveandedit" value="true"/>
+    <add key="patientsAttachmentsSaveandedit" value="true" />
     <!-- calendar highlight start end end hours -->
-    <add key="calendarDayHourBegin" value="8"/>
-    <add key="calendarDayHourEnd" value="19"/>
+    <add key="calendarDayHourBegin" value="8" />
+    <add key="calendarDayHourEnd" value="19" />
     <!-- calendar first day of the week -->
-    <add key="calendarFirstDayOfTheWeek" value="Monday"/>
+    <add key="calendarFirstDayOfTheWeek" value="Monday" />
     <!-- calendar include Saturaday  -->
-    <add key="calendarWeekIncludeSaturday" value="true"/>
+    <add key="calendarWeekIncludeSaturday" value="true" />
     <!-- calendar include Sunday  -->
-    <add key="calendarWeekIncludeSunday" value="false"/>
+    <add key="calendarWeekIncludeSunday" value="false" />
     <!-- calendar treatments advices color -->
-    <add key="calendarTreatmentAdvicesColor" value="#ff9966"/>
+    <add key="calendarTreatmentAdvicesColor" value="#ff9966" />
     <!-- show treatments advices checkbox default value on appointments form  -->
-    <add key="appointmentsShowTreatmentsAdvicesChecked" value="true"/>
+    <add key="appointmentsShowTreatmentsAdvicesChecked" value="true" />
     <!-- print models implementation list dll (implements IDentneDPrintModel) -->
-    <add key="printModels" value="DentneDPrintModelDefault.dll,DentneDPrintModel01.dll"/>
+    <add key="printModels" value="DentneDPrintModelDefault.dll,DentneDPrintModel01.dll" />
     <!-- set the startup size, format: 'WxH' (W is width, H is height), add 'M' as the last character to maximize the window -->
-    <add key="sizeOnStartup" value="1024x768"/>
+    <add key="sizeOnStartup" value="1024x768" />
     <!-- show invoice and estimates total on bottom -->
-    <add key="showInvoicesEstimatesTotal" value="true"/>
+    <add key="showInvoicesEstimatesTotal" value="true" />
     <!-- set the is paid default status for any new invoice -->
-    <add key="invoicesIsPaidDefault" value="true"/>
+    <add key="invoicesIsPaidDefault" value="true" />
     <!-- autoincrement suggested on invoice and estimates number -->
-    <add key="autoincrementInvoicesEstimatesNumber" value="true"/>
+    <add key="autoincrementInvoicesEstimatesNumber" value="true" />
     <!-- add tooths to invoice description on patient treatments selection -->
-    <add key="addToothsToDocumentDescription" value="true"/>
+    <add key="addToothsToDocumentDescription" value="true" />
     <!-- smtp hostname -->
-    <add key="mailerSMTPhost" value="smtp.mail.com"/>
+    <add key="mailerSMTPhost" value="smtp.mail.com" />
     <!-- smtp port -->
-    <add key="mailerSMTPport" value="25"/>
+    <add key="mailerSMTPport" value="25" />
     <!-- smtp from -->
-    <add key="mailerSMTPfrom" value="sender"/>
+    <add key="mailerSMTPfrom" value="sender" />
     <!-- smtp username -->
-    <add key="mailerSMTPusername" value="[email protected]"/>
+    <add key="mailerSMTPusername" value="[email protected]" />
     <!-- smtp password -->
-    <add key="mailerSMTPpassword" value="password"/>
+    <add key="mailerSMTPpassword" value="password" />
     <!-- smtp ssl enabelr -->
-    <add key="mailerSMTPenablessl" value="false"/>
+    <add key="mailerSMTPenablessl" value="false" />
   </appSettings>
 </configuration>
diff --git a/DentneD/DentneD.csproj b/DentneD/DentneD.csproj
@@ -57,8 +57,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AdvancedDataGridView, Version=1.1.23013.3, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DG.AdvancedDataGridView.1.1.23013.3\lib\net40\AdvancedDataGridView.dll</HintPath>
+    <Reference Include="AdvancedDataGridView, Version=1.1.23420.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DG.AdvancedDataGridView.1.1.23420.4\lib\net40\AdvancedDataGridView.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DGDataModel, Version=1.1.18530.42, Culture=neutral, processorArchitecture=MSIL">
@@ -74,11 +74,12 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ExcelLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ExcelLibrary.1.2011.7.31\lib\ExcelLibrary.dll</HintPath>

diff --git a/DentneD/Properties/AssemblyInfo.cs b/DentneD/Properties/AssemblyInfo.cs
diff --git a/DentneD/packages.config b/DentneD/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DG.AdvancedDataGridView" version="1.1.23013.3" targetFramework="net452" />
+  <package id="DG.AdvancedDataGridView" version="1.1.23420.4" targetFramework="net452" />
   <package id="DG.EnhancedBoxHelpers" version="1.0.22517.17" targetFramework="net452" />
-  <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net452" />
   <package id="ExcelLibrary" version="1.2011.7.31" targetFramework="net452" />
 </packages>
diff --git a/DentneDHelpers.Test/App.config b/DentneDHelpers.Test/App.config
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-  </configSections>
+
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="mssqllocaldb"/>
+        <parameter value="mssqllocaldb" />
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="dentnedEntities" connectionString="" providerName="System.Data.EntityClient"/>
+    <add name="dentnedEntities" connectionString="" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <appSettings>
-    <add key="tmpdir" value="..\..\..\DataTemp\Temp"/>
+    <add key="tmpdir" value="..\..\..\DataTemp\Temp" />
   </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/DentneDHelpers.Test/DentneDHelpers.Test.csproj b/DentneDHelpers.Test/DentneDHelpers.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.9.0\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="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -43,15 +44,15 @@
       <HintPath>..\packages\Ext\DGDataModel\DGDataModel.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -145,6 +146,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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('..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.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'))" />
   </Target>
 </Project>
diff --git a/DentneDHelpers.Test/Properties/AssemblyInfo.cs b/DentneDHelpers.Test/Properties/AssemblyInfo.cs
diff --git a/DentneDHelpers.Test/packages.config b/DentneDHelpers.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
-  <package id="NUnit" version="3.9.0" targetFramework="net45" />
-  <package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net45" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net452" />
+  <package id="NUnit" version="3.12.0" targetFramework="net452" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net452" />
 </packages>
diff --git a/DentneDHelpers/App.config b/DentneDHelpers/App.config
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-  </configSections>
+
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="mssqllocaldb"/>
+        <parameter value="mssqllocaldb" />
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/DentneDHelpers/DentneDHelpers.csproj b/DentneDHelpers/DentneDHelpers.csproj
@@ -35,11 +35,11 @@
       <HintPath>..\packages\Ext\DGDataModel\DGDataModel.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -67,7 +67,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/DentneDHelpers/Properties/AssemblyInfo.cs b/DentneDHelpers/Properties/AssemblyInfo.cs
diff --git a/DentneDHelpers/packages.config b/DentneDHelpers/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net452" />
 </packages>