From 5cd1e6bfadbbe327d02cd7a5510851178ddbbeee Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 15 Jun 2020 21:57:19 +1000 Subject: Use Path.PathSeparator. --- appveyor.cmd | 8 ++++---- src/WixToolset.Core.Native/WixNativeExe.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.cmd b/appveyor.cmd index a39fa567..63bf9301 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -1,13 +1,13 @@ @setlocal @pushd %~dp0 -nuget restore +nuget restore || exit /b -msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj +msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b -msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj +msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b -msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj +msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj || exit /b @popd @endlocal \ No newline at end of file diff --git a/src/WixToolset.Core.Native/WixNativeExe.cs b/src/WixToolset.Core.Native/WixNativeExe.cs index 325fa18f..eaa2b2e0 100644 --- a/src/WixToolset.Core.Native/WixNativeExe.cs +++ b/src/WixToolset.Core.Native/WixNativeExe.cs @@ -89,7 +89,7 @@ namespace WixToolset.Core.Native if (!found && AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES") is string searchDirectoriesString) { possiblePaths = searchDirectoriesString; - var separatorChar = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ';' : ':'; + var separatorChar = Path.PathSeparator; var searchDirectories = searchDirectoriesString?.Split(separatorChar); foreach (var directoryPath in searchDirectories) { -- cgit v1.2.3-55-g6feb