diff --git a/Agent/OCSInventory.rc b/Agent/OCSInventory.rc index 31c8bb30..8a961764 100644 --- a/Agent/OCSInventory.rc +++ b/Agent/OCSInventory.rc @@ -53,13 +53,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Agent" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG Agent" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OCSInventory.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OCSInventory.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/ComHTTP/HTTP.rc b/ComHTTP/HTTP.rc index 226ccebd..295babc1 100644 --- a/ComHTTP/HTTP.rc +++ b/ComHTTP/HTTP.rc @@ -44,13 +44,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Communication Provider" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG cURL Communication Provider" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "ComHTTP.dll" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "ComHTTP.dll" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/Download/Download.rc b/Download/Download.rc index 456dfb55..a36bc9d6 100644 --- a/Download/Download.rc +++ b/Download/Download.rc @@ -47,13 +47,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Package Download and Setup Tool" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG Package Download and Setup Tool" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "Download.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "Download.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi index e09c8875..82e5b0c0 100644 --- a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi +++ b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi @@ -12,7 +12,7 @@ setcompressor /SOLID lzma ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "OCS Inventory NG Agent" -!define PRODUCT_VERSION "2.6.0.0" +!define PRODUCT_VERSION "2.6.0.1" !define PRODUCT_PUBLISHER "OCS Inventory NG Team" !define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe" @@ -1616,7 +1616,7 @@ Section "OCS Inventory Agent" SEC03 clearerrors ; MSVC 9 CRT redist current for XP and higher SetOutPath "$INSTDIR" - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying msvcp140.dll $\r$\n" Call Write_Log @@ -1628,44 +1628,50 @@ Section "OCS Inventory Agent" SEC03 Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying mfc140.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140u.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfc140u.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying mfc140u.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying mfcm140.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140u.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\mfcm140u.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying mfcm140u.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors ;Lib for Win 8.0 / 8.1 / win 10 - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying vcruntime140.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.OpenMP\vcomp140.dll" + File "vcruntime140_1.dll" + Iferrors 0 +5 + StrCpy $logBuffer "$logBuffer ERROR copying vcruntime140.dll $\r$\n" + Call Write_Log + strcpy $installSatus ":(" + clearerrors + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.OpenMP\vcomp140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying vcomp140.dll $\r$\n" Call Write_Log strcpy $installSatus ":(" clearerrors - File "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CXXAMP\vcamp140.dll" + File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CXXAMP\vcamp140.dll" Iferrors 0 +5 StrCpy $logBuffer "$logBuffer ERROR copying vcamp140.dll $\r$\n" Call Write_Log diff --git a/OCSInventory Front/OCSInventory Front.rc b/OCSInventory Front/OCSInventory Front.rc index 872285fe..eb5402cb 100644 --- a/OCSInventory Front/OCSInventory Front.rc +++ b/OCSInventory Front/OCSInventory Front.rc @@ -44,13 +44,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Framework Provider" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG Framework Provider" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OCSInventory Front.dll" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OCSInventory Front.dll" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/OcsNotifyUser/OcsNotifyUser.rc b/OcsNotifyUser/OcsNotifyUser.rc index 5809b0bc..a253f9ff 100644 --- a/OcsNotifyUser/OcsNotifyUser.rc +++ b/OcsNotifyUser/OcsNotifyUser.rc @@ -404,13 +404,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG User Notification Provider" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG User Notification Provider" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OcsNotifyUser.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OcsNotifyUser.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/OcsSystray/OcsSystray.rc b/OcsSystray/OcsSystray.rc index 3570e541..f4a7533a 100644 --- a/OcsSystray/OcsSystray.rc +++ b/OcsSystray/OcsSystray.rc @@ -407,13 +407,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Systray applet" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG Systray applet" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OcsSystray.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OcsSystray.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/OcsWmi/OcsWmi.rc b/OcsWmi/OcsWmi.rc index fb589fc1..5ed3fec3 100644 --- a/OcsWmi/OcsWmi.rc +++ b/OcsWmi/OcsWmi.rc @@ -44,13 +44,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG WMI Provider" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG WMI Provider" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OcsWmi.dll" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OcsWmi.dll" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/Service/Service.rc b/Service/Service.rc index 8f301766..06499daf 100644 --- a/Service/Service.rc +++ b/Service/Service.rc @@ -44,13 +44,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG Service" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG Service" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "OcsService.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "OcsService.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/SysInfo/SysInfo.rc b/SysInfo/SysInfo.rc index ad3d2815..aa7f086f 100644 --- a/SysInfo/SysInfo.rc +++ b/SysInfo/SysInfo.rc @@ -44,13 +44,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG System Provider" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG System Provider" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "SysInfo.dll" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "SysInfo.dll" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo" diff --git a/TestSysInfo/TestSysInfo.rc b/TestSysInfo/TestSysInfo.rc index 8868d333..272305be 100644 --- a/TestSysInfo/TestSysInfo.rc +++ b/TestSysInfo/TestSysInfo.rc @@ -70,13 +70,13 @@ BEGIN VALUE "Comments", "OCS Inventory NG System Information Testing tool" VALUE "CompanyName", "OCS Inventory NG" VALUE "FileDescription", "OCS Inventory NG System Information Testing tool" - VALUE "FileVersion", "2.6.0.0" + VALUE "FileVersion", "2.6.0.1" VALUE "InternalName", "TestSysInfo.exe" VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2" VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org" VALUE "OriginalFilename", "TestSysInfo.exe" VALUE "ProductName", "OCS Inventory NG Windows Agent" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.0.1" END END BLOCK "VarFileInfo"