Breaking coroutines means v3.0 (#1547)

* Start moving to v3.0

* Set more obvious placeholder version numbers

Author: DefaultRyan

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
         run: |
           $target_configuration = "${{ matrix.config }}"
           $target_platform = "${{ matrix.arch }}"
-          $target_version = "1.2.3.4"
+          $target_version = "999.999.999.999"
           $props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
           if ("${{ matrix.compiler }}" -eq "clang-cl") {
             $props += ",Clang=1,PlatformToolset=ClangCl"
@@ -134,7 +134,7 @@ jobs:
         run: |
           $target_configuration = "${{ matrix.config }}"
           $target_platform = "${{ matrix.arch }}"
-          $target_version = "1.2.3.4"
+          $target_version = "999.999.999.999"
           $props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
           if ("${{ matrix.compiler }}" -eq "clang-cl") {
             $props += ",Clang=1,PlatformToolset=ClangCl"
@@ -301,7 +301,7 @@ jobs:
         run: |
           $target_configuration = "${{ matrix.config }}"
           $target_platform = "${{ matrix.arch }}"
-          $target_version = "1.2.3.4"
+          $target_version = "999.999.999.999"
           Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
 
       - name: Restore nuget packages
@@ -347,7 +347,7 @@ jobs:
         run: |
           $target_configuration = "${{ matrix.config }}"
           $target_platform = "${{ matrix.arch }}"
-          $target_version = "1.2.3.4"
+          $target_version = "999.999.999.999"
           Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
 
       - name: Restore nuget packages

.pipelines/OneBranch.Official.yml

@@ -12,7 +12,7 @@ variables:
   parameters:
     debug: ${{ parameters.debug }}
 
-name: 2.0.$(date:yyMMdd)$(rev:.r)
+name: 3.0.$(date:yyMMdd)$(rev:.r)
 
 trigger: none
 

.pipelines/OneBranch.PullRequest.yml

@@ -10,7 +10,7 @@ variables:
   parameters:
     debug: ${{ parameters.debug }}
 
-name: PullRequest_2.0.$(date:yyMMdd)$(rev:.r)
+name: PullRequest_3.0.$(date:yyMMdd)$(rev:.r)
 
 trigger: none 
 

.pipelines/variables/version.yml

@@ -4,7 +4,7 @@ parameters:
     default: false
 
 variables:
-  MajorVersion: "2"
+  MajorVersion: "3"
   MinorVersion: "0"
   VersionDate: $[format('{0:yyMMdd}', pipeline.startTime)]
   VersionCounter: $[counter(variables['VersionDate'], 1)]

CMakeLists.txt

@@ -13,8 +13,8 @@ project(cppwinrt LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-set(CPPWINRT_BUILD_VERSION "2.3.4.5" CACHE STRING "The version string used for cppwinrt.")
-if(CPPWINRT_BUILD_VERSION STREQUAL "2.3.4.5" OR CPPWINRT_BUILD_VERSION STREQUAL "0.0.0.0")
+set(CPPWINRT_BUILD_VERSION "999.999.999.999" CACHE STRING "The version string used for cppwinrt.")
+if(CPPWINRT_BUILD_VERSION STREQUAL "999.999.999.999" OR CPPWINRT_BUILD_VERSION STREQUAL "0.0.0.0")
     message(WARNING "CPPWINRT_BUILD_VERSION has been set to a dummy version string. Do not use in production!")
 endif()
 message(STATUS "Using version string: ${CPPWINRT_BUILD_VERSION}")

Directory.Build.Props

@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CppWinRTBuildVersion Condition="'$(CppWinRTBuildVersion)'==''">2.3.4.5</CppWinRTBuildVersion>
+    <CppWinRTBuildVersion Condition="'$(CppWinRTBuildVersion)'==''">999.999.999.999</CppWinRTBuildVersion>
     <CppWinRTPlatform>$(Platform)</CppWinRTPlatform>
     <CppWinRTPlatform Condition="'$(Platform)'=='Win32'">x86</CppWinRTPlatform>
     <OutDir>$(SolutionDir)_build\$(CppWinRTPlatform)\$(Configuration)\</OutDir>

build_nuget.cmd

@@ -1,7 +1,7 @@
 rem @echo off
 
 set target_version=%1
-if "%target_version%"=="" set target_version=3.0.0.0
+if "%target_version%"=="" set target_version=999.999.999.999
 
 call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
 call msbuild /m /p:Configuration=Release,Platform=x64,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd

build_test_all.cmd

@@ -7,7 +7,7 @@ set clean_intermediate_files=%4
 
 if "%target_platform%"=="" set target_platform=x64
 if "%target_configuration%"=="" set target_configuration=Release
-if "%target_version%"=="" set target_version=1.2.3.4
+if "%target_version%"=="" set target_version=999.999.999.999
 
 if not exist ".\.nuget" mkdir ".\.nuget"
 if not exist ".\.nuget\nuget.exe" powershell -Command "$ProgressPreference = 'SilentlyContinue' ; Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile .\.nuget\nuget.exe"

build_vsix.cmd

@@ -6,7 +6,7 @@ set target_version=%2
 set target_deployment=%3
 
 if "%target_configuration%"=="" set target_configuration=Release
-if "%target_version%"=="" set target_version=1.2.3.4
+if "%target_version%"=="" set target_version=999.999.999.999
 if "%target_deployment%"=="" set target_deployment=Standalone
 
 if not exist ".\.nuget" mkdir ".\.nuget"

prebuild/main.cpp

@@ -77,12 +77,19 @@ namespace cppwinrt::strings {
 
     writer version_rc;
 
+    // Extract major.minor substrings from CPPWINRT_VERSION_STRING (e.g. "3.0.250316.1")
+    std::string_view const full_version{ CPPWINRT_VERSION_STRING };
+    auto const first_dot = full_version.find('.');
+    auto const second_dot = full_version.find('.', first_dot + 1);
+    auto const ver_major = full_version.substr(0, first_dot);
+    auto const ver_minor = full_version.substr(first_dot + 1, second_dot - first_dot - 1);
+
     version_rc.write(R"(
 #include "winres.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION %,%,0,0
+ PRODUCTVERSION %,%,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -99,7 +106,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Microsoft Corporation"
             VALUE "FileDescription", "C++/WinRT"
-            VALUE "FileVersion", "2.0.0.0"
+            VALUE "FileVersion", "%.%.0.0"
             VALUE "LegalCopyright", "Microsoft Corporation. All rights reserved."
             VALUE "OriginalFilename", "cppwinrt.exe"
             VALUE "ProductName", "C++/WinRT"
@@ -112,7 +119,10 @@ BEGIN
     END
 END
 )",
-    CPPWINRT_VERSION_STRING);
+    ver_major, ver_minor,     // FILEVERSION
+    ver_major, ver_minor,     // PRODUCTVERSION
+    ver_major, ver_minor,     // FileVersion string
+    CPPWINRT_VERSION_STRING); // ProductVersion string
 
     std::filesystem::create_directories(argv[2]);
     auto const output = std::filesystem::canonical(argv[2]);