Merge pull request #151 from VirtualPhotonics/feature/150-preparation…

…-for-the-may-release 150-preparation-for-the-may-release
VirtualPhotonics · May 31, 2024 · cdc7b3b · cdc7b3b
2 parents 0bca741 + 73d2d97
commit cdc7b3b
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/BuildTestRelease.ps1 b/BuildTestRelease.ps1
@@ -1,5 +1,5 @@
-$mccl_version = "7.3.0"
-$vts_version = "10.0.0"
+$mccl_version = "7.4.0"
+$vts_version = "11.0.0"
 
 Write-Host "Create clean publish and release folders" -ForegroundColor Green
 Remove-Item "$PWD\release" -Recurse -ErrorAction Ignore

diff --git a/src/Vts.Benchmark/Vts.Benchmark.csproj b/src/Vts.Benchmark/Vts.Benchmark.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/....MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj b/....MonteCarlo.CommandLineApplication.Test/Vts.MonteCarlo.CommandLineApplication.Test.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="nunit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj
@@ -6,21 +6,21 @@
     <AssemblyName>mc</AssemblyName>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <RootNamespace>Vts.MonteCarlo.CommandLineApplication</RootNamespace>
-    <AssemblyVersion>7.3.0.0</AssemblyVersion>
-    <FileVersion>7.3.0.0</FileVersion>
+    <AssemblyVersion>7.4.0.0</AssemblyVersion>
+    <FileVersion>7.4.0.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Company>Virtual Photonics Technology Initiative</Company>
     <Product>MCCL</Product>
     <Authors>David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli</Authors>
     <Description>Monte-Carlo command-line application</Description>
-    <Copyright>Copyright © 2023 Laser Microbeam and Medical Program</Copyright>
+    <Copyright>Copyright © 2024 Laser Microbeam and Medical Program</Copyright>
     <PackageLicenseUrl>https://github.com/VirtualPhotonics/VTS/blob/master/license.md</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/VirtualPhotonics/VTS/wiki</PackageProjectUrl>
     <PackageIconUrl>http://virtualphotonics.org/Themes/VP/Content/Images/logo.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/VirtualPhotonics/VTS</RepositoryUrl>
     <PackageTags>C#;Monte-Carlo</PackageTags>
     <RepositoryType>Git</RepositoryType>
-    <Version>7.3.0</Version>
+    <Version>7.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj b/src/Vts.MonteCarlo.PostProcessor.Test/Vts.MonteCarlo.PostProcessor.Test.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="nunit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj
@@ -6,21 +6,21 @@
     <RootNamespace>Vts.MonteCarlo.PostProcessor</RootNamespace>
     <AssemblyName>mc_post</AssemblyName>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <AssemblyVersion>7.3.0.0</AssemblyVersion>
-    <FileVersion>7.3.0.0</FileVersion>
+    <AssemblyVersion>7.4.0.0</AssemblyVersion>
+    <FileVersion>7.4.0.0</FileVersion>
     <Authors>David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli</Authors>
     <Company>Virtual Photonics Technology Initiative</Company>
     <Product>MCPP</Product>
     <Description>Monte-Carlo post-processor command-line application</Description>
-    <Copyright>Copyright © 2023 Laser Microbeam and Medical Program</Copyright>
+    <Copyright>Copyright © 2024 Laser Microbeam and Medical Program</Copyright>
     <PackageProjectUrl>https://github.com/VirtualPhotonics/VTS/wiki</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/VirtualPhotonics/VTS/blob/master/license.md</PackageLicenseUrl>
     <PackageIconUrl>http://virtualphotonics.org/Themes/VP/Content/Images/logo.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/VirtualPhotonics/VTS</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>C#;Monte-Carlo</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>7.3.0</Version>
+    <Version>7.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Vts.Scripting.Test/Vts.Scripting.Test.csproj b/src/Vts.Scripting.Test/Vts.Scripting.Test.csproj
@@ -11,15 +11,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0">
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 	<PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Vts.Test/Vts.Test.csproj b/src/Vts.Test/Vts.Test.csproj
@@ -42,9 +42,9 @@
     <EmbeddedResource Include="Resources\sourcetest\inputAOfXAndYAndZ.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Vts.sln b/src/Vts.sln
@@ -223,8 +223,8 @@ Global
 		{3B0676C4-5CF1-4A0B-97E4-0CDF2B035702}.ReleaseWhiteList|x86.Build.0 = Release|Any CPU
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Any CPU.Build.0 = Debug|Any CPU
-		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Mixed Platforms.Build.0 = Release|Any CPU
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Win32.ActiveCfg = Debug|Any CPU
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|Win32.Build.0 = Debug|Any CPU
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.Benchmark|x86.ActiveCfg = Debug|Any CPU
@@ -255,8 +255,8 @@ Global
 		{2F4FEE64-9215-4B6C-8180-3C9C02BE7C07}.ReleaseWhiteList|x86.Build.0 = Release|Any CPU
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Any CPU.ActiveCfg = Debug|Any CPU
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Any CPU.Build.0 = Debug|Any CPU
-		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Mixed Platforms.Build.0 = Debug|Any CPU
+		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Mixed Platforms.Build.0 = Release|Any CPU
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Win32.ActiveCfg = Debug|Any CPU
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|Win32.Build.0 = Debug|Any CPU
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA}.Benchmark|x86.ActiveCfg = Debug|Any CPU
@@ -301,7 +301,7 @@ Global
 		{529AE3EE-28AF-4C0F-8D07-DC89833128DA} = {920000AB-D955-4399-AD00-78523C740E2A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35
 		SolutionGuid = {BB1B236A-1BE9-476A-A4B3-8C0F51F1FDA7}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35
 	EndGlobalSection
 EndGlobal
diff --git a/src/Vts/Vts.csproj b/src/Vts/Vts.csproj
@@ -3,8 +3,8 @@
 	<TargetFramework>net6.0</TargetFramework>
     <Description>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.</Description>
     <Company>Virtual Photonics Technology Initiative</Company>
-    <Copyright>Copyright © 2023 Laser Microbeam and Medical Program</Copyright>
-    <Version>10.0.0</Version>
+    <Copyright>Copyright © 2024 Laser Microbeam and Medical Program</Copyright>
+    <Version>11.0.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli</Authors>
     <PackageId>VirtualPhotonics.Vts</PackageId>
@@ -16,8 +16,8 @@
     <PackageReleaseNotes>* Updated NuGet packages
 * Code cleanup including
     *  Fixing issues found by SonarCloud</PackageReleaseNotes>
-    <AssemblyVersion>10.0.0.0</AssemblyVersion>
-    <FileVersion>10.0.0.0</FileVersion>
+    <AssemblyVersion>11.0.0.0</AssemblyVersion>
+    <FileVersion>11.0.0.0</FileVersion>
     <Configurations>Debug;Release;Benchmark</Configurations>
     <PackageLicenseFile>license.md</PackageLicenseFile>
     <PackageIcon>logo.png</PackageIcon>
@@ -125,17 +125,17 @@
     <EmbeddedResource Include="Modeling\Spectroscopy\Resources\SpectralDictionary.xml" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Benchmark|AnyCPU'">
-	<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+	<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="csmpfit" Version="1.1.2" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="Meta.Numerics" Version="4.1.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog" Version="5.2.5" />
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
   </ItemGroup>
 </Project>