From d307a13c6421a1badbbe9487e350a8bd8b9c521c Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 9 Jul 2016 18:56:38 +0200 Subject: [PATCH] Try to fix AppVeyor build. --- ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs | 3 +++ clean.bat | 2 +- debugbuild.bat | 2 +- releasebuild.bat | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs b/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs index 218c3ec04..376607aa3 100644 --- a/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs +++ b/ICSharpCode.Decompiler/Tests/RoundtripAssembly.cs @@ -162,6 +162,9 @@ namespace ICSharpCode.Decompiler.Tests info.CreateNoWindow = true; info.UseShellExecute = false; info.RedirectStandardOutput = true; + // Don't let environment variables (e.g. set by AppVeyor) influence the build. + info.EnvironmentVariables.Remove("Configuration"); + info.EnvironmentVariables.Remove("Platform"); Console.WriteLine($"\"{info.FileName}\" {info.Arguments}"); using (var p = Process.Start(info)) { Regex errorRegex = new Regex(@"^[\w\d.\\-]+\(\d+,\d+\):"); diff --git a/clean.bat b/clean.bat index bcf81132c..e41d4039b 100644 --- a/clean.bat +++ b/clean.bat @@ -1,4 +1,4 @@ -@if not exist "AvalonEdit\ICSharpCode.AvalonEdit.sln" ( +@if not exist "NRefactory\NRefactory.sln" ( git submodule update --init || exit /b 1 ) %windir%\microsoft.net\framework\v4.0.30319\msbuild /m ILSpy.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug diff --git a/debugbuild.bat b/debugbuild.bat index 9227bc776..79a991236 100644 --- a/debugbuild.bat +++ b/debugbuild.bat @@ -1,4 +1,4 @@ -@if not exist "AvalonEdit\ICSharpCode.AvalonEdit.sln" ( +@if not exist "NRefactory\NRefactory.sln" ( git submodule update --init || exit /b 1 ) "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" /m ILSpy.sln /p:Configuration=Debug "/p:Platform=Any CPU" diff --git a/releasebuild.bat b/releasebuild.bat index 57d174305..a4aa756bb 100644 --- a/releasebuild.bat +++ b/releasebuild.bat @@ -1,4 +1,4 @@ -@if not exist "AvalonEdit\ICSharpCode.AvalonEdit.sln" ( +@if not exist "NRefactory\NRefactory.sln" ( git submodule update --init || exit /b 1 ) "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" /m ILSpy.sln /p:Configuration=Release "/p:Platform=Any CPU"