From c0217f058717183650907ecf3dabad3ea9169663 Mon Sep 17 00:00:00 2001 From: Joe Beernink <3885965+joebeernink@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:51:55 -0700 Subject: [PATCH] Merge from Main (#1370) * merged from main (#1358) (#1360) * Merge main to release (#1344) (#1346) * Fix iOS build number (#1326) * Update gitversion settings * Update gitversion settings * Remove input field on release branch (shouldn't be needed now) * Fix gitversion * Fix ioS Build number --------- * Set really high version number (#1328) * Higher version still (#1330) * Set really high version number * Higher version still --------- * Adding Litter report basics (#1311) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion --------- * Add Log Statement (#1332) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter --------- * Remove extra } (#1333) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } --------- * fix add litter report fail issue (#1334) * Adding new litter report upload options (#1335) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app --------- * Fix issue with id override (#1336) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id --------- * Fix auth issue (#1337) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id * Fix auth issues --------- * Fix return type on litter report (#1338) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id * Fix auth issues * Fix return type on Litter reports --------- * Adding more litterreport functionality (#1339) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id * Fix auth issues * Fix return type on Litter reports * Adding get litter method --------- * Fix url (#1340) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id * Fix auth issues * Fix return type on Litter reports * Adding get litter method * Adding get of litter report * Fix merge issue --------- * Updating view litter report (#1341) * Adding Litter Report functionality * Adding litter reports basics * Reworking Litter Reports * Consolidating create litter report pages * Updating litterreports * Updating litter report to not have nulls * Revert gitversion to 5000 * Update gitversion * Add log statement for litter * Remove extra } * Improving image upload * Add new method for uploading Litter Reports * Updated app * Fixing uploads * Fix issue with override of Id * Fix auth issues * Fix return type on Litter reports * Adding get litter method * Adding get of litter report * Fix merge issue * Fixed issue with getting letter report view model --------- * reduce gitversion (#1343) --------- * Updated nugets (#1348) * Change version number * Updating nugets --------- * Updating version number (#1351) * Change version number * Updating nugets * Update gitversion settings --------- * Fixing ApplicationDisplayVersion (#1353) * Change version number * Updating nugets * Update gitversion settings * Fix ApplicationDisplayVersion --------- * Updating build numbers (#1355) * Change version number * Updating nugets * Update gitversion settings * Fix ApplicationDisplayVersion * Trying some more release stuff --------- * Update script (#1357) * Change version number * Updating nugets * Update gitversion settings * Fix ApplicationDisplayVersion * Trying some more release stuff * Change script --------- --------- Co-authored-by: Joe Beernink Co-authored-by: Chunli Shao <116043159+chunlishao@users.noreply.github.com> * Updating gitversion settings (#1362) * Updating build version formula * Updating gitversion settings --------- Co-authored-by: Joe Beernink * More version fixing (#1364) * Updating build version formula * Updating gitversion settings * More git changes --------- Co-authored-by: Joe Beernink * Update GitVersion.yml (#1367) * Test * Changing gitversionfile --------- Co-authored-by: Joe Beernink Co-authored-by: Chunli Shao <116043159+chunlishao@users.noreply.github.com> --- .github/workflows/build-ios.yml | 2 ++ GitVersion.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 3dbc9f44..333897ac 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -42,6 +42,8 @@ on: value: artifacts-ios-${{ inputs.build_number }} + + jobs: build: runs-on: macos-13 diff --git a/GitVersion.yml b/GitVersion.yml index 99fe831b..05790789 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,6 +1,5 @@ assembly-versioning-scheme: MajorMinorPatch mode: Mainline -next-version: 2.1.1 tag-pre-release-weight: 1590664954 continuous-delivery-fallback-tag: '' branches: