Merge commit '9b89b68684e2d64b043ac6572b75b1cfc0d1515c'

Aggiornata versione, IonicZip sostituito
2023-12-27 15:56:21 +01:00 · 2023-12-27 15:56:05 +01:00
5 changed files with 11 additions and 7 deletions
@@ -84,15 +84,15 @@
    <Reference Include="combit.ListLabel25.Wpf">
      <HintPath>..\..\EgtProg\EgtDOORCreator\combit.ListLabel25.Wpf.dll</HintPath>
    </Reference>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagCUT\DotNetZip.dll</HintPath>
+    </Reference>
    <Reference Include="EgtUILib">
      <HintPath>..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
    </Reference>
    <Reference Include="EgtWPFLib5">
      <HintPath>..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
    </Reference>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\..\EgtProg\EgtDOORCreator\Ionic.Zip.dll</HintPath>
-    </Reference>
    <Reference Include="System.Core" />
    <Reference Include="System.Design" />
    <Reference Include="System.Drawing" />
@@ -57,8 +57,8 @@ Friend Class MainWindowModel
      EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
      EgtSetKey(sKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2510, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2510, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2512, 1, IniFile.m_nKeyOptions)
      'Inizializzazione generale di EgtInterface
      m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
      Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.5.10.1")>
-<Assembly: AssemblyFileVersion("2.5.10.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>
@@ -361,6 +361,8 @@ Public Class ProjectManagerHardwareVM
      End If
      Try
         Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
            ' aggiungo progetto corrente .nge
            If File.Exists(sCurrProject) Then
               zip.AddItem(sCurrProject, "")
@@ -1121,6 +1121,8 @@ Public Class ProjectManagerVM
      End If
      Try
         Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
            ' aggiungo progetto corrente .nge
            If File.Exists(sCurrProject) Then
               zip.AddItem(sCurrProject, "")
Author	SHA1	Message	Date
Nicola Pievani	a6890f804a	Merge commit '9b89b68684e2d64b043ac6572b75b1cfc0d1515c'	2023-12-27 15:56:21 +01:00
Nicola Pievani	9b89b68684	Aggiornata versione, IonicZip sostituito	2023-12-27 15:56:05 +01:00