Skip to content

GitLab

Unverified Commit 867ae242 authored by RudyLaurent's avatar RudyLaurent Committed by GitHub
Browse files

Merge pull request #60 from charleneauger/UpdateVersionOCS 

Update version ocs to 2.3.1.1
parents d88662a3 d17ffcf2
Hide whitespace changes
Inline Side-by-side
Agent/OCSInventory.rc
View file @ 867ae242
......@@ -34,8 +34,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
CHANGELOG
View file @ 867ae242
2.3.1.1
* Fix memory leak
* Add Network disconnected status on inventory
* Fix bug encoded translation WMI S/N Windows 7
* Update Network adapter's description to support unicode characters
2.3.1.0
* Update deprecated functions
* Add PowerShell support for plugins
......
ComHTTP/HTTP.rc
View file @ 867ae242
......@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
Download/Download.rc
View file @ 867ae242
......@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi
View file @ 867ae242
......@@ -12,7 +12,7 @@ setcompressor /SOLID lzma
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "OCS Inventory NG Agent"
!define PRODUCT_VERSION "2.3.1.0"
!define PRODUCT_VERSION "2.3.1.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"
......
OCSInventory Front/OCSInventory Front.rc
View file @ 867ae242
......@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
OcsNotifyUser/OcsNotifyUser.rc
View file @ 867ae242
......@@ -385,8 +385,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
OcsSystray/OcsSystray.rc
View file @ 867ae242
......@@ -388,8 +388,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
OcsWmi/OcsWmi.rc
View file @ 867ae242
......@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
Service/Service.rc
View file @ 867ae242
......@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
SysInfo/SysInfo.rc
View file @ 867ae242
......@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -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.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
TestSysInfo/TestSysInfo.rc
View file @ 867ae242
......@@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,3,1,1
PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -70,13 +70,13 @@ BEGIN
VALUE "Comments", "OCS Inventory NG System Informations Testing tool"
VALUE "CompanyName", "OCS Inventory NG"
VALUE "FileDescription", "OCS Inventory NG System Informations Testing tool"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.3.1.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.3.1.0"
VALUE "ProductVersion", "2.3.1.1"
END
END
BLOCK "VarFileInfo"
......
logon/OcsLogon.nsi
View file @ 867ae242
......@@ -12,7 +12,7 @@ setcompressor /SOLID lzma
; Version informations
!define PRODUCT_NAME "OCS Inventory NG Logon Installer"
!define PRODUCT_VERSION "2.3.1.0"
!define PRODUCT_VERSION "2.3.1.1"
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment