Skip to content

Commit 7ef2106

Browse files
authored
Merge pull request #293 from OCSInventory-NG/v2.11.0.1
Udpate agent to 2.11.0.1
2 parents 546a62b + ab627aa commit 7ef2106

File tree

13 files changed

+47
-44
lines changed

13 files changed

+47
-44
lines changed

Agent/OCSInventory.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
3535
//
3636

3737
VS_VERSION_INFO VERSIONINFO
38-
FILEVERSION 2,11,0,0
39-
PRODUCTVERSION 2,11,0,0
38+
FILEVERSION 2,11,0,1
39+
PRODUCTVERSION 2,11,0,1
4040
FILEFLAGSMASK 0x3fL
4141
#ifdef _DEBUG
4242
FILEFLAGS 0x1L
@@ -54,13 +54,13 @@ BEGIN
5454
VALUE "Comments", "OCS Inventory Agent"
5555
VALUE "CompanyName", "OCS Inventory"
5656
VALUE "FileDescription", "OCS Inventory Agent"
57-
VALUE "FileVersion", "2.11.0.0"
57+
VALUE "FileVersion", "2.11.0.1"
5858
VALUE "InternalName", "OCSInventory.exe"
5959
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
6060
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
6161
VALUE "OriginalFilename", "OCSInventory.exe"
6262
VALUE "ProductName", "OCS Inventory Windows Agent"
63-
VALUE "ProductVersion", "2.11.0.0"
63+
VALUE "ProductVersion", "2.11.0.1"
6464
END
6565
END
6666
BLOCK "VarFileInfo"

CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
2.11.0.0
1+
2.11.0.1
2+
* Update vcruntime140_1.dll
3+
4+
2.11.0.0
25
* Update library versions
36
- zlib 1.3.1
47
- openssl 1.1.1w

ComHTTP/HTTP.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,11,0,0
29-
PRODUCTVERSION 2,11,0,0
28+
FILEVERSION 2,11,0,1
29+
PRODUCTVERSION 2,11,0,1
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Communication Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory cURL Communication Provider"
47-
VALUE "FileVersion", "2.11.0.0"
47+
VALUE "FileVersion", "2.11.0.1"
4848
VALUE "InternalName", "ComHTTP.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "ComHTTP.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.11.0.0"
53+
VALUE "ProductVersion", "2.11.0.1"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

Download/Download.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2828
//
2929

3030
VS_VERSION_INFO VERSIONINFO
31-
FILEVERSION 2,11,0,0
32-
PRODUCTVERSION 2,11,0,0
31+
FILEVERSION 2,11,0,1
32+
PRODUCTVERSION 2,11,0,1
3333
FILEFLAGSMASK 0x17L
3434
#ifdef _DEBUG
3535
FILEFLAGS 0x1L
@@ -47,13 +47,13 @@ BEGIN
4747
VALUE "Comments", "OCS Inventory Package Download and Setup Tool"
4848
VALUE "CompanyName", "OCS Inventory"
4949
VALUE "FileDescription", "OCS Inventory Package Download and Setup Tool"
50-
VALUE "FileVersion", "2.11.0.0"
50+
VALUE "FileVersion", "2.11.0.1"
5151
VALUE "InternalName", "Download.exe"
5252
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5353
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5454
VALUE "OriginalFilename", "Download.exe"
5555
VALUE "ProductName", "OCS Inventory Windows Agent"
56-
VALUE "ProductVersion", "2.11.0.0"
56+
VALUE "ProductVersion", "2.11.0.1"
5757
END
5858
END
5959
BLOCK "VarFileInfo"

NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setcompressor /SOLID lzma
1313
; HM NIS Edit Wizard helper defines
1414
!define PRODUCT_NAME "OCS Inventory NG Agent"
1515
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
16-
!define PRODUCT_VERSION "2.11.0.0"
16+
!define PRODUCT_VERSION "2.11.0.1"
1717
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
1818
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
1919
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"

