Skip to content

Commit 7f7b4fa

Browse files
committed
build: update embed-resource
1 parent 46b8513 commit 7f7b4fa

File tree

10 files changed

+29
-18
lines changed

10 files changed

+29
-18
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/devolutions-pedm-shell-ext/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["bu
2222
fs_extra = "1.3"
2323

2424
[target.'cfg(windows)'.build-dependencies]
25-
embed-resource = "2.5"
25+
embed-resource = "3.0"

crates/devolutions-pedm-shell-ext/build.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ fn main() -> Result<(), Box<dyn Error>> {
9191
let version_rc_data = generate_version_rc();
9292
fs::write(&version_rc_file, version_rc_data).unwrap();
9393

94-
embed_resource::compile(&version_rc_file, embed_resource::NONE);
95-
embed_resource::compile("resources.rc", embed_resource::NONE);
94+
embed_resource::compile(&version_rc_file, embed_resource::NONE)
95+
.manifest_required()
96+
.unwrap();
97+
embed_resource::compile("resources.rc", embed_resource::NONE)
98+
.manifest_required()
99+
.unwrap();
96100

97101
Ok(())
98102
}

crates/devolutions-pedm-shell-ext/src/lib_win.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ use parking_lot::{Mutex, RwLock};
1414
use tokio::sync::mpsc::{self, Receiver, Sender};
1515
use win_api_wrappers::fs::get_system32_path;
1616
use win_api_wrappers::process::{Module, Process};
17-
use win_api_wrappers::raw::core::BOOL;
1817
use win_api_wrappers::raw::core::{
19-
implement, interface, Error, IUnknown, IUnknown_Vtbl, Interface, Result, GUID, HRESULT, PWSTR,
18+
implement, interface, Error, IUnknown, IUnknown_Vtbl, Interface, Result, BOOL, GUID, HRESULT, PWSTR,
2019
};
2120
use win_api_wrappers::raw::Win32::Foundation::{
2221
CLASS_E_CLASSNOTAVAILABLE, CLASS_E_NOAGGREGATION, ERROR_CANCELLED, E_FAIL, E_INVALIDARG, E_NOTIMPL, E_POINTER,

devolutions-agent/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ features = [
7878
]
7979

8080
[target.'cfg(windows)'.build-dependencies]
81-
embed-resource = "2.5"
81+
embed-resource = "3.0"

devolutions-agent/build.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ mod win {
1313
let version_rc_data = generate_version_rc();
1414
fs::write(&version_rc_file, version_rc_data).expect("BUG: failed to write version.rc");
1515

16-
embed_resource::compile(&version_rc_file, embed_resource::NONE);
17-
embed_resource::compile("resources.rc", embed_resource::NONE);
16+
embed_resource::compile(&version_rc_file, embed_resource::NONE)
17+
.manifest_required()
18+
.unwrap();
19+
embed_resource::compile("resources.rc", embed_resource::NONE)
20+
.manifest_required()
21+
.unwrap();
1822
}
1923

2024
fn generate_version_rc() -> String {

devolutions-gateway/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ portpicker = "0.1"
120120
rustls-cng = { version = "0.5", default-features = false, features = ["logging", "tls12", "ring"] }
121121

122122
[target.'cfg(windows)'.build-dependencies]
123-
embed-resource = "2.5"
123+
embed-resource = "3.0"
124124

125125
[dev-dependencies]
126126
tokio-test = "0.4"

devolutions-gateway/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ mod win {
1313
let version_rc_data = generate_version_rc();
1414
fs::write(&version_rc_file, version_rc_data).unwrap();
1515

16-
embed_resource::compile(&version_rc_file, embed_resource::NONE);
16+
embed_resource::compile(&version_rc_file, embed_resource::NONE)
17+
.manifest_required()
18+
.unwrap();
1719
}
1820

1921
fn generate_version_rc() -> String {

devolutions-session/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ version = "0.2"
4848
features = ["std"]
4949

5050
[target.'cfg(windows)'.build-dependencies]
51-
embed-resource = "2.5"
51+
embed-resource = "3.0"
5252

5353
[target.'cfg(windows)'.dependencies.windows]
5454
version = "0.61"

devolutions-session/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ mod win {
1313
let version_rc_data = generate_version_rc();
1414
fs::write(&version_rc_file, version_rc_data).expect("BUG: failed to write version.rc");
1515

16-
embed_resource::compile(&version_rc_file, embed_resource::NONE);
16+
embed_resource::compile(&version_rc_file, embed_resource::NONE)
17+
.manifest_required()
18+
.unwrap();
1719
}
1820

1921
fn generate_version_rc() -> String {

0 commit comments

Comments
 (0)