Przeglądaj źródła

refactor: use windows manifest already present in tauri-build crate (#5936)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
Amr Bashir 2 lat temu
rodzic
commit
077605f58b
2 zmienionych plików z 6 dodań i 18 usunięć
  1. 0 14
      core/tauri/Windows Manifest.xml
  2. 6 4
      core/tauri/build.rs

+ 0 - 14
core/tauri/Windows Manifest.xml

@@ -1,14 +0,0 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <dependency>
-      <dependentAssembly>
-          <assemblyIdentity
-              type="win32"
-              name="Microsoft.Windows.Common-Controls"
-              version="6.0.0.0"
-              processorArchitecture="*"
-              publicKeyToken="6595b64144ccf1df"
-              language="*"
-          />
-      </dependentAssembly>
-  </dependency>
-</assembly>

+ 6 - 4
core/tauri/build.rs

@@ -184,12 +184,14 @@ fn alias_module(module: &str, apis: &[&str], api_all: bool) {
 }
 
 fn add_manifest() {
-  static WINDOWS_MANIFEST_FILE: &str = "Windows Manifest.xml";
+  static WINDOWS_MANIFEST_FILE: &str = "window-app-manifest.xml";
 
-  let mut manifest = std::env::current_dir().unwrap();
-  manifest.push(WINDOWS_MANIFEST_FILE);
+  let manifest = std::env::current_dir()
+    .unwrap()
+    .join("../tauri-build/src")
+    .join(WINDOWS_MANIFEST_FILE);
 
-  println!("cargo:rerun-if-changed={}", WINDOWS_MANIFEST_FILE);
+  println!("cargo:rerun-if-changed={}", manifest.display());
   // Embed the Windows application manifest file.
   println!("cargo:rustc-link-arg=/MANIFEST:EMBED");
   println!(