Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/anyhow-1.0.95
Browse files Browse the repository at this point in the history
  • Loading branch information
svasista-ms authored Jan 20, 2025
2 parents 3a9105f + 3db522a commit a99db94
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 27 deletions.
23 changes: 13 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ anyhow = "1.0.95"
bindgen = "0.69.4"
camino = "1.1.9"
cargo_metadata = "0.18.1"
cc = "1.1.0"
cc = "1.2.9"
cfg-if = "1.0.0"
clap = "4.5.9"
clap-cargo = "0.14.1"
Expand All @@ -49,12 +49,12 @@ lazy_static = "1.5.0"
paste = "1.0.15"
pretty_assertions = "1.4.0"
proc-macro2 = "1.0.86"
quote = "1.0.36"
quote = "1.0.38"
rustversion = "1.0.17"
serde = "1.0"
serde_json = "1.0"
syn = "2.0.77"
thiserror = "1.0.62"
syn = "2.0.87"
thiserror = "1.0.69"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
windows = "0.58.0"
Expand Down
3 changes: 3 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
The release process for this repository leverages [`release-plz`](https://github.com/MarcoIeni/release-plz) to automate some of the steps. Only maintainers with the necessary permissions can release new versions of this repository.

1. Install `release-plz`: One option is by running `cargo install --locked release-plz`
1. Ensure you are running the latest version of `release-plz`
1. Install `cargo-semver-checks`: One option is by running `cargo install --locked cargo-semver-checks`
1. Ensure you are running the latest version of `cargo-semver-checks`
1. Checkout the latest code on `main` branch
1. Create a release PR: `release-plz release-pr --git-token <Github Token>`
1. In the Pull Request:
Expand Down
13 changes: 0 additions & 13 deletions crates/wdk-build/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,6 @@ pub fn detect_wdk_content_root() -> Option<PathBuf> {
}
}

// Check WDKContentRoot environment variable
if let Ok(wdk_content_root) = env::var("WDKContentRoot") {
let path = Path::new(wdk_content_root.as_str());
if path.is_dir() {
return Some(path.to_path_buf());
}
eprintln!(
"WDKContentRoot({}) was found in environment, but does not exist or is not a valid \
directory.",
path.display()
);
}

// Check HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed
// Roots@KitsRoot10 registry key
if let Some(path) = read_registry_key_string_value(
Expand Down

0 comments on commit a99db94

Please sign in to comment.