diff --git a/DesktopBuild.bat b/DesktopBuild.bat index 365fc74ce..1bbd09d5c 100644 --- a/DesktopBuild.bat +++ b/DesktopBuild.bat @@ -1,7 +1,14 @@ +@echo off set rootdir=%~dp0 set debugbuildswitches=/p:WarningLevel=2 /nologo /v:n set releasebuildswitches=/p:Configuration=Release /p:WarningLevel=2 /nologo /v:n -set msbuild=%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\msbuild +set msbuild=%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe +if not exist "%msbuild%" set msbuild=%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBuild.exe +if not exist "%msbuild%" ( +echo *************** Please install the prerequisites to build VTS *************** +pause +exit +) set EnableNuGetPackageRestore=true "%msbuild%" "%rootdir%\src\Vts.Desktop\Vts.Desktop.csproj" %debugbuildswitches% diff --git a/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj b/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj index 096a7942a..0fdd1d62c 100644 --- a/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj +++ b/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj @@ -64,16 +64,16 @@ - ..\packages\MathNet.Numerics.4.4.0\lib\net40\MathNet.Numerics.dll + ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll - ..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\NUnit.3.10.1\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll @@ -342,6 +342,7 @@ + @@ -358,9 +359,6 @@ - - - diff --git a/src/Vts.Desktop.Test/packages.config b/src/Vts.Desktop.Test/packages.config index a6af48e18..63d484063 100644 --- a/src/Vts.Desktop.Test/packages.config +++ b/src/Vts.Desktop.Test/packages.config @@ -1,8 +1,8 @@  - + - - - + + + \ No newline at end of file diff --git a/src/Vts.Desktop/Vts.Desktop.csproj b/src/Vts.Desktop/Vts.Desktop.csproj index 770093129..a3773a065 100644 --- a/src/Vts.Desktop/Vts.Desktop.csproj +++ b/src/Vts.Desktop/Vts.Desktop.csproj @@ -68,14 +68,13 @@ - ..\packages\AutoMapper.6.2.2\lib\net40\AutoMapper.dll - True + ..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll ..\packages\Unity.5.8.6\lib\net46\CommonServiceLocator.dll - ..\packages\MathNet.Numerics.4.4.0\lib\net40\MathNet.Numerics.dll + ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll @@ -83,10 +82,9 @@ ..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - True - ..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.3\lib\net45\NLog.dll @@ -99,18 +97,17 @@ - - ..\packages\Rx-Core.2.2.4\lib\net40\System.Reactive.Core.dll + + ..\packages\Rx-Core.2.2.4\lib\net45\System.Reactive.Core.dll - - ..\packages\Rx-Interfaces.2.2.4\lib\net40\System.Reactive.Interfaces.dll + + ..\packages\Rx-Interfaces.2.2.4\lib\net45\System.Reactive.Interfaces.dll - - ..\packages\Rx-Linq.2.2.4\lib\net40\System.Reactive.Linq.dll + + ..\packages\Rx-Linq.2.2.4\lib\net45\System.Reactive.Linq.dll - - False - ..\packages\Rx-PlatformServices.2.2.4\lib\net40\System.Reactive.PlatformServices.dll + + ..\packages\Rx-PlatformServices.2.2.4\lib\net45\System.Reactive.PlatformServices.dll 3.0 @@ -1208,7 +1205,6 @@ Modeling\Resources\ReferenceData\N1e8mua0musp1g0p8dr0p2dt0p005\ROfFxAndTime - @@ -1227,7 +1223,9 @@ true - + + +