OCSInventory Front/OCSInventory Front.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,11,0,0
29-
PRODUCTVERSION 2,11,0,0
28+
FILEVERSION 2,11,0,1
29+
PRODUCTVERSION 2,11,0,1
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Framework Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory Framework Provider"
47-
VALUE "FileVersion", "2.11.0.0"
47+
VALUE "FileVersion", "2.11.0.1"
4848
VALUE "InternalName", "OCSInventory Front.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OCSInventory Front.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.11.0.0"
53+
VALUE "ProductVersion", "2.11.0.1"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

OcsNotifyUser/OcsNotifyUser.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
386386
//
387387

388388
VS_VERSION_INFO VERSIONINFO
389-
FILEVERSION 2,11,0,0
390-
PRODUCTVERSION 2,11,0,0
389+
FILEVERSION 2,11,0,1
390+
PRODUCTVERSION 2,11,0,1
391391
FILEFLAGSMASK 0x3fL
392392
#ifdef _DEBUG
393393
FILEFLAGS 0x1L
@@ -405,13 +405,13 @@ BEGIN
405405
VALUE "Comments", "OCS Inventory User Notification Provider"
406406
VALUE "CompanyName", "OCS Inventory"
407407
VALUE "FileDescription", "OCS Inventory User Notification Provider"
408-
VALUE "FileVersion", "2.11.0.0"
408+
VALUE "FileVersion", "2.11.0.1"
409409
VALUE "InternalName", "OcsNotifyUser.exe"
410410
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
411411
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
412412
VALUE "OriginalFilename", "OcsNotifyUser.exe"
413413
VALUE "ProductName", "OCS Inventory Windows Agent"
414-
VALUE "ProductVersion", "2.11.0.0"
414+
VALUE "ProductVersion", "2.11.0.1"
415415
END
416416
END
417417
BLOCK "VarFileInfo"

OcsSystray/OcsSystray.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
388388
//
389389

390390
VS_VERSION_INFO VERSIONINFO
391-
FILEVERSION 2,11,0,0
392-
PRODUCTVERSION 2,11,0,0
391+
FILEVERSION 2,11,0,1
392+
PRODUCTVERSION 2,11,0,1
393393
FILEFLAGSMASK 0x17L
394394
#ifdef _DEBUG
395395
FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
407407
VALUE "Comments", "OCS Inventory Systray applet"
408408
VALUE "CompanyName", "OCS Inventory"
409409
VALUE "FileDescription", "OCS Inventory Systray applet"
410-
VALUE "FileVersion", "2.11.0.0"
410+
VALUE "FileVersion", "2.11.0.1"
411411
VALUE "InternalName", "OcsSystray.exe"
412412
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
413413
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
414414
VALUE "OriginalFilename", "OcsSystray.exe"
415415
VALUE "ProductName", "OCS Inventory Windows Agent"
416-
VALUE "ProductVersion", "2.11.0.0"
416+
VALUE "ProductVersion", "2.11.0.1"
417417
END
418418
END
419419
BLOCK "VarFileInfo"

OcsWmi/OcsWmi.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,11,0,0
29-
PRODUCTVERSION 2,11,0,0
28+
FILEVERSION 2,11,0,1
29+
PRODUCTVERSION 2,11,0,1
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory WMI Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory WMI Provider"
47-
VALUE "FileVersion", "2.11.0.0"
47+
VALUE "FileVersion", "2.11.0.1"
4848
VALUE "InternalName", "OcsWmi.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OcsWmi.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.11.0.0"
53+
VALUE "ProductVersion", "2.11.0.1"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

Service/Service.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,11,0,0
29-
PRODUCTVERSION 2,11,0,0
28+
FILEVERSION 2,11,0,1
29+
PRODUCTVERSION 2,11,0,1
3030
FILEFLAGSMASK 0x17L
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Service"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory Service"
47-
VALUE "FileVersion", "2.11.0.0"
47+
VALUE "FileVersion", "2.11.0.1"
4848
VALUE "InternalName", "OcsService.exe"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OcsService.exe"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.11.0.0"
53+
VALUE "ProductVersion", "2.11.0.1"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)