Use Path.PathSeparator.
Sean Hall committed
Jun 15, 2020 at 21:57 UTC
5cd1e6bfadbbe327d02cd7a5510851178ddbbeee
2 files changed
+5
-5
appveyor.cmd
+4
-4
@@ -1,13 +1,13 @@
1
@setlocal
2
@pushd %~dp0
3
4
-nuget restore
4
+nuget restore || exit /b
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
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
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
12
@popd
13
@endlocal
\ No newline at end of file
src/WixToolset.Core.Native/WixNativeExe.cs
+1
-1
@@ -89,7 +89,7 @@ namespace WixToolset.Core.Native
89
if (!found && AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES") is string searchDirectoriesString)
90
{
91
possiblePaths = searchDirectoriesString;
92
- var separatorChar = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ';' : ':';
92
+ var separatorChar = Path.PathSeparator;
93
var searchDirectories = searchDirectoriesString?.Split(separatorChar);
94
foreach (var directoryPath in searchDirectories)
95
{