Merge pull request #17973 from GABO1423/master

(UWP) Fixed Skipped Debugger Files
hrydgard · Aug 25, 2023 · a380d66 · a380d66
2 parents 12a36d8 + 79ab8be
commit a380d66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
@@ -74,7 +74,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <AppxBundle>Never</AppxBundle>
     <PackageCertificateThumbprint>C8DEB388B9BC89D1DC61324E4E9D9FE6A796B7AA</PackageCertificateThumbprint>
@@ -477,23 +477,23 @@
     <None Include="Content\debugger\manifest.json">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="Content\debugger\static\css\*.css">
+    <None Include="..\Assets\debugger\static\css\*.css">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\css\%(Filename)%(Extension)</Link>
     </None>
-    <None Include="Content\debugger\static\css\*.map">
+    <None Include="..\Assets\debugger\static\css\*.map">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\css\%(Filename)%(Extension)</Link>
     </None>
-    <None Include="Content\debugger\static\js\*.js">
+    <None Include="..\Assets\debugger\static\js\*.js">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\js\%(Filename)%(Extension)</Link>
     </None>
-    <None Include="Content\debugger\static\js\*.map">
+    <None Include="..\Assets\debugger\static\js\*.map">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\js\%(Filename)%(Extension)</Link>
     </None>
-    <None Include="Content\debugger\static\media\*.svg">
+    <None Include="..\Assets\debugger\static\media\*.svg">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\media\%(Filename)%(Extension)</Link>
     </None>
@@ -874,7 +874,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="Content\debugger\static\js\*.txt">
+    <Text Include="..\Assets\debugger\static\js\*.txt">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\static\js\%(Filename)%(Extension)</Link>
     </Text>

diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters
@@ -540,19 +540,19 @@
     <None Include="Content\debugger\manifest.json">
       <Filter>Content\debugger</Filter>
     </None>
-    <None Include="Content\debugger\static\css\*.css">
+    <None Include="..\Assets\debugger\static\css\*.css">
       <Filter>Content\debugger\static\css</Filter>
     </None>
-    <None Include="Content\debugger\static\css\*.map">
+    <None Include="..\Assets\debugger\static\css\*.map">
       <Filter>Content\debugger\static\css</Filter>
     </None>
-    <None Include="Content\debugger\static\js\*.js">
+    <None Include="..\Assets\debugger\static\js\*.js">
       <Filter>Content\debugger\static\js</Filter>
     </None>
-    <None Include="Content\debugger\static\js\*.map">
+    <None Include="..\Assets\debugger\static\js\*.map">
       <Filter>Content\debugger\static\js</Filter>
     </None>
-    <None Include="Content\debugger\static\media\*.svg">
+    <None Include="..\Assets\debugger\static\media\*.svg">
       <Filter>Content\debugger\static\media</Filter>
     </None>
     <None Include="Content\vfpu\vfpu_sqrt_lut.dat">
@@ -605,11 +605,9 @@
     <Text Include="Content\gamecontrollerdb.txt">
       <Filter>Content</Filter>
     </Text>
-    <Text Include="Content\debugger\static\js\*.txt">
+    <Text Include="..\Assets\debugger\static\js\*.txt">
       <Filter>Content\debugger\static\js</Filter>
     </Text>
-    <Text Include="Content\debugger\static\js\*.txt" />
-    <Text Include="Content\debugger\static\js\*.txt" />
   </ItemGroup>
   <ItemGroup>
     <Font Include="Content\Roboto-Condensed.ttf">