Skip to content

Commit

Permalink
Merge pull request #810 from unoplatform/dev/jela/nuget-path-spaces
Browse files Browse the repository at this point in the history
fix: More tuner fix for space in nuget path
  • Loading branch information
jeromelaban authored Dec 19, 2023
2 parents 820958f + 22158c5 commit 8ed40d1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
12 changes: 12 additions & 0 deletions .vsts-ci-windows-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,18 @@ jobs:
displayName: StaticLinking.Aot Tests net7
env:
BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
# nuget path with space test
- pwsh: |
mkdir "$env:Temp\nuget with a space"
$env:NUGET_PACKAGES="$env:Temp\nuget with a space"
# Delete the obj folder to force a restore
rm $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7/obj -r -force
cd $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7
dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true
dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/SampleNet7-win-nuget-space.binlog
displayName: Build StaticLinking with nuget space
# Embedded mode test (net6)
- pwsh: |
Expand Down
9 changes: 5 additions & 4 deletions src/Uno.Wasm.Packager/packager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1585,10 +1585,11 @@ int Run (string[] args) {

var linkerSearchPaths = root_search_paths.Concat(bcl_prefixes).Distinct().Select(p => $"-d \"{p}\" ");

var tunerCommand = $"dotnet " +
(string.IsNullOrEmpty(wasm_tuner_path)
? $"\"$tools_dir{Path.DirectorySeparatorChar}wasm-tuner.dll\""
: wasm_tuner_path);
var tunerBinary = string.IsNullOrEmpty(wasm_tuner_path)
? $"$tools_dir{Path.DirectorySeparatorChar}wasm-tuner.dll"
: wasm_tuner_path;

var tunerCommand = $"dotnet '{tunerBinary}'";

var exitCommand = is_windows ? failOnError : "|| exit 1";

Expand Down

0 comments on commit 8ed40d1

Please sign in to comment.