diff --git a/Agent/OCSInventory.rc b/Agent/OCSInventory.rc
index 4ac77eef..7d8e6b6c 100644
--- a/Agent/OCSInventory.rc
+++ b/Agent/OCSInventory.rc
@@ -35,8 +35,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -54,13 +54,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Agent"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Agent"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/CHANGELOG b/CHANGELOG
index f8dd7f21..4c822c08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
-2.8.0.0
+2.9.0.0
+ * Add italian support for SAAS script
+ * Remove DMI call
+ * Minor fix on subnet loop
+
+2.8.0.0
* Add new chassis type in Bios Inventory
* Add HBM memory support
* Add LPDDR memory support
diff --git a/ComHTTP/HTTP.rc b/ComHTTP/HTTP.rc
index 7ab6e592..d06eae47 100644
--- a/ComHTTP/HTTP.rc
+++ b/ComHTTP/HTTP.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Communication Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory cURL Communication Provider"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Download/Download.rc b/Download/Download.rc
index ae23d079..219fcaad 100644
--- a/Download/Download.rc
+++ b/Download/Download.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,13 +47,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Package Download and Setup Tool"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Package Download and Setup Tool"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/External_Deps/OCS_Make_Required_Libs.bat b/External_Deps/OCS_Make_Required_Libs.bat
index 27f8452d..5dd02f94 100644
--- a/External_Deps/OCS_Make_Required_Libs.bat
+++ b/External_Deps/OCS_Make_Required_Libs.bat
@@ -13,10 +13,7 @@ echo.
Rem ========= UPDATE CONSTANTS BELOW TO MEET YOUR CONFIGURATION NEED =========
Rem Set path to MS Visual C++
-set VC_PATH=C:\Program Files (x86)\\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-
-Rem Set path to MS Windows SDK, needed to build cURL
-set WINDOWS_SDK_PATH="C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A"
+set VC_PATH=C:\Program Files (x86)\\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
Rem Set path to Perl 5.6 or higher binary
set PERL_PATH=C:\Strawberry\perl\bin
diff --git a/External_Deps/OCS_Make_Required_Libs_x64.bat b/External_Deps/OCS_Make_Required_Libs_x64.bat
index 0d2a7190..eaa5fa39 100644
--- a/External_Deps/OCS_Make_Required_Libs_x64.bat
+++ b/External_Deps/OCS_Make_Required_Libs_x64.bat
@@ -15,9 +15,6 @@ Rem ========= UPDATE CONSTANTS BELOW TO MEET YOUR CONFIGURATION NEED =========
Rem Set path to MS Visual C++
set VC_PATH=C:\Program Files (x86)\\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
-Rem Set path to MS Windows SDK, needed to build cURL
-set WINDOWS_SDK_PATH="C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A"
-
Rem Set path to Perl 5.6 or higher binary
set PERL_PATH=C:\Strawberry\perl\bin
diff --git a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi
index 574892b1..ffee4eb2 100644
--- a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi
+++ b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi
@@ -13,7 +13,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
-!define PRODUCT_VERSION "2.8.0.1"
+!define PRODUCT_VERSION "2.9.0.0"
!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"
@@ -30,6 +30,9 @@ setcompressor /SOLID lzma
;!insertmacro un.GetParent
;!insertmacro GetParent
+; Define Visual Studio Path
+!define VC_PATH "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\x64"
+
; Use Modern UI
!include "MUI.nsh"
ICON "install-ocs.ico"
@@ -1643,7 +1646,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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.CRT\msvcp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.CRT\msvcp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying msvcp140.dll $\r$\n"
Call Write_Log
@@ -1655,38 +1658,38 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
- File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.MFC\mfc140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.MFC\mfc140u.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.MFC\mfcm140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.MFC\mfcm140u.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.CRT\vcruntime140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.OpenMP\vcomp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.OpenMP\vcomp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcomp140.dll $\r$\n"
Call Write_Log
@@ -1698,7 +1701,7 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
- File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.26.28720\x64\Microsoft.VC142.CXXAMP\vcamp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.CXXAMP\vcamp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcamp140.dll $\r$\n"
Call Write_Log
diff --git a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi
index a4deef16..c0346643 100644
--- a/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi
+++ b/NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi
@@ -13,7 +13,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
-!define PRODUCT_VERSION "2.8.0.1"
+!define PRODUCT_VERSION "2.9.0.0"
!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"
@@ -29,6 +29,9 @@ setcompressor /SOLID lzma
;!insertmacro un.GetParent
;!insertmacro GetParent
+; Define Visual Studio Path
+!define VC_PATH "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\x86"
+
; Use Modern UI
!include "MUI.nsh"
ICON "install-ocs.ico"
@@ -1584,7 +1587,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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.CRT\msvcp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.CRT\msvcp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying msvcp140.dll $\r$\n"
Call Write_Log
@@ -1596,38 +1599,38 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
- File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.MFC\mfc140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.MFC\mfc140u.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.MFC\mfcm140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.MFC\mfcm140u.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.CRT\vcruntime140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.OpenMP\vcomp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.OpenMP\vcomp140.dll"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying vcomp140.dll $\r$\n"
Call Write_Log
@@ -1639,7 +1642,7 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
- File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.26.28720\x86\Microsoft.VC142.CXXAMP\vcamp140.dll"
+ File "${VC_PATH}\Microsoft.VC142.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 2d9ba155..a8e6168f 100644
--- a/OCSInventory Front/OCSInventory Front.rc
+++ b/OCSInventory Front/OCSInventory Front.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Framework Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Framework Provider"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/OcsNotifyUser/OcsNotifyUser.rc b/OcsNotifyUser/OcsNotifyUser.rc
index 570b1486..8262b866 100644
--- a/OcsNotifyUser/OcsNotifyUser.rc
+++ b/OcsNotifyUser/OcsNotifyUser.rc
@@ -386,8 +386,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -405,13 +405,13 @@ BEGIN
VALUE "Comments", "OCS Inventory User Notification Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory User Notification Provider"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/OcsSystray/OcsSystray.rc b/OcsSystray/OcsSystray.rc
index 5e8f4776..2ce7ac95 100644
--- a/OcsSystray/OcsSystray.rc
+++ b/OcsSystray/OcsSystray.rc
@@ -388,8 +388,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Systray applet"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Systray applet"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/OcsWmi/OcsWmi.rc b/OcsWmi/OcsWmi.rc
index dfcf49c7..b0f4eeaa 100644
--- a/OcsWmi/OcsWmi.rc
+++ b/OcsWmi/OcsWmi.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory WMI Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory WMI Provider"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Service/Service.rc b/Service/Service.rc
index b13013df..dde2d766 100644
--- a/Service/Service.rc
+++ b/Service/Service.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory Service"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory Service"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
@@ -103,9 +103,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON1 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent_x64\\NSIS_agent_setup\\OCSInventory.ico"
+IDI_ICON1 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent64\\NSIS_agent_setup\\OCSInventory.ico"
-IDI_ICON2 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent_x64\\Agent\\res\\OCSInventory.ico"
+IDI_ICON2 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent64\\Agent\\res\\OCSInventory.ico"
#endif // Français (France) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/Service/Service.vcxproj b/Service/Service.vcxproj
index d066ad1b..78a9b2d3 100644
--- a/Service/Service.vcxproj
+++ b/Service/Service.vcxproj
@@ -186,7 +186,7 @@
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86\mc.exe" %(Filename)%(Extension)
%(RootDir)%(Directory)\%(Filename).h;%(Outputs)
- "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\mc.exe" %(Filename)%(Extension)
+ "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\mc.exe" %(Filename)%(Extension)
%(RootDir)%(Directory)\%(Filename).h;%(Outputs)
diff --git a/SysInfo/SysInfo.rc b/SysInfo/SysInfo.rc
index 817f0da4..8fa77677 100644
--- a/SysInfo/SysInfo.rc
+++ b/SysInfo/SysInfo.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
VALUE "Comments", "OCS Inventory System Provider"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory System Provider"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
diff --git a/TestSysInfo/TestSysInfo.rc b/TestSysInfo/TestSysInfo.rc
index c12bd134..5b5f2493 100644
--- a/TestSysInfo/TestSysInfo.rc
+++ b/TestSysInfo/TestSysInfo.rc
@@ -50,8 +50,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,0,1
- PRODUCTVERSION 2,8,0,1
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,13 +69,13 @@ BEGIN
VALUE "Comments", "OCS Inventory System Information Testing tool"
VALUE "CompanyName", "OCS Inventory"
VALUE "FileDescription", "OCS Inventory System Information Testing tool"
- VALUE "FileVersion", "2.8.0.1"
+ VALUE "FileVersion", "2.9.0.0"
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 Windows Agent"
- VALUE "ProductVersion", "2.8.0.1"
+ VALUE "ProductVersion", "2.9.0.0"
END
END
BLOCK "VarFileInfo"
@@ -131,9 +131,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON1 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent_x64\\NSIS_agent_setup\\install-ocs.ico"
+IDI_ICON1 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent64\\NSIS_agent_setup\\install-ocs.ico"
-IDI_ICON2 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent_x64\\Agent\\res\\OCSInventory.ico"
+IDI_ICON2 ICON "C:\\Users\\charl\\Documents\\GitHub\\WindowsAgent64\\Agent\\res\\OCSInventory.ico"
#ifdef APSTUDIO_INVOKED