diff --git a/Source/dafny.msbuild/DafnyVerifyTask.cs b/Source/dafny.msbuild/DafnyVerifyTask.cs index c306115..3a6be4d 100644 --- a/Source/dafny.msbuild/DafnyVerifyTask.cs +++ b/Source/dafny.msbuild/DafnyVerifyTask.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.Build.Framework; @@ -44,9 +43,7 @@ private bool VerifyDafnyFile(ITaskItem file) { using (System.Diagnostics.Process verifyProcess = new System.Diagnostics.Process()) { verifyProcess.StartInfo.FileName = DafnyExecutable; - verifyProcess.StartInfo.ArgumentList.Add("/compile:0"); - verifyProcess.StartInfo.ArgumentList.Add("/timeLimit:" + TimeLimit); - verifyProcess.StartInfo.ArgumentList.Add(file.ItemSpec); + verifyProcess.StartInfo.Arguments = String.Format("/compile:0 /timeLimit:{0} {1}", TimeLimit, file.ItemSpec); verifyProcess.StartInfo.UseShellExecute = false; verifyProcess.StartInfo.RedirectStandardOutput = true; verifyProcess.StartInfo.RedirectStandardError = true; diff --git a/Source/dafny.msbuild/build/dafny.msbuild.props b/Source/dafny.msbuild/build/dafny.msbuild.props index 0035c71..1f018ad 100644 --- a/Source/dafny.msbuild/build/dafny.msbuild.props +++ b/Source/dafny.msbuild/build/dafny.msbuild.props @@ -1,8 +1,8 @@ - $(MSBuildThisFileDirectory)..\tasks\netcoreapp3.0\dafny.msbuild.dll - $(MSBuildThisFileDirectory)..\bin\Debug\netcoreapp3.0\dafny.msbuild.dll + $(MSBuildThisFileDirectory)..\tasks\netstandard2.0\dafny.msbuild.dll + $(MSBuildThisFileDirectory)..\bin\Debug\netstandard2.0\dafny.msbuild.dll Dafny.exe dafny diff --git a/Source/dafny.msbuild/dafny.msbuild.csproj b/Source/dafny.msbuild/dafny.msbuild.csproj index cc6ebfd..7805f93 100644 --- a/Source/dafny.msbuild/dafny.msbuild.csproj +++ b/Source/dafny.msbuild/dafny.msbuild.csproj @@ -1,14 +1,14 @@ - netcoreapp3.0 + netstandard2.0 DafnyMSBuild tasks true true - 0.3.0 + 0.4.0 build$([System.DateTime]::Now.ToString('yyyyMMdd-HHmm')) DafnyMSBuild @@ -18,9 +18,8 @@ - - - + + + - diff --git a/Test/TestProject/TestProject.csproj b/Test/TestProject/TestProject.csproj index 95ed289..58e0433 100644 --- a/Test/TestProject/TestProject.csproj +++ b/Test/TestProject/TestProject.csproj @@ -7,6 +7,11 @@ +