admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix .NET language issue (#437)

Browse Source 
Co-authored-by: Thomas Schönauer <37108907+DottoDev@users.noreply.github.com>
This commit is contained in:
SteveLauC
2023-05-25 15:24:53 +08:00
committed by GitHub
parent 76c39edc8b
commit 7c3ba80270
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/steps/generic.rs
View File

@@ -619,7 +619,8 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> {
pub fn run_dotnet_upgrade(ctx: &ExecutionContext) -> Result<()> { pub fn run_dotnet_upgrade(ctx: &ExecutionContext) -> Result<()> {
let dotnet = utils::require("dotnet")?; let dotnet = utils::require("dotnet")?;
//Skip when the `dotnet tool list` subcommand fails. (This is expected when a dotnet runtime is installed but no SDK.) // Skip when the `dotnet tool list` subcommand fails.
// (This is expected when a dotnet runtime is installed but no SDK.)
let output = match ctx let output = match ctx
.run_type() .run_type()
.execute(&dotnet) .execute(&dotnet)
@@ -635,11 +636,20 @@ pub fn run_dotnet_upgrade(ctx: &ExecutionContext) -> Result<()> {
} }
}; };
if !output.stdout.starts_with("Package Id") { let mut packages = output
return Err(SkipStep(String::from("dotnet did not output packages")).into()); .stdout
} .lines()
// Skip the header:
let mut packages = output.stdout.lines().skip(2).filter(|line| !line.is_empty()).peekable(); //
// Package Id Version Commands
// -------------------------------------
//
// One thing to note is that .NET SDK respect locale, which means this
// header can be printed in languages other than English, do NOT use it
// to do any check.
.skip(2)
.filter(|line| !line.is_empty())
.peekable();
if packages.peek().is_none() { if packages.peek().is_none() {
return Err(SkipStep(String::from("No dotnet global tools installed")).into()); return Err(SkipStep(String::from("No dotnet global tools installed")).into());