diff --git a/BuildTestRelease.bat b/BuildTestRelease.bat index 1cfc362fb..492d378b3 100644 --- a/BuildTestRelease.bat +++ b/BuildTestRelease.bat @@ -1,6 +1,6 @@ rem ********** RUN THIS FILE AS ADMINISTRATOR ********** set rootdir=%~dp0 -set version=3.0.0 +set version=4.0.0 set EnableNuGetPackageRestore=true rem ********** CHANGE CURRENT DIR TO LOCATION OF BAT FILE ********** diff --git a/DesktopBuild.bat b/DesktopBuild.bat index 1bbd09d5c..111ebca54 100644 --- a/DesktopBuild.bat +++ b/DesktopBuild.bat @@ -2,13 +2,16 @@ 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)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe +set msbuild=%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe +if not exist "%msbuild%" set msbuild=%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe +if not exist "%msbuild%" set msbuild=%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Enterprise\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 ) +echo %msbuild% 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 0fdd1d62c..fa98a4829 100644 --- a/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj +++ b/src/Vts.Desktop.Test/Vts.Desktop.Test.csproj @@ -63,8 +63,8 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll diff --git a/src/Vts.Desktop.Test/packages.config b/src/Vts.Desktop.Test/packages.config index 63d484063..7f6b31e3f 100644 --- a/src/Vts.Desktop.Test/packages.config +++ b/src/Vts.Desktop.Test/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Vts.Desktop/AssemblyFileVersion.cs b/src/Vts.Desktop/AssemblyFileVersion.cs index 8968da458..f080801cf 100644 --- a/src/Vts.Desktop/AssemblyFileVersion.cs +++ b/src/Vts.Desktop/AssemblyFileVersion.cs @@ -10,4 +10,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyFileVersion("1.0.*")] -[assembly: AssemblyFileVersion("3.0.0")] +[assembly: AssemblyFileVersion("4.0.0")] diff --git a/src/Vts.Desktop/AssemblyVersion.cs b/src/Vts.Desktop/AssemblyVersion.cs index 1d733d549..3db34c5f1 100644 --- a/src/Vts.Desktop/AssemblyVersion.cs +++ b/src/Vts.Desktop/AssemblyVersion.cs @@ -10,4 +10,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.0")] +[assembly: AssemblyVersion("4.0.0")] diff --git a/src/Vts.Desktop/Vts.Desktop.csproj b/src/Vts.Desktop/Vts.Desktop.csproj index a3773a065..56ee8926c 100644 --- a/src/Vts.Desktop/Vts.Desktop.csproj +++ b/src/Vts.Desktop/Vts.Desktop.csproj @@ -73,8 +73,8 @@ ..\packages\Unity.5.8.6\lib\net46\CommonServiceLocator.dll - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll @@ -87,7 +87,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.5.3\lib\net45\NLog.dll + ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Vts.Desktop/packages.config b/src/Vts.Desktop/packages.config index ec71d7b07..a8f487266 100644 --- a/src/Vts.Desktop/packages.config +++ b/src/Vts.Desktop/packages.config @@ -2,10 +2,10 @@ - + - + diff --git a/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj b/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj index 3be334ee2..228ceff8e 100644 --- a/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj +++ b/src/Vts.MGRTE.ConsoleApp/Vts.MGRTE.ConsoleApp.csproj @@ -36,12 +36,12 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll - ..\packages\NLog.4.5.3\lib\net45\NLog.dll + ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Vts.MGRTE.ConsoleApp/packages.config b/src/Vts.MGRTE.ConsoleApp/packages.config index ec8f65e38..1abbed92c 100644 --- a/src/Vts.MGRTE.ConsoleApp/packages.config +++ b/src/Vts.MGRTE.ConsoleApp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj b/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj index b0ae8ac3b..1686b0737 100644 --- a/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj +++ b/src/Vts.MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj @@ -39,8 +39,8 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll diff --git a/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config b/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config index dfffec460..0b5b1bc76 100644 --- a/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config +++ b/src/Vts.MonteCarlo.CommandLineApplication.Test/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj index 4c0ea8e17..7663ed30a 100644 --- a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj +++ b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj @@ -60,12 +60,12 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll - ..\packages\NLog.4.5.3\lib\net45\NLog.dll + ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Vts.MonteCarlo.CommandLineApplication/packages.config b/src/Vts.MonteCarlo.CommandLineApplication/packages.config index ec8f65e38..1abbed92c 100644 --- a/src/Vts.MonteCarlo.CommandLineApplication/packages.config +++ b/src/Vts.MonteCarlo.CommandLineApplication/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj b/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj index a769dd6e8..dfdfae75d 100644 --- a/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj +++ b/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj @@ -45,8 +45,8 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll diff --git a/src/Vts.MonteCarlo.PostProcessor.Test/packages.config b/src/Vts.MonteCarlo.PostProcessor.Test/packages.config index dfffec460..0b5b1bc76 100644 --- a/src/Vts.MonteCarlo.PostProcessor.Test/packages.config +++ b/src/Vts.MonteCarlo.PostProcessor.Test/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj index ca2a72ffb..ec818f594 100644 --- a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj +++ b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj @@ -58,12 +58,12 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll - ..\packages\NLog.4.5.3\lib\net45\NLog.dll + ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Vts.MonteCarlo.PostProcessor/packages.config b/src/Vts.MonteCarlo.PostProcessor/packages.config index ec8f65e38..1abbed92c 100644 --- a/src/Vts.MonteCarlo.PostProcessor/packages.config +++ b/src/Vts.MonteCarlo.PostProcessor/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Vts.ReportForwardSolvers.Desktop/Vts.ReportForwardSolvers.Desktop.csproj b/src/Vts.ReportForwardSolvers.Desktop/Vts.ReportForwardSolvers.Desktop.csproj index 74026bebf..d7f7e90a3 100644 --- a/src/Vts.ReportForwardSolvers.Desktop/Vts.ReportForwardSolvers.Desktop.csproj +++ b/src/Vts.ReportForwardSolvers.Desktop/Vts.ReportForwardSolvers.Desktop.csproj @@ -60,8 +60,8 @@ false - - ..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll + + ..\packages\MathNet.Numerics.4.4.1\lib\net461\MathNet.Numerics.dll diff --git a/src/Vts.ReportForwardSolvers.Desktop/packages.config b/src/Vts.ReportForwardSolvers.Desktop/packages.config index 78d8e1c36..8b1061772 100644 --- a/src/Vts.ReportForwardSolvers.Desktop/packages.config +++ b/src/Vts.ReportForwardSolvers.Desktop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/Vts/Vts.csproj b/src/Vts/Vts.csproj index e10d936b3..562740fe5 100644 --- a/src/Vts/Vts.csproj +++ b/src/Vts/Vts.csproj @@ -5,7 +5,7 @@ The VTS (Virtual Tissue Simulator) is an open source library for .NET that was designed as a modular and scalable platform to provide an integrated suite of computational tools to define, solve, visualize, and analyze relevant forward and inverse radiative transport problems in Biomedical Optics. Virtual Photonics Technology Initiative Copyright © 2018 Laser Microbeam and Medical Program - 3.2.0-alpha + 4.1.0-alpha true David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli VirtualPhotonics.Vts @@ -15,8 +15,8 @@ https://github.com/VirtualPhotonics/VTS/wiki https://github.com/VirtualPhotonics/VTS Git - Added a pre-release version for .NET Standard - 3.2.0.0 + Updated NuGet packages + 4.1.0.0