From 15d40dedca39ddbcb978f6f04266c62610f5a32b Mon Sep 17 00:00:00 2001 From: Martin Braunsperger Date: Fri, 2 Feb 2024 18:39:17 +0100 Subject: [PATCH] Try to fix github ci --- tests/environment_info.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/environment_info.rs b/tests/environment_info.rs index 1dd4593..0b6e55a 100644 --- a/tests/environment_info.rs +++ b/tests/environment_info.rs @@ -2,7 +2,7 @@ use netcorehost::{ hostfxr::{EnvironmentInfo, FrameworkInfo, SdkInfo}, nethost, }; -use std::{collections::HashMap, path::PathBuf, process::Command}; +use std::{collections::HashMap, path::{Path, PathBuf}, process::Command, str::FromStr}; #[path = "common.rs"] mod common; @@ -21,7 +21,11 @@ fn get_dotnet_environment_info() { } fn get_expected_environment_info() -> EnvironmentInfo { - let output = Command::new("dotnet").arg("--info").output().unwrap(); + let dotnet_path = option_env!("DOTNET_ROOT") + .map(|root| Path::new(root).join("dotnet")) + .unwrap_or_else(|| PathBuf::from_str("dotnet").unwrap()); + dbg!(&dotnet_path); + let output = Command::new(dotnet_path).arg("--info").output().unwrap(); assert!(output.status.success()); let output = String::from_utf8_lossy(&output.stdout);