From 7f14c43d1237495c9a16a4d698a0d225074901f2 Mon Sep 17 00:00:00 2001 From: Lisa Glover Date: Tue, 17 Sep 2024 17:59:51 -0700 Subject: [PATCH 1/2] Updated the version numbers for the release and fixed the scripts because we only need one zip file --- BuildTestCore.ps1 | 4 +--- BuildTestRelease.ps1 | 4 ++-- BuildTestReleaseScripting.ps1 | 16 +++------------- .../Vts.MonteCarlo.CommandLineApplication.csproj | 6 +++--- .../Vts.MonteCarlo.PostProcessor.csproj | 6 +++--- src/Vts/Vts.csproj | 6 +++--- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/BuildTestCore.ps1 b/BuildTestCore.ps1 index 1b6189ea..56e6ace0 100644 --- a/BuildTestCore.ps1 +++ b/BuildTestCore.ps1 @@ -11,6 +11,4 @@ dotnet test $PWD\src\Vts.Test\Vts.Test.csproj -c Release Write-Host "Publish the VTS dll to platform specific folders" -ForegroundColor Green Remove-Item $PWD\publish -Recurse -ErrorAction Ignore -dotnet publish $PWD\src\Vts\Vts.csproj -c Release -o $PWD\publish\win-x64 --self-contained false -dotnet publish $PWD\src\Vts\Vts.csproj -c Release -o $PWD\publish\linux-x64 --self-contained false -dotnet publish $PWD\src\Vts\Vts.csproj -c Release -o $PWD\publish\osx-x64 --self-contained false +dotnet publish $PWD\src\Vts\Vts.csproj -c Release -o $PWD\publish\local --self-contained false diff --git a/BuildTestRelease.ps1 b/BuildTestRelease.ps1 index ed3872ef..e0928a26 100644 --- a/BuildTestRelease.ps1 +++ b/BuildTestRelease.ps1 @@ -1,5 +1,5 @@ -$mccl_version = "7.4.0" -$vts_version = "11.0.0" +$mccl_version = "8.0.0" +$vts_version = "12.0.0" Write-Host "Create clean publish and release folders" -ForegroundColor Green Remove-Item "$PWD\release" -Recurse -ErrorAction Ignore diff --git a/BuildTestReleaseScripting.ps1 b/BuildTestReleaseScripting.ps1 index 95c096d8..9254a46c 100644 --- a/BuildTestReleaseScripting.ps1 +++ b/BuildTestReleaseScripting.ps1 @@ -14,19 +14,9 @@ if (-not (Test-Path -LiteralPath $releasedir)) { New-Item -Path $PWD -Name $releasedir -ItemType "directory" } -# Create win-x64 zip -$archive="$PWD\release\VTS_Scripting_v" + $version + "_Win_x64.zip" -$source="$vtslevel\publish\win-x64\*" -Compress-Archive -Path $source -DestinationPath $archive -Force - -# Create linux-x64 zip -$archive="$PWD\release\VTS_Scripting_v" + $version + "_Linux_x64.zip" -$source="$vtslevel\publish\linux-x64\*" -Compress-Archive -Path $source -DestinationPath $archive -Force - -# Create osx-x64 zip -$archive="$PWD\release\VTS_Scripting_v" + $version + "_Mac_x64.zip" -$source="$vtslevel\publish\osx-x64\*" +# Create library zip +$archive="$PWD\release\VTS_Scripting_v" + $version + ".zip" +$source="$vtslevel\publish\local\*" Compress-Archive -Path $source -DestinationPath $archive -Force Read-Host -Prompt "Press Enter to exit Scripting release process" diff --git a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj index bfec4773..7da26fa2 100644 --- a/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj +++ b/src/Vts.MonteCarlo.CommandLineApplication/Vts.MonteCarlo.CommandLineApplication.csproj @@ -6,8 +6,8 @@ mc win-x64;linux-x64;osx-x64 Vts.MonteCarlo.CommandLineApplication - 7.4.0.0 - 7.4.0.0 + 8.0.0.0 + 8.0.0.0 false Virtual Photonics Technology Initiative MCCL @@ -20,7 +20,7 @@ https://github.com/VirtualPhotonics/VTS C#;Monte-Carlo Git - 7.4.0 + 8.0.0 diff --git a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj index e0c5911e..3c13ea5a 100644 --- a/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj +++ b/src/Vts.MonteCarlo.PostProcessor/Vts.MonteCarlo.PostProcessor.csproj @@ -6,8 +6,8 @@ Vts.MonteCarlo.PostProcessor mc_post win-x64;linux-x64;osx-x64 - 7.4.0.0 - 7.4.0.0 + 8.0.0.0 + 8.0.0.0 David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli Virtual Photonics Technology Initiative MCPP @@ -20,7 +20,7 @@ Git C#;Monte-Carlo false - 7.4.0 + 8.0.0 diff --git a/src/Vts/Vts.csproj b/src/Vts/Vts.csproj index f41aa83a..f28a12d0 100644 --- a/src/Vts/Vts.csproj +++ b/src/Vts/Vts.csproj @@ -4,7 +4,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 © 2024 Laser Microbeam and Medical Program - 11.0.0 + 12.0.0 true David Cuccia; Carole Hayakawa; Lisa Malenfant; Janaka Ranasinghesagara; Jennifer Nguyen; Adam Gardner; Michele Martinelli VirtualPhotonics.Vts @@ -16,8 +16,8 @@ * Updated NuGet packages * Code cleanup including * Fixing issues found by SonarCloud - 11.0.0.0 - 11.0.0.0 + 12.0.0.0 + 12.0.0.0 Debug;Release;Benchmark license.md logo.png From 111e16af064c70188eedf194374aae4b3e3b9a44 Mon Sep 17 00:00:00 2001 From: Lisa Glover Date: Tue, 1 Oct 2024 18:29:16 -0700 Subject: [PATCH 2/2] Updated the copyright on the license and readme files --- license.md | 2 +- readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/license.md b/license.md index ecddc219..5159cbbf 100644 --- a/license.md +++ b/license.md @@ -1,6 +1,6 @@ ## The MIT License (MIT) -#### Copyright (c) 2023 Virtual Photonics Technology Initiative +#### Copyright (c) 2024 Virtual Photonics Technology Initiative ### Acknowledgement Use the following acknowledgement in publications or applications that make use of this open source software or underlying technology and research: diff --git a/readme.md b/readme.md index 15c029b2..8c848bbf 100644 --- a/readme.md +++ b/readme.md @@ -39,4 +39,4 @@ _THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPL ## Copyright Virtual Tissue Simulator (VTS) Project. -Copyright ©2023 [Virtual Photonics Technology Initiative](https://virtualphotonics.org/). +Copyright ©2024 [Virtual Photonics Technology Initiative](https://virtualphotonics.org/).