Fix CI

Author: YexuanXiao

CMakeLists.txt

@@ -13,8 +13,8 @@ project(cppwinrt LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
 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 "1.2.3.4" CACHE STRING "The version string used for cppwinrt.")
+if(CPPWINRT_BUILD_VERSION STREQUAL "1.2.3.4" 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)'==''">1.2.3.4</CppWinRTBuildVersion>
     <CppWinRTPlatform>$(Platform)</CppWinRTPlatform>
     <CppWinRTPlatform Condition="'$(Platform)'=='Win32'">x86</CppWinRTPlatform>
     <OutDir>$(SolutionDir)_build\$(CppWinRTPlatform)\$(Configuration)\</OutDir>

build_test_all.cmd

@@ -44,8 +44,8 @@ call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,
 
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp20
-call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp23
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp20_no_sourcelocation
+call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_cpp23
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_fast
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_slow
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:test\test_module_lock_custom

run_tests.cmd

@@ -10,8 +10,8 @@ if "%target_configuration%"=="" set target_configuration=Debug
 
 call :run_test test
 call :run_test test_cpp20
-call :run_test test_cpp23
 call :run_test test_cpp20_no_sourcelocation
+call :run_test test_cpp23
 call :run_test test_fast
 call :run_test test_slow
 call :run_test test_old

test/CMakeLists.txt

@@ -106,8 +106,8 @@ set(SKIP_LARGE_PCH FALSE CACHE BOOL "Skip building large precompiled headers.")
 
 add_subdirectory(test)
 add_subdirectory(test_cpp20)
-add_subdirectory(test_cpp23)
 add_subdirectory(test_cpp20_no_sourcelocation)
+add_subdirectory(test_cpp23)
 
 if(HAS_WINDOWSNUMERICS)
     add_subdirectory(old_tests)

test/test_cpp23/delegate_deducing_this.cpp

@@ -93,19 +93,23 @@ TEST_CASE("typedeventhandler")
     REQUIRE(sum == 3);
 }
 
+#if !(defined(_M_IX86) && !defined(_M_X64) && defined(__clang__))
+// Clang 20 target x86 generates incorrect code for this test.
+// In observed_sender ctor (#1), this = X; in assignment operator (#2), this = X+16 (bytes).
+// FIXME: Enable the test after Clang is fixed
 TEST_CASE("observablevector_vectorchanged")
 {
     IObservableVector<int> vector = single_threaded_observable_vector<int>();
 
     int called{};
-    IObservableVector<int> observed_sender{ nullptr };
+    IObservableVector<int> observed_sender{ nullptr }; // #1
     CollectionChange change{};
     uint32_t index{};
 
     auto token = vector.VectorChanged([&](this auto, IObservableVector<int> sender, IVectorChangedEventArgs args)
         {
             ++called;
-            observed_sender = sender;
+            observed_sender = sender; // #2
             change = args.CollectionChange();
             index = args.Index();
         });
@@ -121,3 +125,5 @@ TEST_CASE("observablevector_vectorchanged")
 }
 
 #endif
+
+#endif