From 5d8458f2f251905f347ecb4605d20be579c4fa81 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Mon, 21 Sep 2026 12:47:40 -0400 Subject: [PATCH 1/8] AQI-11668: add ScheduledActivity model used for storing in actor state --- CHANGELOG.md | 7 +++++++ src/ONE.Interfaces.ProtocolBuffers | 2 +- src/ONE.Models.CSharp/BuildSubmodule.bat | 18 +++++++++++------- src/ONE.Models.CSharp/ONE.Models.CSharp.csproj | 13 +++++++++++-- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d92ede..62bee0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## Version 7.35.0 - 2026-09-21 + +### Added + +- Added `ScheduledActivity` and `ScheduledActivities` protos in `Common\Activity` proto. + + ## Version 7.33.0 - 2026-09-08 ### Added diff --git a/src/ONE.Interfaces.ProtocolBuffers b/src/ONE.Interfaces.ProtocolBuffers index 077c809..1e7e913 160000 --- a/src/ONE.Interfaces.ProtocolBuffers +++ b/src/ONE.Interfaces.ProtocolBuffers @@ -1 +1 @@ -Subproject commit 077c8090c4091a25732e3d1c0abab846fd45aa5f +Subproject commit 1e7e9133d81c444263f82491af00ed0b48b4ff76 diff --git a/src/ONE.Models.CSharp/BuildSubmodule.bat b/src/ONE.Models.CSharp/BuildSubmodule.bat index 4f5f0db..e12e9a9 100644 --- a/src/ONE.Models.CSharp/BuildSubmodule.bat +++ b/src/ONE.Models.CSharp/BuildSubmodule.bat @@ -1,14 +1,18 @@ @rem Clean up temporary flat proto files and previous generated cs files for a clean generation -IF EXIST "..\ONE.Interfaces.ProtocolBuffers\proto\flat" rd /q /s "..\ONE.Interfaces.ProtocolBuffers\proto\flat" -IF EXIST "generated" rd /q /s "generated" - +set "BASE_DIR=%~dp0" +cd "%BASE_DIR%" || exit /b 1 +IF EXIST "..\ONE.Interfaces.ProtocolBuffers\proto\flat" rd /q /s "..\ONE.Interfaces.ProtocolBuffers\proto\flat" || exit /b 1 +IF EXIST "generated" rd /q /s "generated" || exit /b 1 @rem Generate all the C# classes from proto files cd ..\ONE.Interfaces.ProtocolBuffers\generators -Powershell.exe -executionpolicy Bypass -File gen_all.ps1 +Powershell.exe -executionpolicy Bypass -File gen_all.ps1 || exit /b 1 -@rem Create folder -mkdir ..\..\ONE.Models.CSharp\generated +mkdir ..\..\ONE.Models.CSharp\generated || exit /b 1 @rem Copy to local folder -copy ..\proto\flat\out\csharp\* ..\..\ONE.Models.CSharp\generated \ No newline at end of file +copy ..\proto\flat\out\csharp\* ..\..\ONE.Models.CSharp\generated || exit /b 1 + +if errorlevel 1 exit /b %errorlevel% + +exit /b 0 \ No newline at end of file diff --git a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj index bd4ea75..94f0d6e 100644 --- a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj +++ b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj @@ -3,9 +3,9 @@ - 7.33.0 + 7.35.0 - + AQI-11668-1 latest netstandard2.0 Aquatic Informatics Inc. @@ -27,4 +27,13 @@ + + + + \ No newline at end of file From c3f38950dc00f50c755b84b2276d7b59bf2b0382 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Mon, 21 Sep 2026 15:19:14 -0400 Subject: [PATCH 2/8] AQI-11668: Removed duplicate batch file run since build automatically runs it. --- .github/workflows/reusable-build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index ae7aeb6..ce0521a 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -60,10 +60,6 @@ jobs: - name: Restore run: dotnet restore ${{ env.SolutionFile }} - - name: Build submodule - shell: cmd - run: BuildSubmodule.bat - - name: Build Release if: inputs.release run: dotnet build ${{ env.SolutionFile }} -c ${{ inputs.configuration }} From d1b752afc0293c364d88eda796abe101923b3cb9 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Mon, 21 Sep 2026 20:23:11 -0400 Subject: [PATCH 3/8] AQI-11668: Fix compile file list generation --- .../ONE.Models.CSharp.csproj | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj index 94f0d6e..9f9262a 100644 --- a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj +++ b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj @@ -27,13 +27,17 @@ - - - + + + + + + + \ No newline at end of file From 618e3009fa89973a0a2cdab04dcf3fc5dc45ff40 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Mon, 21 Sep 2026 20:39:18 -0400 Subject: [PATCH 4/8] AQI-11668: Update protobuf pointer --- src/ONE.Interfaces.ProtocolBuffers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONE.Interfaces.ProtocolBuffers b/src/ONE.Interfaces.ProtocolBuffers index 1e7e913..a4bd821 160000 --- a/src/ONE.Interfaces.ProtocolBuffers +++ b/src/ONE.Interfaces.ProtocolBuffers @@ -1 +1 @@ -Subproject commit 1e7e9133d81c444263f82491af00ed0b48b4ff76 +Subproject commit a4bd82136ed80604fce58dae041a51ce20de3ae8 From 067507d47fe8222642f85200132a7ba212b70ca8 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Tue, 22 Sep 2026 09:02:13 -0400 Subject: [PATCH 5/8] AQI-11668: Remove version suffix --- src/ONE.Models.CSharp/ONE.Models.CSharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj index 9f9262a..5339505 100644 --- a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj +++ b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj @@ -5,7 +5,7 @@ the VersionPrefix and remove any VersionSuffix--> 7.35.0 - AQI-11668-1 + latest netstandard2.0 Aquatic Informatics Inc. From abb4b04673e2700cf0b7513c1418d3f8cf2fefd5 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Fri, 25 Sep 2026 12:57:19 -0400 Subject: [PATCH 6/8] AQI-11668: update interface submodule --- src/ONE.Interfaces.ProtocolBuffers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONE.Interfaces.ProtocolBuffers b/src/ONE.Interfaces.ProtocolBuffers index a4bd821..008d046 160000 --- a/src/ONE.Interfaces.ProtocolBuffers +++ b/src/ONE.Interfaces.ProtocolBuffers @@ -1 +1 @@ -Subproject commit a4bd82136ed80604fce58dae041a51ce20de3ae8 +Subproject commit 008d046e90c42cc293e888d991d7f475d10e57a1 From aa0e54313c21de6f85cc79283143b99b794a6b49 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Fri, 25 Sep 2026 13:46:54 -0400 Subject: [PATCH 7/8] AQI-11668: Updated change log --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74338d5..5ed8728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## Version 7.35.0 - 2026-09-21 +## Version 7.35.0 - 2026-09-25 ### Added From 35105e0d990c3f0737c39ad21b5e2168633a6073 Mon Sep 17 00:00:00 2001 From: mathitharmalingam-aqi Date: Tue, 29 Sep 2026 22:00:46 -0400 Subject: [PATCH 8/8] AQI-11668: update module pointer --- src/ONE.Interfaces.ProtocolBuffers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONE.Interfaces.ProtocolBuffers b/src/ONE.Interfaces.ProtocolBuffers index 008d046..238fc27 160000 --- a/src/ONE.Interfaces.ProtocolBuffers +++ b/src/ONE.Interfaces.ProtocolBuffers @@ -1 +1 @@ -Subproject commit 008d046e90c42cc293e888d991d7f475d10e57a1 +Subproject commit 238fc27420dcd74a2b0186a4145d6a9000547f6e