From 9dd62fc82c360ea3a28189d0076920c361aed160 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:10:07 -0500 Subject: [PATCH 01/14] nuget: replace package name with PyWinRT --- .github/workflows/publish.yml | 2 +- TestComponent/TestComponent.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 195fa82..a3f35c5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,4 +33,4 @@ jobs: run: nuget.exe pack TestComponent/TestComponent.nuspec -OutputFileNamesWithoutVersion - name: nuget push - run: nuget push KennyKerr.Windows.TestWinRT.nupkg ${{ secrets.NUGET_KEY }} -Source nuget.org + run: nuget push PyWinRT.TestWinRT.nupkg ${{ secrets.NUGET_KEY }} -Source nuget.org diff --git a/TestComponent/TestComponent.nuspec b/TestComponent/TestComponent.nuspec index 6d7f076..a5f9a62 100644 --- a/TestComponent/TestComponent.nuspec +++ b/TestComponent/TestComponent.nuspec @@ -1,7 +1,7 @@ - KennyKerr.Windows.TestWinRT + PyWinRT.TestWinRT 1.0.21 TestWinRT Microsoft From 679fefa660ac1567ac2339863a02aefa7dc6da51 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:11:36 -0500 Subject: [PATCH 02/14] replace personal URL --- TestComponent/TestRunner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestComponent/TestRunner.cpp b/TestComponent/TestRunner.cpp index 13b1272..6f0e523 100644 --- a/TestComponent/TestRunner.cpp +++ b/TestComponent/TestRunner.cpp @@ -233,7 +233,7 @@ namespace winrt::TestComponent::implementation TEST_GEN(13, Blittable, Blittable{ 1, 2, 3, 4, -5, -6, -7, 8.0f, 9.0, guid_of() }, Blittable{ 10, 20, 30, 40, -50, -60, -70, 80.0f, 90.0, guid_of() }, Blittable{ 1, 2, 3, 4, -5, -6, -7, 8.0f, 9.0, guid_of() }); TEST_GEN(14, NonBlittable, NonBlittable{ false, L'X', L"First", 123 }, NonBlittable{ true, L'Y', L"Second", 456 }, NonBlittable{ false, L'Z', L"Third", 789 }); TEST_GEN(15, Nested, Nested{ { 1, 2, 3, 4, -5, -6, -7, 8.0f, 9.0, guid_of() }, { false, L'X', L"First", 123 } }, Nested{ { 10, 20, 30, 40, -50, -60, -70, 80.0f, 90.0, guid_of() }, { true, L'Y', L"Second", 456 } }, Nested{ { 1, 2, 3, 4, -5, -6, -7, 8.0f, 9.0, guid_of() }, { false, L'Z', L"Third", 789 } }); - TEST_GEN(16, IStringable, Uri(L"http://kennykerr.ca/one").as(), Uri(L"http://kennykerr.ca/two").as(), Uri(L"http://kennykerr.ca/three").as()); + TEST_GEN(16, IStringable, Uri(L"http://example.com/one").as(), Uri(L"http://example.com/two").as(), Uri(L"http://example.com/three").as()); #undef TEST_GEN From 7b727d2134e0afbb2c6186fcc89b2d18176a0e19 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:25:06 -0500 Subject: [PATCH 03/14] automatic code formatting --- BenchmarkComponent/BenchmarkComponent.vcxproj | 257 +++++++------- .../test_component_base.vcxproj | 27 +- .../test_component_derived.vcxproj | 325 +++++++++--------- .../test_component_fast.vcxproj | 28 +- 4 files changed, 319 insertions(+), 318 deletions(-) diff --git a/BenchmarkComponent/BenchmarkComponent.vcxproj b/BenchmarkComponent/BenchmarkComponent.vcxproj index c595cb2..94ff1a3 100644 --- a/BenchmarkComponent/BenchmarkComponent.vcxproj +++ b/BenchmarkComponent/BenchmarkComponent.vcxproj @@ -1,130 +1,129 @@ - - - - - high - true - true - true - {78d85f23-7cb1-44a1-9238-6df2c76754e4} - BenchmarkComponent - BenchmarkComponent - en-US - true - Windows Store - 10.0 - 10.0 - 10.0.19041.0 - <_NoWinAPIFamilyApp>true - <_VC_Target_Library_Platform>Desktop - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - DynamicLibrary - v140 - v141 - v142 - v143 - Unicode - false - - - - - - - - - - - - - - Console - BenchmarkComponent.def - - - MultiThreadedDLL - true - Use - pch.h - $(IntDir)pch.pch - Level4 - %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) - 28204 - _WINRT_DLL;%(PreprocessorDefinitions) - $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - NDEBUG;%(PreprocessorDefinitions) - /DWINRT_FAST_ABI_SIZE=50 %(AdditionalOptions) - - - - - true - true - - - - - - BenchmarkComponent.idl - - - - - - Create - - - BenchmarkComponent.idl - - - - - /fastabi %(AdditionalOptions) - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + + high + true + true + true + {78d85f23-7cb1-44a1-9238-6df2c76754e4} + BenchmarkComponent + BenchmarkComponent + en-US + true + Windows Store + 10.0 + 10.0 + 10.0.19041.0 + <_NoWinAPIFamilyApp>true + <_VC_Target_Library_Platform>Desktop + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + DynamicLibrary + v140 + v141 + v142 + v143 + Unicode + false + + + + + + + + + + + + + Console + BenchmarkComponent.def + + + MultiThreadedDLL + true + Use + pch.h + $(IntDir)pch.pch + Level4 + %(AdditionalOptions) /bigobj + + /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) + 28204 + _WINRT_DLL;%(PreprocessorDefinitions) + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) + NDEBUG;%(PreprocessorDefinitions) + /DWINRT_FAST_ABI_SIZE=50 %(AdditionalOptions) + + + + + true + true + + + + + + BenchmarkComponent.idl + + + + + + Create + + + BenchmarkComponent.idl + + + + + /fastabi %(AdditionalOptions) + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/test_component_base/test_component_base.vcxproj b/test_component_base/test_component_base.vcxproj index 6d75ffe..870f38a 100644 --- a/test_component_base/test_component_base.vcxproj +++ b/test_component_base/test_component_base.vcxproj @@ -66,17 +66,17 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + Use @@ -140,9 +140,8 @@ - - + @@ -154,6 +153,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj index 643fcde..a578c36 100644 --- a/test_component_derived/test_component_derived.vcxproj +++ b/test_component_derived/test_component_derived.vcxproj @@ -1,164 +1,167 @@ - - - true - true - true - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E} - test_component_derived - test_component_derived - en-US - 14.0 - 10.0.18362.0 - 10.0.17134.0 - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - DynamicLibrary - v143 - v142 - Unicode - false - - - true - true - - - false - true - false - - - - - - - - - - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - - Use - pch.h - $(IntDir)pch.pch - Level4 - %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) - 28204 - _WINRT_DLL;%(PreprocessorDefinitions) - $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - - - Console - true - exports.def - - - - - _DEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - - - NDEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - copy $(OutDir)$(ProjectName).winmd $(SolutionDir) - - - - - - - - - - - - Create - - - - - - ..\test_component_base - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + true + true + true + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E} + test_component_derived + test_component_derived + en-US + 14.0 + 10.0.18362.0 + 10.0.17134.0 + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + + DynamicLibrary + v143 + v142 + Unicode + false + + + true + true + + + false + true + false + + + + + + + + + + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + + Use + pch.h + $(IntDir)pch.pch + Level4 + %(AdditionalOptions) /bigobj + + /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) + 28204 + _WINRT_DLL;%(PreprocessorDefinitions) + $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) + + + Console + true + exports.def + + + + + _DEBUG;%(PreprocessorDefinitions) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + + + + + + + + + + + + Create + + + + + + ..\test_component_base + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/test_component_fast/test_component_fast.vcxproj b/test_component_fast/test_component_fast.vcxproj index e135855..950feda 100644 --- a/test_component_fast/test_component_fast.vcxproj +++ b/test_component_fast/test_component_fast.vcxproj @@ -69,17 +69,17 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x64\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - - - $(SolutionDir)x86\$(Configuration)\$(ProjectName) - + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x64\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + + + $(SolutionDir)x86\$(Configuration)\$(ProjectName) + Use @@ -154,8 +154,8 @@ - - + + @@ -166,6 +166,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file From af7c85a9b16a683cd6e7122dcc483da26920be69 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:25:32 -0500 Subject: [PATCH 04/14] update to VS 2022 --- Test.sln | 222 +++++++++++++++++++++++++++---------------------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/Test.sln b/Test.sln index 108d020..9bd7a87 100644 --- a/Test.sln +++ b/Test.sln @@ -1,111 +1,111 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29319.158 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponent", "TestComponent\TestComponent.vcxproj", "{2954F343-85A7-46F5-A3F3-F106FDD13900}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console\Console.vcxproj", "{8AB80BFD-185A-452D-AAD2-97B38AED3E4B}" - ProjectSection(ProjectDependencies) = postProject - {2954F343-85A7-46F5-A3F3-F106FDD13900} = {2954F343-85A7-46F5-A3F3-F106FDD13900} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BenchmarkComponent", "BenchmarkComponent\BenchmarkComponent.vcxproj", "{78D85F23-7CB1-44A1-9238-6DF2C76754E4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_base", "test_component_base\test_component_base.vcxproj", "{13333A6F-6A4A-48CD-865C-0F65135EB018}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_derived", "test_component_derived\test_component_derived.vcxproj", "{0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}" - ProjectSection(ProjectDependencies) = postProject - {13333A6F-6A4A-48CD-865C-0F65135EB018} = {13333A6F-6A4A-48CD-865C-0F65135EB018} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_fast", "test_component_fast\test_component_fast.vcxproj", "{0E0ACA62-A92F-44CF-BD41-AEB541946DF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.ActiveCfg = Debug|ARM - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.Build.0 = Debug|ARM - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.ActiveCfg = Debug|x64 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.Build.0 = Debug|x64 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.ActiveCfg = Debug|Win32 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.Build.0 = Debug|Win32 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.ActiveCfg = Release|ARM - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.Build.0 = Release|ARM - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.ActiveCfg = Release|x64 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.Build.0 = Release|x64 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.ActiveCfg = Release|Win32 - {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.Build.0 = Release|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|ARM.ActiveCfg = Debug|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.ActiveCfg = Debug|x64 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.Build.0 = Debug|x64 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.ActiveCfg = Debug|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.Build.0 = Debug|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|ARM.ActiveCfg = Release|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.ActiveCfg = Release|x64 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.Build.0 = Release|x64 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.ActiveCfg = Release|Win32 - {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.Build.0 = Release|Win32 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.ActiveCfg = Debug|ARM - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.Build.0 = Debug|ARM - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.ActiveCfg = Debug|x64 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.Build.0 = Debug|x64 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.ActiveCfg = Debug|Win32 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.Build.0 = Debug|Win32 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.ActiveCfg = Release|ARM - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.Build.0 = Release|ARM - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.ActiveCfg = Release|x64 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.Build.0 = Release|x64 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.ActiveCfg = Release|Win32 - {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.Build.0 = Release|Win32 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.ActiveCfg = Debug|ARM - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.Build.0 = Debug|ARM - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.ActiveCfg = Debug|x64 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.Build.0 = Debug|x64 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.ActiveCfg = Debug|Win32 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.Build.0 = Debug|Win32 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.ActiveCfg = Release|ARM - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.Build.0 = Release|ARM - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.ActiveCfg = Release|x64 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.Build.0 = Release|x64 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.ActiveCfg = Release|Win32 - {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.Build.0 = Release|Win32 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.ActiveCfg = Debug|ARM - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.Build.0 = Debug|ARM - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.ActiveCfg = Debug|x64 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.Build.0 = Debug|x64 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.ActiveCfg = Debug|Win32 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.Build.0 = Debug|Win32 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.ActiveCfg = Release|ARM - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.Build.0 = Release|ARM - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.ActiveCfg = Release|x64 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.Build.0 = Release|x64 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.ActiveCfg = Release|Win32 - {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.Build.0 = Release|Win32 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.ActiveCfg = Debug|ARM - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.Build.0 = Debug|ARM - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.ActiveCfg = Debug|x64 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.Build.0 = Debug|x64 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.ActiveCfg = Debug|Win32 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.Build.0 = Debug|Win32 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.ActiveCfg = Release|ARM - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.Build.0 = Release|ARM - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.ActiveCfg = Release|x64 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.Build.0 = Release|x64 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x86.ActiveCfg = Release|Win32 - {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {BA654F56-6CA9-47DD-84D2-3826252A71DF} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35327.3 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponent", "TestComponent\TestComponent.vcxproj", "{2954F343-85A7-46F5-A3F3-F106FDD13900}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console\Console.vcxproj", "{8AB80BFD-185A-452D-AAD2-97B38AED3E4B}" + ProjectSection(ProjectDependencies) = postProject + {2954F343-85A7-46F5-A3F3-F106FDD13900} = {2954F343-85A7-46F5-A3F3-F106FDD13900} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BenchmarkComponent", "BenchmarkComponent\BenchmarkComponent.vcxproj", "{78D85F23-7CB1-44A1-9238-6DF2C76754E4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_base", "test_component_base\test_component_base.vcxproj", "{13333A6F-6A4A-48CD-865C-0F65135EB018}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_derived", "test_component_derived\test_component_derived.vcxproj", "{0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}" + ProjectSection(ProjectDependencies) = postProject + {13333A6F-6A4A-48CD-865C-0F65135EB018} = {13333A6F-6A4A-48CD-865C-0F65135EB018} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component_fast", "test_component_fast\test_component_fast.vcxproj", "{0E0ACA62-A92F-44CF-BD41-AEB541946DF8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.ActiveCfg = Debug|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.Build.0 = Debug|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.ActiveCfg = Debug|x64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.Build.0 = Debug|x64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.ActiveCfg = Debug|Win32 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.Build.0 = Debug|Win32 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.ActiveCfg = Release|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.Build.0 = Release|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.ActiveCfg = Release|x64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.Build.0 = Release|x64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.ActiveCfg = Release|Win32 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.Build.0 = Release|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|ARM.ActiveCfg = Debug|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.ActiveCfg = Debug|x64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.Build.0 = Debug|x64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.ActiveCfg = Debug|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.Build.0 = Debug|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|ARM.ActiveCfg = Release|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.ActiveCfg = Release|x64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.Build.0 = Release|x64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.ActiveCfg = Release|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.Build.0 = Release|Win32 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.ActiveCfg = Debug|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.Build.0 = Debug|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.ActiveCfg = Debug|x64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.Build.0 = Debug|x64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.ActiveCfg = Debug|Win32 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.Build.0 = Debug|Win32 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.ActiveCfg = Release|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.Build.0 = Release|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.ActiveCfg = Release|x64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.Build.0 = Release|x64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.ActiveCfg = Release|Win32 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.Build.0 = Release|Win32 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.ActiveCfg = Debug|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.Build.0 = Debug|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.ActiveCfg = Debug|x64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.Build.0 = Debug|x64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.ActiveCfg = Debug|Win32 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.Build.0 = Debug|Win32 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.ActiveCfg = Release|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.Build.0 = Release|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.ActiveCfg = Release|x64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.Build.0 = Release|x64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.ActiveCfg = Release|Win32 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.Build.0 = Release|Win32 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.ActiveCfg = Debug|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.Build.0 = Debug|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.ActiveCfg = Debug|x64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.Build.0 = Debug|x64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.ActiveCfg = Debug|Win32 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.Build.0 = Debug|Win32 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.ActiveCfg = Release|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.Build.0 = Release|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.ActiveCfg = Release|x64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.Build.0 = Release|x64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.ActiveCfg = Release|Win32 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.Build.0 = Release|Win32 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.ActiveCfg = Debug|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.Build.0 = Debug|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.ActiveCfg = Debug|x64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.Build.0 = Debug|x64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.ActiveCfg = Debug|Win32 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.Build.0 = Debug|Win32 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.ActiveCfg = Release|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.Build.0 = Release|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.ActiveCfg = Release|x64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.Build.0 = Release|x64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x86.ActiveCfg = Release|Win32 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BA654F56-6CA9-47DD-84D2-3826252A71DF} + EndGlobalSection +EndGlobal From 571d89c2cadd788e4f6af3217638bc17d6699acc Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:25:51 -0500 Subject: [PATCH 05/14] add ARM64 targets --- BenchmarkComponent/BenchmarkComponent.vcxproj | 8 ++++++ Console/Console.vcxproj | 8 ++++++ Test.sln | 28 ++++++++++++++++++- TestComponent/TestComponent.vcxproj | 10 +++++++ .../test_component_base.vcxproj | 10 +++++++ .../test_component_derived.vcxproj | 6 ++++ .../test_component_fast.vcxproj | 10 +++++++ 7 files changed, 79 insertions(+), 1 deletion(-) diff --git a/BenchmarkComponent/BenchmarkComponent.vcxproj b/BenchmarkComponent/BenchmarkComponent.vcxproj index 94ff1a3..09ba16f 100644 --- a/BenchmarkComponent/BenchmarkComponent.vcxproj +++ b/BenchmarkComponent/BenchmarkComponent.vcxproj @@ -24,6 +24,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -36,6 +40,10 @@ Release ARM + + Release + ARM64 + Release Win32 diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj index 107d946..b491759 100644 --- a/Console/Console.vcxproj +++ b/Console/Console.vcxproj @@ -14,10 +14,18 @@ + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 diff --git a/Test.sln b/Test.sln index 9bd7a87..67a913d 100644 --- a/Test.sln +++ b/Test.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.11.35327.3 @@ -24,79 +24,105 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.ActiveCfg = Debug|ARM {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM.Build.0 = Debug|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|ARM64.Build.0 = Debug|ARM64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.ActiveCfg = Debug|x64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x64.Build.0 = Debug|x64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.ActiveCfg = Debug|Win32 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Debug|x86.Build.0 = Debug|Win32 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.ActiveCfg = Release|ARM {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM.Build.0 = Release|ARM + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM64.ActiveCfg = Release|ARM64 + {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|ARM64.Build.0 = Release|ARM64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.ActiveCfg = Release|x64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x64.Build.0 = Release|x64 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.ActiveCfg = Release|Win32 {2954F343-85A7-46F5-A3F3-F106FDD13900}.Release|x86.Build.0 = Release|Win32 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|ARM.ActiveCfg = Debug|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|ARM64.Build.0 = Debug|ARM64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.ActiveCfg = Debug|x64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x64.Build.0 = Debug|x64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.ActiveCfg = Debug|Win32 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Debug|x86.Build.0 = Debug|Win32 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|ARM.ActiveCfg = Release|Win32 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|ARM64.ActiveCfg = Release|ARM64 + {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|ARM64.Build.0 = Release|ARM64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.ActiveCfg = Release|x64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x64.Build.0 = Release|x64 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.ActiveCfg = Release|Win32 {8AB80BFD-185A-452D-AAD2-97B38AED3E4B}.Release|x86.Build.0 = Release|Win32 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.ActiveCfg = Debug|ARM {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM.Build.0 = Debug|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|ARM64.Build.0 = Debug|ARM64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.ActiveCfg = Debug|x64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x64.Build.0 = Debug|x64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.ActiveCfg = Debug|Win32 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Debug|x86.Build.0 = Debug|Win32 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.ActiveCfg = Release|ARM {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM.Build.0 = Release|ARM + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|ARM64.Build.0 = Release|ARM64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.ActiveCfg = Release|x64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x64.Build.0 = Release|x64 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.ActiveCfg = Release|Win32 {78D85F23-7CB1-44A1-9238-6DF2C76754E4}.Release|x86.Build.0 = Release|Win32 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.ActiveCfg = Debug|ARM {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM.Build.0 = Debug|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|ARM64.Build.0 = Debug|ARM64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.ActiveCfg = Debug|x64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x64.Build.0 = Debug|x64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.ActiveCfg = Debug|Win32 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Debug|x86.Build.0 = Debug|Win32 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.ActiveCfg = Release|ARM {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM.Build.0 = Release|ARM + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM64.ActiveCfg = Release|ARM64 + {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|ARM64.Build.0 = Release|ARM64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.ActiveCfg = Release|x64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x64.Build.0 = Release|x64 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.ActiveCfg = Release|Win32 {13333A6F-6A4A-48CD-865C-0F65135EB018}.Release|x86.Build.0 = Release|Win32 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.ActiveCfg = Debug|ARM {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM.Build.0 = Debug|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|ARM64.Build.0 = Debug|ARM64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.ActiveCfg = Debug|x64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x64.Build.0 = Debug|x64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.ActiveCfg = Debug|Win32 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Debug|x86.Build.0 = Debug|Win32 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.ActiveCfg = Release|ARM {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM.Build.0 = Release|ARM + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM64.ActiveCfg = Release|ARM64 + {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|ARM64.Build.0 = Release|ARM64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.ActiveCfg = Release|x64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x64.Build.0 = Release|x64 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.ActiveCfg = Release|Win32 {0080F6D1-AEC3-4F89-ADE1-3D22A7EBF99E}.Release|x86.Build.0 = Release|Win32 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.ActiveCfg = Debug|ARM {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM.Build.0 = Debug|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|ARM64.Build.0 = Debug|ARM64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.ActiveCfg = Debug|x64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x64.Build.0 = Debug|x64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.ActiveCfg = Debug|Win32 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Debug|x86.Build.0 = Debug|Win32 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.ActiveCfg = Release|ARM {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM.Build.0 = Release|ARM + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM64.ActiveCfg = Release|ARM64 + {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|ARM64.Build.0 = Release|ARM64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.ActiveCfg = Release|x64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x64.Build.0 = Release|x64 {0E0ACA62-A92F-44CF-BD41-AEB541946DF8}.Release|x86.ActiveCfg = Release|Win32 diff --git a/TestComponent/TestComponent.vcxproj b/TestComponent/TestComponent.vcxproj index 6f2b309..c900b39 100644 --- a/TestComponent/TestComponent.vcxproj +++ b/TestComponent/TestComponent.vcxproj @@ -19,6 +19,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -31,6 +35,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -102,6 +110,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) @@ -116,6 +125,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) diff --git a/test_component_base/test_component_base.vcxproj b/test_component_base/test_component_base.vcxproj index 870f38a..22a2aa4 100644 --- a/test_component_base/test_component_base.vcxproj +++ b/test_component_base/test_component_base.vcxproj @@ -19,6 +19,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -31,6 +35,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -102,6 +110,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) @@ -116,6 +125,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj index a578c36..fe8aaeb 100644 --- a/test_component_derived/test_component_derived.vcxproj +++ b/test_component_derived/test_component_derived.vcxproj @@ -19,6 +19,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -109,6 +113,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) @@ -123,6 +128,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) diff --git a/test_component_fast/test_component_fast.vcxproj b/test_component_fast/test_component_fast.vcxproj index 950feda..d5c24ad 100644 --- a/test_component_fast/test_component_fast.vcxproj +++ b/test_component_fast/test_component_fast.vcxproj @@ -20,6 +20,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -32,6 +36,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -106,6 +114,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) @@ -121,6 +130,7 @@ copy $(OutDir)$(ProjectName).winmd $(SolutionDir) + copy $(OutDir)$(ProjectName).winmd $(SolutionDir) copy $(OutDir)$(ProjectName).winmd $(SolutionDir) From 314028e60e4575f140c732d93eaaad7aea82e9c5 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:30:33 -0500 Subject: [PATCH 06/14] update target windows version --- BenchmarkComponent/BenchmarkComponent.vcxproj | 2 +- Console/Console.vcxproj | 2 +- TestComponent/TestComponent.vcxproj | 2 +- test_component_base/test_component_base.vcxproj | 2 +- test_component_derived/test_component_derived.vcxproj | 2 +- test_component_fast/test_component_fast.vcxproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BenchmarkComponent/BenchmarkComponent.vcxproj b/BenchmarkComponent/BenchmarkComponent.vcxproj index 09ba16f..3109e4c 100644 --- a/BenchmarkComponent/BenchmarkComponent.vcxproj +++ b/BenchmarkComponent/BenchmarkComponent.vcxproj @@ -13,7 +13,7 @@ true Windows Store 10.0 - 10.0 + 10.0.22621.0 10.0.19041.0 <_NoWinAPIFamilyApp>true <_VC_Target_Library_Platform>Desktop diff --git a/Console/Console.vcxproj b/Console/Console.vcxproj index b491759..3f88585 100644 --- a/Console/Console.vcxproj +++ b/Console/Console.vcxproj @@ -9,7 +9,7 @@ {8ab80bfd-185a-452d-aad2-97b38aed3e4b} Win32Proj Console - 10.0.18362.0 + 10.0.22621.0 10.0.17134.0 diff --git a/TestComponent/TestComponent.vcxproj b/TestComponent/TestComponent.vcxproj index c900b39..2115862 100644 --- a/TestComponent/TestComponent.vcxproj +++ b/TestComponent/TestComponent.vcxproj @@ -10,7 +10,7 @@ TestComponent en-US 14.0 - 10.0.18362.0 + 10.0.22621.0 10.0.17134.0 diff --git a/test_component_base/test_component_base.vcxproj b/test_component_base/test_component_base.vcxproj index 22a2aa4..27f7792 100644 --- a/test_component_base/test_component_base.vcxproj +++ b/test_component_base/test_component_base.vcxproj @@ -10,7 +10,7 @@ test_component_base en-US 14.0 - 10.0.18362.0 + 10.0.22621.0 10.0.17134.0 diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj index fe8aaeb..33bd9be 100644 --- a/test_component_derived/test_component_derived.vcxproj +++ b/test_component_derived/test_component_derived.vcxproj @@ -10,7 +10,7 @@ test_component_derived en-US 14.0 - 10.0.18362.0 + 10.0.22621.0 10.0.17134.0 diff --git a/test_component_fast/test_component_fast.vcxproj b/test_component_fast/test_component_fast.vcxproj index d5c24ad..7289185 100644 --- a/test_component_fast/test_component_fast.vcxproj +++ b/test_component_fast/test_component_fast.vcxproj @@ -11,7 +11,7 @@ test_component_fast en-US 14.0 - 10.0 + 10.0.22621.0 10.0.19041.0 From 41b8440e44cd5a09c4f9ae9050ede6a3ff27ac93 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 18:46:47 -0500 Subject: [PATCH 07/14] fix null pointer dereference --- TestComponent/TestRunner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestComponent/TestRunner.cpp b/TestComponent/TestRunner.cpp index 6f0e523..4759c1a 100644 --- a/TestComponent/TestRunner.cpp +++ b/TestComponent/TestRunner.cpp @@ -341,7 +341,7 @@ namespace winrt::TestComponent::implementation IMapView d; IMapView e; c.Split(d, e); - TEST_REQUIRE_N(L"Collection", 4, d.Size() && e.Size()); + TEST_REQUIRE_N(L"Collection", 4, (!d && !e) || (d.Size() && e.Size())); } void Collection5Call(Collection5Handler const& handler) { From fa43008ba29ff6cf99ba6663813350b8043645ce Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 19:01:35 -0500 Subject: [PATCH 08/14] uniform OutDir --- TestComponent/TestComponent.vcxproj | 20 +++++++++++++++---- .../test_component_base.vcxproj | 20 +++++++++++++++---- .../test_component_derived.vcxproj | 20 +++++++++++++++---- .../test_component_fast.vcxproj | 20 +++++++++++++++---- 4 files changed, 64 insertions(+), 16 deletions(-) diff --git a/TestComponent/TestComponent.vcxproj b/TestComponent/TestComponent.vcxproj index 2115862..4144a25 100644 --- a/TestComponent/TestComponent.vcxproj +++ b/TestComponent/TestComponent.vcxproj @@ -74,16 +74,28 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/test_component_base/test_component_base.vcxproj b/test_component_base/test_component_base.vcxproj index 27f7792..31edb8d 100644 --- a/test_component_base/test_component_base.vcxproj +++ b/test_component_base/test_component_base.vcxproj @@ -74,16 +74,28 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/test_component_derived/test_component_derived.vcxproj b/test_component_derived/test_component_derived.vcxproj index 33bd9be..b59e8e5 100644 --- a/test_component_derived/test_component_derived.vcxproj +++ b/test_component_derived/test_component_derived.vcxproj @@ -77,16 +77,28 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/test_component_fast/test_component_fast.vcxproj b/test_component_fast/test_component_fast.vcxproj index 7289185..fe7ffcb 100644 --- a/test_component_fast/test_component_fast.vcxproj +++ b/test_component_fast/test_component_fast.vcxproj @@ -77,16 +77,28 @@ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x64\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - $(SolutionDir)x86\$(Configuration)\$(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ From 6852a4917ff9cd8fefb62963f04c0a64b51744a8 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 21:58:39 -0500 Subject: [PATCH 09/14] add ARM64 to nuget package --- .github/workflows/build.yml | 3 +++ .github/workflows/publish.yml | 3 +++ TestComponent/TestComponent.nuspec | 1 + 3 files changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 691c8f8..4afe763 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,5 +29,8 @@ jobs: - name: build x64 run: msbuild /m /p:Configuration=Release,Platform=x64 test.sln + - name: build ARM64 + run: msbuild /m /p:Configuration=Release,Platform=ARM64 test.sln + - name: nuget pack run: nuget.exe pack TestComponent/TestComponent.nuspec -OutputFileNamesWithoutVersion diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a3f35c5..41e72c7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,6 +29,9 @@ jobs: - name: build x64 run: msbuild /m /p:Configuration=Release,Platform=x64 test.sln + - name: build ARM64 + run: msbuild /m /p:Configuration=Release,Platform=ARM64 test.sln + - name: nuget pack run: nuget.exe pack TestComponent/TestComponent.nuspec -OutputFileNamesWithoutVersion diff --git a/TestComponent/TestComponent.nuspec b/TestComponent/TestComponent.nuspec index a5f9a62..e0dffb7 100644 --- a/TestComponent/TestComponent.nuspec +++ b/TestComponent/TestComponent.nuspec @@ -21,5 +21,6 @@ + From c49c044fee2f026fd647fd8829432b54ca702be0 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 22:06:17 -0500 Subject: [PATCH 10/14] ignore *.nupkg files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6d423f8..8f6fab6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ packages Generated Files *.user *.winmd +*.nupkg From 989322efa5803d1a3be9d210441a93247191b8b9 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 22:22:50 -0500 Subject: [PATCH 11/14] add README, license, etc. to nuspec --- TestComponent/README.md | 3 +++ TestComponent/TestComponent.nuspec | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 TestComponent/README.md diff --git a/TestComponent/README.md b/TestComponent/README.md new file mode 100644 index 0000000..1d4fb13 --- /dev/null +++ b/TestComponent/README.md @@ -0,0 +1,3 @@ +# PyWinRT.TestComponent + +WinRT components for testing PyWinRT. diff --git a/TestComponent/TestComponent.nuspec b/TestComponent/TestComponent.nuspec index e0dffb7..9570d21 100644 --- a/TestComponent/TestComponent.nuspec +++ b/TestComponent/TestComponent.nuspec @@ -2,22 +2,23 @@ PyWinRT.TestWinRT - 1.0.21 + 1.0.0 TestWinRT Microsoft - Microsoft + MIT false TestWinRT + docs/README.md - native C++ WinRT nativepackage © Microsoft Corporation. All rights reserved. - https://github.com/microsoft/testwinrt - + https://github.com/pywinrt/testwinrt + + From 34d01765dfad578d58a829a5d0e767edd6b084f6 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 22:24:04 -0500 Subject: [PATCH 12/14] remove stale bot --- .github/workflows/stale.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 20bf8f2..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - stale: - - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - - steps: - - uses: actions/stale@v6 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - days-before-stale: 10 - days-before-close: 5 - stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. Remove stale label or comment or this will be closed in 5 days.' - stale-pr-message: 'This pull request is stale because it has been open 10 days with no activity. Remove stale label or comment or this will be closed in 5 days.' - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' From 22afc1b81414f18535a726e800e182125f62b0d7 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 22:31:41 -0500 Subject: [PATCH 13/14] update github actions --- .github/workflows/build.yml | 8 +++----- .github/workflows/publish.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4afe763..4f57972 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,15 +10,13 @@ jobs: runs-on: windows-latest steps: - name: checkout project - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: setup msbuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: setup nuget - uses: NuGet/setup-nuget@v1.0.2 - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + uses: NuGet/setup-nuget@v2 - name: setup cppwinrt run: nuget restore test.sln diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 41e72c7..13f1163 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,15 +10,15 @@ jobs: runs-on: windows-latest steps: - name: checkout project - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: setup msbuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: setup nuget - uses: NuGet/setup-nuget@v1.0.2 - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + uses: NuGet/setup-nuget@v2 + with: + nuget-api-key: ${{ secrets.NUGET_API_KEY }} - name: setup cppwinrt run: nuget restore test.sln @@ -36,4 +36,4 @@ jobs: run: nuget.exe pack TestComponent/TestComponent.nuspec -OutputFileNamesWithoutVersion - name: nuget push - run: nuget push PyWinRT.TestWinRT.nupkg ${{ secrets.NUGET_KEY }} -Source nuget.org + run: nuget push PyWinRT.TestWinRT.nupkg -Source nuget.org From a46e8ceed47e9cec3af40247ba90576acdb148e5 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 1 Nov 2024 22:48:35 -0500 Subject: [PATCH 14/14] fix x86 source path in nuspec --- TestComponent/TestComponent.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestComponent/TestComponent.nuspec b/TestComponent/TestComponent.nuspec index 9570d21..6760d76 100644 --- a/TestComponent/TestComponent.nuspec +++ b/TestComponent/TestComponent.nuspec @@ -20,7 +20,7 @@ - +