diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-15 21:57:19 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-15 21:59:35 +1000 |
commit | 5cd1e6bfadbbe327d02cd7a5510851178ddbbeee (patch) | |
tree | 062f8001d8df55eff28e4b034ef9ef1c934b9eda | |
parent | e28fcc906046ed12a867b621fc0eabf75fd9db09 (diff) | |
download | wix-5cd1e6bfadbbe327d02cd7a5510851178ddbbeee.tar.gz wix-5cd1e6bfadbbe327d02cd7a5510851178ddbbeee.tar.bz2 wix-5cd1e6bfadbbe327d02cd7a5510851178ddbbeee.zip |
Use Path.PathSeparator.
-rw-r--r-- | appveyor.cmd | 8 | ||||
-rw-r--r-- | 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 @@ | |||
1 | @setlocal | 1 | @setlocal |
2 | @pushd %~dp0 | 2 | @pushd %~dp0 |
3 | 3 | ||
4 | nuget restore | 4 | nuget restore || exit /b |
5 | 5 | ||
6 | msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj | 6 | msbuild -p:Configuration=Release .\src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b |
7 | 7 | ||
8 | msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj | 8 | msbuild -t:Pack -p:Configuration=Release .\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b |
9 | 9 | ||
10 | msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj | 10 | msbuild -t:Pack -p:Configuration=Release .\src\wixnative\wixnative.vcxproj || exit /b |
11 | 11 | ||
12 | @popd | 12 | @popd |
13 | @endlocal \ No newline at end of file | 13 | @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 | |||
89 | if (!found && AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES") is string searchDirectoriesString) | 89 | if (!found && AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES") is string searchDirectoriesString) |
90 | { | 90 | { |
91 | possiblePaths = searchDirectoriesString; | 91 | possiblePaths = searchDirectoriesString; |
92 | var separatorChar = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ';' : ':'; | 92 | var separatorChar = Path.PathSeparator; |
93 | var searchDirectories = searchDirectoriesString?.Split(separatorChar); | 93 | var searchDirectories = searchDirectoriesString?.Split(separatorChar); |
94 | foreach (var directoryPath in searchDirectories) | 94 | foreach (var directoryPath in searchDirectories) |
95 | { | 95 | { |