Changes for 2.1.1 release candidate.

GameTechDev · Jul 24, 2024 · 21df2bb · 21df2bb
1 parent 3ed1c36
commit 21df2bb
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/IntelPresentMon/AppCef/AppCef.rc b/IntelPresentMon/AppCef/AppCef.rc
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "flask.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 2,1,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Intel(R) Corporation"
             VALUE "FileDescription", "Intel(R) PresentMon application"
-            VALUE "FileVersion", "1.0.0.0"
+            VALUE "FileVersion", "1.0.1.0"
             VALUE "InternalName", "CefNano.exe"
             VALUE "LegalCopyright", "Copyright (C) 2017-2024"
             VALUE "OriginalFilename", "CefNano.exe"
             VALUE "ProductName", "Intel(R) PresentMon"
-            VALUE "ProductVersion", "2.1.0.0"
+            VALUE "ProductVersion", "2.1.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/IntelPresentMon/PMInstaller/PresentMon.wxs b/IntelPresentMon/PMInstaller/PresentMon.wxs
@@ -4,7 +4,7 @@
         Id="*"
         Name="Intel(R) PresentMon"
         Language="1033"
-        Version="2.1.0.0"
+        Version="2.1.1.0"
         Manufacturer="Intel(R) Corporation"
         UpgradeCode="CD0D489E-0FE7-452D-90D9-F94F3F5FF410">
 
@@ -16,7 +16,7 @@
 
         <MediaTemplate EmbedCab="yes" />
 
-        <?define console_app_ver = 2.1.0 ?>
+        <?define console_app_ver = 2.1.1 ?>
         <?define console_app_path = $(pm.GetConsoleAppPath($(var.SolutionDir), $(var.console_app_ver))) ?>
         <?define console_app_filename = $(pm.GetConsoleAppFileName($(var.console_app_ver))) ?>
         <?define has_console_app = $(pm.CheckFileExists($(var.console_app_path))) ?>

diff --git a/IntelPresentMon/PresentMonAPI2/PresentMonAPI2.rc b/IntelPresentMon/PresentMonAPI2/PresentMonAPI2.rc
diff --git a/IntelPresentMon/PresentMonService/PresentMonService.rc b/IntelPresentMon/PresentMonService/PresentMonService.rc
diff --git a/PresentMon.props b/PresentMon.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <!-- PresentMonVersion should be "dev" on main branch, and the version number (e.g., 2.1.0) on release branches. -->
-    <PresentMonVersion>dev</PresentMonVersion>
+    <PresentMonVersion>2.1.1</PresentMonVersion>
     <PresentMonPlatform>$(Platform)</PresentMonPlatform>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">

diff --git a/Provider/Version.rc b/Provider/Version.rc
diff --git a/README-ConsoleApplication.md b/README-ConsoleApplication.md
@@ -4,6 +4,9 @@ The PresentMon/ directory contains source for a standalone console application t
 *PresentMon SDK* to capture and analyze graphics applications, outputting data to the console and/or
 CSV file(s).
 
+A binary of the console application is provided in the release, e.g.:
+[PresentMon-2.1.1-x64.exe](https://github.com/GameTechDev/PresentMon/releases/download/v2.1.1/PresentMon-2.1.1-x64.exe).
+
 ## Command line options
 
 | Capture Target Options         |     |