Revert "Fix T79356: Improved icons for MSIX builds"

This reverts commit 78011d712d.

release/windows/msix/README.md

@@ -9,9 +9,8 @@ needs to be signed.
 Requirements
 ============
 
-* MakeAppX.exe - this tool is distributed with the Windows 10 SDK and is used to build the .appx package.
-* MakePri.exe - this tool is distributed with the Windows 10 SDK and is used to generate a resources file.
-* SignTool.exe - this tool is distributed with the Windows 10 SDK and is used to sign the .appx package.
+* MakeAppX - this tool is distributed with Windows 10 SDK
+* SignTool - this tool is also distributed with Windows 10 SDK
 * Python 3 (3.7 or later tested) - to run the create_msix_package.py script
 * requests module - can be installed with `pip install requests`
 * PFX file (optional, but strongly recommended) - for signing the resulting MSIX

release/windows/msix/create_msix_package.py

@@ -95,9 +95,6 @@ content_blender_folder = pathlib.Path(content_folder, "Blender").absolute()
 content_assets_folder = pathlib.Path(content_folder, "Assets")
 assets_original_folder = pathlib.Path(".", "Assets")
 
-pri_config_file = pathlib.Path(".", "priconfig.xml")
-pri_resources_file = pathlib.Path(content_folder, "resources.pri")
-
 local_blender_zip = pathlib.Path(".", "blender.zip")
 
 if args.pfx:
@@ -110,13 +107,6 @@ else:
     pfx_path = None
     print("Creating MSIX package without signing.")
 
-pri_new_command = ["makepri",
-                   "new",
-                   "/pr", f"{content_folder.absolute()}",
-                   "/cf", f"{pri_config_file.absolute()}",
-                   "/of", f"{pri_resources_file.absolute()}"
-                   ]
-
 msix_command = ["makeappx",
                 "pack",
                 "/h", "SHA256",
@@ -175,9 +165,6 @@ with zipfile.ZipFile(local_blender_zip, "r") as blender_zip:
 print("... extraction complete.")
 
 
-print(f"Generating Package Resource Index (PRI) file using command: {' '.join(pri_new_command)}")
-execute_command(pri_new_command, "MakePri", 4)
-
 print(f"Creating MSIX package using command: {' '.join(msix_command)}")
 
 # Remove MSIX file if it already exists. Otherwise the MakeAppX tool

release/windows/msix/priconfig.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<resources targetOsVersion="10.0.0" majorVersion="1">
-	<packaging>
-        <autoResourcePackage qualifier="Language"/>	
-		<autoResourcePackage qualifier="Scale"/>
-	</packaging>
-	<index root="\" startIndexAt="\">
-		<default>
-			<qualifier name="Language" value="en-US"/>
-			<qualifier name="Contrast" value="standard"/>
-			<qualifier name="Scale" value="100"/>
-			<qualifier name="HomeRegion" value="001"/>
-			<qualifier name="TargetSize" value="256"/>
-			<qualifier name="LayoutDirection" value="LTR"/>
-			<qualifier name="Theme" value="dark"/>
-			<qualifier name="AlternateForm" value=""/>
-			<qualifier name="DXFeatureLevel" value="DX9"/>
-			<qualifier name="Configuration" value=""/>
-			<qualifier name="DeviceFamily" value="Universal"/>
-			<qualifier name="Custom" value=""/>
-		</default>
-		<indexer-config type="folder" foldernameAsQualifier="true" filenameAsQualifier="true" qualifierDelimiter=".">
-			<exclude type="path" value="Blender" doNotTraverse="true" doNotIndex="true" />
-		</indexer-config>
-	</index>
-</resources>