Skip to content

AQI-11668: add ScheduledActivity model used for storing in actor state #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathitharmalingam-aqi merged 9 commits into from
Sep 30, 2026
Merged

AQI-11668: add ScheduledActivity model used for storing in actor state #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d8458f
AQI-11668: add ScheduledActivity model used for storing in actor state
mathitharmalingam-aqi Sep 21, 2026
c3f3895
AQI-11668: Removed duplicate batch file run since build automatically…
mathitharmalingam-aqi Sep 21, 2026
d1b752a
AQI-11668: Fix compile file list generation
mathitharmalingam-aqi Sep 22, 2026
618e300
AQI-11668: Update protobuf pointer
mathitharmalingam-aqi Sep 22, 2026
067507d
AQI-11668: Remove version suffix
mathitharmalingam-aqi Sep 22, 2026
abb4b04
AQI-11668: update interface submodule
mathitharmalingam-aqi Sep 25, 2026
5b4cce3
Merge main into feature
mathitharmalingam-aqi Sep 25, 2026
aa0e543
AQI-11668: Updated change log
mathitharmalingam-aqi Sep 25, 2026
35105e0
AQI-11668: update module pointer
mathitharmalingam-aqi Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/reusable-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

## Version 7.35.0 - 2026-09-25

### Added

- Added `ScheduledActivity` and `ScheduledActivities` protos in `Common\Activity` proto.
Comment thread
Copilot marked this conversation as resolved.

## Version 7.34.0 - 2026-09-23

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/ONE.Interfaces.ProtocolBuffers
Open in desktop
Submodule ONE.Interfaces.ProtocolBuffers updated 2 files
+3 −0 generators/gen_all.ps1
+18 −0 proto/one/common/activity/scheduled_activity.proto
18 changes: 11 additions & 7 deletions src/ONE.Models.CSharp/BuildSubmodule.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
copy ..\proto\flat\out\csharp\* ..\..\ONE.Models.CSharp\generated || exit /b 1

if errorlevel 1 exit /b %errorlevel%

exit /b 0
15 changes: 14 additions & 1 deletion src/ONE.Models.CSharp/ONE.Models.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<!--For Release packages update
the VersionPrefix and remove any VersionSuffix-->
<VersionPrefix>7.34.0</VersionPrefix>
<VersionPrefix>7.35.0</VersionPrefix>
<!--For Feature packages update the VersionSuffix with the jira ticket number-->
<VersionSuffix></VersionSuffix>
<LangVersion>latest</LangVersion>
Expand All @@ -27,4 +27,17 @@
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
</ItemGroup>

<Target
Name="BuildProtocolBufferSubmodule"
BeforeTargets="CoreCompile"
Condition="'$(BuildingProject)' == 'true'">
<Exec
Command="call &quot;$(MSBuildProjectDirectory)\BuildSubmodule.bat&quot;"

@mathitharmalingam-aqi mathitharmalingam-aqi Sep 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The batch file usage is not new - it was part of the github action.

WorkingDirectory="$(MSBuildProjectDirectory)" />
<ItemGroup>
<Compile Remove="generated\**\*.cs" />
<Compile Include="generated\**\*.cs" />
</ItemGroup>
</Target>

</Project>
Loading