Github actions darenm/[email protected] removed as deprecated.

UnitTest project renamed to "HexCtrl Test".
jovibor · Oct 30, 2024 · 6ca685d · 6ca685d
1 parent 459839d
commit 6ca685d
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -8,8 +8,9 @@ on:
 
 env:
   PATH_PROJ_HEXCTRLDLL: '"./VS Projects/HexCtrl DLL/HexCtrl DLL.vcxproj"'
-  PATH_PROJ_HEXCTRLTEST: '"./VS Projects/UnitTest/UnitTest.vcxproj"'
-  PATH_TESTDLL: '"C:\HexCtrlTEMP\UnitTest.dll"'
+  PATH_PROJ_HEXCTRLTEST: '"./VS Projects/HexCtrl Test/HexCtrl Test.vcxproj"'
+  PATH_VSTESTCONSOLE_EXE: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"'
+  PATH_TESTDLL: '"C:\HexCtrlTEMP\HexCtrl Test.dll"'
   PATH_TEMPDIR: '"C:\HexCtrlTEMP\"'
   BUILD_CONFIG: Debug
   BUILD_PLATFORM_x64: x64
@@ -38,9 +39,7 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: msbuild /m ${{env.PATH_PROJ_HEXCTRLTEST}} /p:Configuration=${{env.BUILD_CONFIG}} /p:Platform=${{env.BUILD_PLATFORM_x64}} /p:OutDir=${{env.PATH_TEMPDIR}} /p:LinkerAdditionalDir=${{env.PATH_TEMPDIR}}
 
