Update versioning scheme to reflect targeted/tested RNW version (#134)

* Update versioning scheme

* Just testing things now

* Trying something else

* Is this correct?

* How about this?

* This is not a good experience

* Will this work any better?

* bleh

* oops

* Such sadness

* This is getting pretty absurd

* Trying something out

* When at first you don't succeed

* Trailing .0 gets removed from package version. Starting at 1

Author: dunhor

azure-pipelines.yml

@@ -10,6 +10,16 @@ trigger:
 pool:
   vmImage: 'windows-2019'
 
+# NOTE: The major/minor versions correspond to the React Native version we target/have tested against
+variables:
+  product_major_version: 0
+  product_minor_version: 63
+  product_build: $[format('{0:yyyyMMdd}', pipeline.startTime)]
+  product_build_qfe: $[counter(format('{0}.{1}.{2}', variables['product_major_version'], variables['product_minor_version'], variables['product_build']), 1)]
+
+# NOTE: The first two digits are the targeted React Native version
+name: $(product_major_version).$(product_minor_version).$(product_build).$(product_build_qfe)
+
 jobs:
   - job: Build
     steps:
@@ -29,6 +39,7 @@ jobs:
           vsVersion: 'latest'
           platform: 'x64'
           configuration: 'Release'
+          msbuildArgs: '-p:RnWinRTMajorVersion=$(product_major_version);RnWinRTMinorVersion=$(product_minor_version);RnWinRTBuild=$(product_build);RnWinRTBuildQFE=$(product_build_qfe)'
 
       - task: EsrpCodeSigning@1
         displayName: 'ESRP CodeSigning'

rnwinrt/rnwinrt/main.cpp

@@ -33,7 +33,7 @@ namespace
 
     void PrintUsage()
     {
-        std::cout << R"(React Native WinRT )" << CPPWINRT_VERSION_STRING << std::endl;
+        std::cout << R"(React Native WinRT )" << RNWINRT_VERSION_STRING << std::endl;
         std::cout << R"(Copyright (c) Microsoft Corporation. All rights reserved.)" << std::endl;
         std::cout << R"(  rnwinrt.exe [options...])" << std::endl << std::endl;
         std::cout << R"(Options:)" << std::endl;

rnwinrt/rnwinrt/rnwinrt.vcxproj

@@ -9,6 +9,11 @@
     <!-- TODO: This is to ensure that VS will re-run msbuild each time we "build". Otherwise changes to base.h/cpp might
          not get recompiled... This slows compilation down slightly, but is net goodness -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <RnWinRTMajorVersion Condition="'$(RnWinRTMajorVersion)' == ''">0</RnWinRTMajorVersion>
+    <RnWinRTMinorVersion Condition="'$(RnWinRTMinorVersion)' == ''">0</RnWinRTMinorVersion>
+    <RnWinRTBuild Condition="'$(RnWinRTBuild)' == ''">0</RnWinRTBuild>
+    <RnWinRTBuildQFE Condition="'$(RnWinRTBuildQFE)' == ''">1</RnWinRTBuildQFE>
+    <RnWinRTBuildVersion>$(RnWinRTMajorVersion).$(RnWinRTMinorVersion).$(RnWinRTBuild).$(RnWinRTBuildQFE)</RnWinRTBuildVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
@@ -103,7 +108,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>CPPWINRT_VERSION_STRING="$(CppWinRTBuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RNWINRT_VERSION_STRING="$(RnWinRTBuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/await /bigobj</AdditionalOptions>
       <AdditionalOptions Condition="'$(Clang)'=='1'">-Wno-unused-command-line-argument -fno-delayed-template-parsing -Xclang -fcoroutines-ts -mcx16</AdditionalOptions>
@@ -113,7 +118,14 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>CPPWINRT_VERSION_STRING="$(CppWinRTBuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>
+        RNWINRT_MAJOR_VERSION=$(RnWinRTMajorVersion);
+        RNWINRT_MINOR_VERSION=$(RnWinRTMinorVersion);
+        RNWINRT_BUILD=$(RnWinRTBuild);
+        RNWINRT_BUILD_QFE=$(RnWinRTBuildQFE);
+        RNWINRT_VERSION_STRING="\"$(RnWinRTBuildVersion)\"";
+        %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

rnwinrt/rnwinrt/version.rc

@@ -2,8 +2,8 @@
 #include "winres.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,0,1
- PRODUCTVERSION 0,0,0,1
+ FILEVERSION RNWINRT_MAJOR_VERSION, RNWINRT_MINOR_VERSION, RNWINRT_BUILD, RNWINRT_BUILD_QFE
+ PRODUCTVERSION RNWINRT_MAJOR_VERSION, RNWINRT_MINOR_VERSION, RNWINRT_BUILD, RNWINRT_BUILD_QFE
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -20,11 +20,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Microsoft Corporation"
             VALUE "FileDescription", "React Native WinRT"
-            VALUE "FileVersion", "0.0.0.1"
+            VALUE "FileVersion", RNWINRT_VERSION_STRING
             VALUE "LegalCopyright", "Microsoft Corporation. All rights reserved."
             VALUE "OriginalFilename", "rnwinrt.exe"
             VALUE "ProductName", "React Native WinRT"
-            VALUE "ProductVersion", "0.0.0.1"
+            VALUE "ProductVersion", RNWINRT_VERSION_STRING
         END
     END
     BLOCK "VarFileInfo"