From 13810e94fc2f39a5e64e18bc7af019dda64bf945 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Fri, 21 Jan 2022 13:44:27 +0000 Subject: [PATCH] build: rename version.properties to build.version.props --- Changelog.md | 2 ++ build/VStudio/build.common.props | 2 +- build/VStudio/{version.properties => build.version.props} | 0 doc/WinFsp-Rebranding.asciidoc | 2 +- doc/WinFsp-on-ARM64.asciidoc | 2 +- tools/myinfo.bat | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) rename build/VStudio/{version.properties => build.version.props} (100%) diff --git a/Changelog.md b/Changelog.md index 696aea37..ce8ae5c7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,8 @@ - [NEW] The default value for the registry setting `DistinctPermsForSameOwnerGroup` has been changed from 0 to 1. +- [BUILD] Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`. + ## v1.10 (2022) diff --git a/build/VStudio/build.common.props b/build/VStudio/build.common.props index e49d538d..81f57a60 100644 --- a/build/VStudio/build.common.props +++ b/build/VStudio/build.common.props @@ -1,6 +1,6 @@  - + NTDDI_VERSION=0x06010000;_WIN32_WINNT=0x0601;MyProductName=$(MyProductName);MyProductFileName=$(MyProductFileName);MyDescription=$(MyDescription);MyCompanyName=$(MyCompanyName);MyCopyright=$(MyCopyright);MyProductVersion=$(MyProductVersion);MyProductStage=$(MyProductStage);MyVersion=$(MyVersion);MyVersionWithCommas=$(MyVersionWithCommas);MyFullVersion=$(MyFullVersion);MyFspFsctlDeviceClassGuid=$(MyFspFsctlDeviceClassGuid);MyFspFsvrtDeviceClassGuid=$(MyFspFsvrtDeviceClassGuid) diff --git a/build/VStudio/version.properties b/build/VStudio/build.version.props similarity index 100% rename from build/VStudio/version.properties rename to build/VStudio/build.version.props diff --git a/doc/WinFsp-Rebranding.asciidoc b/doc/WinFsp-Rebranding.asciidoc index 1283526c..cc968190 100644 --- a/doc/WinFsp-Rebranding.asciidoc +++ b/doc/WinFsp-Rebranding.asciidoc @@ -4,7 +4,7 @@ If you have a commercial WinFsp license and wish to produce a rebranded version == Overview -The WinFsp build is controlled by the file `build\VStudio\version.properties`. The file contains properties that control the final build output in a number of ways. Some of the properties in this file control how the final build product is branded, others how it is versioned, etc. +The WinFsp build is controlled by the file `build\VStudio\build.version.props`. The file contains properties that control the final build output in a number of ways. Some of the properties in this file control how the final build product is branded, others how it is versioned, etc. === Branding diff --git a/doc/WinFsp-on-ARM64.asciidoc b/doc/WinFsp-on-ARM64.asciidoc index 6a0f418a..d7ac606b 100644 --- a/doc/WinFsp-on-ARM64.asciidoc +++ b/doc/WinFsp-on-ARM64.asciidoc @@ -7,7 +7,7 @@ This document summarizes the changes made to WinFsp to support Windows on ARM64. * Visual Studio 2019 or later is required to build WinFsp. Visual Studio 2015 builds are no longer possible because of lack of ARM64 support. ** The script `tools\gensrc\remove-build-arm64.bat` can be used to remove the ARM64 configuration from the project files. This allows WinFsp to be built with Visual Studio 2015, but without ARM64 support. This is a hack to support AppVeyor builds on Server 2012 images that have only Visual Studio 2015 installed. * Build configuration is now done by the file `build.common.props` located in `build\VStudio`. -* Product configuration (`MyProductName`, etc.) is still done by the file `version.properties` located in `build\VStudio`. Non-product configuration portions of the file have migrated to `build.common.props`, which includes `version.properties`. +* Product configuration (`MyProductName`, etc.) is done by the file `build.version.props` located in `build\VStudio`. This file was previously named `version.properties`. * Project files under `build\VStudio` have been updated to support ARM64 builds. == Include Files diff --git a/tools/myinfo.bat b/tools/myinfo.bat index b66a7735..f384d4ac 100644 --- a/tools/myinfo.bat +++ b/tools/myinfo.bat @@ -1,6 +1,6 @@ @echo off -for /F "tokens=2,3,4 delims=<>" %%a in (%~dp0..\build\VStudio\version.properties) do ( +for /F "tokens=2,3,4 delims=<>" %%a in (%~dp0..\build\VStudio\build.version.props) do ( if "/%%a"=="%%c" ( if "%%a"=="MyProductName" ( set MyProductName=%%b