-    - name: Setup VSTest Path
-      uses: darenm/[email protected]
-
-    - name: Run UnitTest_x64
+    - name: Run HexCtrlTest_x64
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: vstest.console.exe ${{env.PATH_TESTDLL}}
+      run: |
+        & ${{env.PATH_VSTESTCONSOLE_EXE}} ${{env.PATH_TESTDLL}}
diff --git a/VS Projects/UnitTest/CHexCtrlInit.h → VS Projects/HexCtrl Test/CHexCtrlInit.h b/VS Projects/UnitTest/CHexCtrlInit.h → VS Projects/HexCtrl Test/CHexCtrlInit.h
diff --git a/VS Projects/UnitTest/CModifyADD.cpp → VS Projects/HexCtrl Test/CModifyADD.cpp b/VS Projects/UnitTest/CModifyADD.cpp → VS Projects/HexCtrl Test/CModifyADD.cpp
diff --git a/VS Projects/UnitTest/CModifyAND.cpp → VS Projects/HexCtrl Test/CModifyAND.cpp b/VS Projects/UnitTest/CModifyAND.cpp → VS Projects/HexCtrl Test/CModifyAND.cpp
diff --git a/VS Projects/UnitTest/CModifyBITREV.cpp → VS Projects/HexCtrl Test/CModifyBITREV.cpp b/VS Projects/UnitTest/CModifyBITREV.cpp → VS Projects/HexCtrl Test/CModifyBITREV.cpp
diff --git a/VS Projects/UnitTest/CModifyDIV.cpp → VS Projects/HexCtrl Test/CModifyDIV.cpp b/VS Projects/UnitTest/CModifyDIV.cpp → VS Projects/HexCtrl Test/CModifyDIV.cpp
diff --git a/VS Projects/UnitTest/CModifyMAX.cpp → VS Projects/HexCtrl Test/CModifyMAX.cpp b/VS Projects/UnitTest/CModifyMAX.cpp → VS Projects/HexCtrl Test/CModifyMAX.cpp
diff --git a/VS Projects/UnitTest/CModifyMIN.cpp → VS Projects/HexCtrl Test/CModifyMIN.cpp b/VS Projects/UnitTest/CModifyMIN.cpp → VS Projects/HexCtrl Test/CModifyMIN.cpp
diff --git a/VS Projects/UnitTest/CModifyMUL.cpp → VS Projects/HexCtrl Test/CModifyMUL.cpp b/VS Projects/UnitTest/CModifyMUL.cpp → VS Projects/HexCtrl Test/CModifyMUL.cpp
diff --git a/VS Projects/UnitTest/CModifyNOT.cpp → VS Projects/HexCtrl Test/CModifyNOT.cpp b/VS Projects/UnitTest/CModifyNOT.cpp → VS Projects/HexCtrl Test/CModifyNOT.cpp
diff --git a/VS Projects/UnitTest/CModifyOR.cpp → VS Projects/HexCtrl Test/CModifyOR.cpp b/VS Projects/UnitTest/CModifyOR.cpp → VS Projects/HexCtrl Test/CModifyOR.cpp
diff --git a/VS Projects/UnitTest/CModifyROTL.cpp → VS Projects/HexCtrl Test/CModifyROTL.cpp b/VS Projects/UnitTest/CModifyROTL.cpp → VS Projects/HexCtrl Test/CModifyROTL.cpp
diff --git a/VS Projects/UnitTest/CModifyROTR.cpp → VS Projects/HexCtrl Test/CModifyROTR.cpp b/VS Projects/UnitTest/CModifyROTR.cpp → VS Projects/HexCtrl Test/CModifyROTR.cpp
diff --git a/VS Projects/UnitTest/CModifySHL.cpp → VS Projects/HexCtrl Test/CModifySHL.cpp b/VS Projects/UnitTest/CModifySHL.cpp → VS Projects/HexCtrl Test/CModifySHL.cpp
diff --git a/VS Projects/UnitTest/CModifySHR.cpp → VS Projects/HexCtrl Test/CModifySHR.cpp b/VS Projects/UnitTest/CModifySHR.cpp → VS Projects/HexCtrl Test/CModifySHR.cpp
diff --git a/VS Projects/UnitTest/CModifySUB.cpp → VS Projects/HexCtrl Test/CModifySUB.cpp b/VS Projects/UnitTest/CModifySUB.cpp → VS Projects/HexCtrl Test/CModifySUB.cpp
diff --git a/VS Projects/UnitTest/CModifySWAP.cpp → VS Projects/HexCtrl Test/CModifySWAP.cpp b/VS Projects/UnitTest/CModifySWAP.cpp → VS Projects/HexCtrl Test/CModifySWAP.cpp
diff --git a/VS Projects/UnitTest/CModifyXOR.cpp → VS Projects/HexCtrl Test/CModifyXOR.cpp b/VS Projects/UnitTest/CModifyXOR.cpp → VS Projects/HexCtrl Test/CModifyXOR.cpp
diff --git a/VS Projects/UnitTest/UnitTest.vcxproj → ...rojects/HexCtrl Test/HexCtrl Test.vcxproj b/VS Projects/UnitTest/UnitTest.vcxproj → ...rojects/HexCtrl Test/HexCtrl Test.vcxproj
@@ -33,7 +33,7 @@
     <RootNamespace>UnitTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-    <ProjectName>UnitTest</ProjectName>
+    <ProjectName>HexCtrl Test</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/...rojects/UnitTest/UnitTest.vcxproj.filters → ...HexCtrl Test/HexCtrl Test.vcxproj.filters b/...rojects/UnitTest/UnitTest.vcxproj.filters → ...HexCtrl Test/HexCtrl Test.vcxproj.filters
diff --git a/VS Projects/HexCtrl.sln b/VS Projects/HexCtrl.sln
@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HexCtrl DLL", "HexCtrl DLL\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample Dialog DLL", "Sample Dialog DLL\Sample Dialog DLL.vcxproj", "{C76E6C72-C970-47D1-91B1-F2B9EACBBE93}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{337EEC2C-B9B1-49D6-A526-59F01742AF51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HexCtrl Test", "HexCtrl Test\HexCtrl Test.vcxproj", "{337EEC2C-B9B1-49D6-A526-59F01742AF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{557B0ABE-E81A-4BD1-AD98-DC68F44D9A0D} = {557B0ABE-E81A-4BD1-AD98-DC68F44D9A0D}
 	EndProjectSection