fix(windows): embed app manifest directly in code (#1984)

microsoft · Apr 24, 2024 · bc35798 · bc35798
1 parent f820391
commit bc35798
Show file tree

Hide file tree

Showing 33 changed files with 749 additions and 657 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -130,6 +130,7 @@ jobs:
       - name: SwiftLint
         if: ${{ matrix.platform == 'macos' }}
         run: |
+          brew install swiftlint
           echo "::add-matcher::.github/swiftlint.json"
           swiftlint
           echo "::remove-matcher owner=swiftlint::"
@@ -610,9 +611,9 @@ jobs:
       - name: Test
         if: ${{ steps.affected.outputs.windows != '' && matrix.platform == 'x64' }}
         run: |
-          ../../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} -Target Build ReactTestAppTests.vcxproj
-          ../../../scripts/VSTest.ps1 ${{ matrix.platform }}\${{ matrix.configuration }}\ReactTestAppTests.dll
-        working-directory: example/windows/ReactTestAppTests
+          ../../../scripts/MSBuild.ps1 -Configuration ${{ matrix.configuration }} -Platform ${{ matrix.platform }} -Target Build ReactAppTests.vcxproj
+          ../../../scripts/VSTest.ps1 ${{ matrix.platform }}\${{ matrix.configuration }}\ReactAppTests.dll
+        working-directory: example/windows/ReactAppTests
     timeout-minutes: 60
   windows-template:
     name: "Windows [template]"

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
diff --git a/...actTestAppTests/ReactTestAppTests.vcxproj → ...ndows/ReactAppTests/ReactAppTests.vcxproj b/...actTestAppTests/ReactTestAppTests.vcxproj → ...ndows/ReactAppTests/ReactAppTests.vcxproj
@@ -4,7 +4,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{D2B221C0-0781-4D20-8BF1-D88684662A5D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ReactTestAppTests</RootNamespace>
+    <RootNamespace>ReactAppTests</RootNamespace>
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
   </PropertyGroup>
   <PropertyGroup Label="NuGet">
@@ -67,19 +67,16 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(ReactAppProjectDir)\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);Manifest.obj;pch.obj</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -99,24 +96,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ManifestTests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="manifestTestFiles\simpleManifest.json">
-      <DeploymentContent>true</DeploymentContent>
-    </Text>
-    <Text Include="manifestTestFiles\withComplexInitialProperties.json">
-      <DeploymentContent>true</DeploymentContent>
-    </Text>
-    <Text Include="manifestTestFiles\withMultipleComponents.json">
-      <DeploymentContent>true</DeploymentContent>
-    </Text>
+    <ClCompile Include="Tests.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/...ppTests/ReactTestAppTests.vcxproj.filters → ...actAppTests/ReactAppTests.vcxproj.filters b/...ppTests/ReactTestAppTests.vcxproj.filters → ...actAppTests/ReactAppTests.vcxproj.filters
@@ -15,27 +15,8 @@
         </Filter>
     </ItemGroup>
     <ItemGroup>
-        <ClCompile Include="ManifestTests.cpp">
+        <ClCompile Include="Tests.cpp">
             <Filter>Source Files</Filter>
         </ClCompile>
-        <ClCompile Include="pch.cpp">
-            <Filter>Source Files</Filter>
-        </ClCompile>
-    </ItemGroup>
-    <ItemGroup>
-        <ClInclude Include="pch.h">
-            <Filter>Header Files</Filter>
-        </ClInclude>
-    </ItemGroup>
-    <ItemGroup>
-        <Text Include="manifestTestFiles\simpleManifest.json">
-            <Filter>Resource Files</Filter>
-        </Text>
-        <Text Include="manifestTestFiles\withComplexInitialProperties.json">
-            <Filter>Resource Files</Filter>
-        </Text>
-        <Text Include="manifestTestFiles\withMultipleComponents.json">
-            <Filter>Resource Files</Filter>
-        </Text>
     </ItemGroup>
 </Project>
diff --git a/example/windows/ReactAppTests/Tests.cpp b/example/windows/ReactAppTests/Tests.cpp
@@ -0,0 +1,18 @@
+#include <CppUnitTest.h>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+// disable clang-format because it doesn't handle macros very well
+// clang-format off
+namespace ReactApp::Tests
+{
+    TEST_CLASS(Tests)
+    {
+    public:
+        TEST_METHOD(Test)
+        {
+            Assert::IsTrue(true);
+        }
+    };
+}  // namespace ReactApp::Tests
+// clang-format on
diff --git a/example/windows/ReactTestAppTests/ManifestTests.cpp b/example/windows/ReactTestAppTests/ManifestTests.cpp
diff --git a/example/windows/ReactTestAppTests/manifestTestFiles/simpleManifest.json b/example/windows/ReactTestAppTests/manifestTestFiles/simpleManifest.json
diff --git a/example/windows/ReactTestAppTests/manifestTestFiles/withComplexInitialProperties.json b/example/windows/ReactTestAppTests/manifestTestFiles/withComplexInitialProperties.json
diff --git a/example/windows/ReactTestAppTests/manifestTestFiles/withMultipleComponents.json b/example/windows/ReactTestAppTests/manifestTestFiles/withMultipleComponents.json
diff --git a/example/windows/ReactTestAppTests/pch.cpp b/example/windows/ReactTestAppTests/pch.cpp
diff --git a/example/windows/ReactTestAppTests/pch.h b/example/windows/ReactTestAppTests/pch.h