Merge Main to Release (#1740)

* EventDetail page, replace azuremap with googlemap * combine EventInfoWindowContent component, set locationpreference map center on load user data * remove console * replace azuremap with googlemap * Updating Privacy Policy (#1697) * Updating Privacy Policy * Added more lingo --------- Co-authored-by: Joe Beernink <[email protected]> * Move to new mobile create event flow (#1699) * Updating Privacy Policy * Added more lingo * Move to new create event flow --------- Co-authored-by: Joe Beernink <[email protected]> * Enable route tracking (#1702) Co-authored-by: Joe Beernink <[email protected]> * add click on map * remove deprecated MapControllerSinglePoint * replace MyDashboard's azuremap with GoogleMap * fix minor lint * minor lint * Update PList Descriptions (#1706) Co-authored-by: Joe Beernink <[email protected]> * replace azuremap with googlemap * move waiver query, addAttendee mutation to RegisterBtn & add click on map to close infowindow * Updating GitVersion (#1717) * Updating GitVersion * Remove label * Remove flag --------- Co-authored-by: Joe Beernink <[email protected]> * Remove tag (#1718) * Updating GitVersion * Remove label * Remove flag * Remove tag field --------- Co-authored-by: Joe Beernink <[email protected]> * Switch to ContinuousDelivery (#1719) * Updating GitVersion * Remove label * Remove flag * Remove tag field * Switch to ContinuousDelivery --------- Co-authored-by: Joe Beernink <[email protected]> * Remove fallback tag (#1720) * Updating GitVersion * Remove label * Remove flag * Remove tag field * Switch to ContinuousDelivery * Remove fallback tag --------- Co-authored-by: Joe Beernink <[email protected]> * Added tagged commit (#1721) * Updating GitVersion * Remove label * Remove flag * Remove tag field * Switch to ContinuousDelivery * Remove fallback tag * Set to tagged commit --------- Co-authored-by: Joe Beernink <[email protected]> * Remove Strategy (#1722) * Updating GitVersion * Remove label * Remove flag * Remove tag field * Switch to ContinuousDelivery * Remove fallback tag * Set to tagged commit * Remove strategy --------- Co-authored-by: Joe Beernink <[email protected]> * Update build gitversion version (#1723) * Updating GitVersion * Remove label * Remove flag * Remove tag field * Switch to ContinuousDelivery * Remove fallback tag * Set to tagged commit * Remove strategy * Update build gitversion version --------- Co-authored-by: Joe Beernink <[email protected]> * close infowindow when click on map * revise Map with multiple markers * minor lint * Fix merge issue (#1727) Co-authored-by: Joe Beernink <[email protected]> * Stnadardize GitVersions in all files (#1728) Co-authored-by: Joe Beernink <[email protected]> * Fix VS Config for typescript (#1732) * Add label setting to gitversion file (#1734) Co-authored-by: Joe Beernink <[email protected]> * Switching back to Mainline mode (#1735) Co-authored-by: Joe Beernink <[email protected]> * Fix GitVersion (#1736) * Switching back to Mainline mode * One more time --------- Co-authored-by: Joe Beernink <[email protected]> * Move back to version space 5.x (#1737) Co-authored-by: Joe Beernink <[email protected]> * Update PreRelease Build number (#1738) Co-authored-by: Joe Beernink <[email protected]> * Fix typo (#1739) * Update PreRelease Build number * Fix typo --------- Co-authored-by: Joe Beernink <[email protected]> --------- Co-authored-by: Dopp <[email protected]> Co-authored-by: Joe Beernink <[email protected]> Co-authored-by: Pitipat Srichairat <[email protected]> Co-authored-by: Dany Pellerin <[email protected]>
TrashMob-eco · Oct 19, 2024 · d6e8d59 · d6e8d59
1 parent c481359
commit d6e8d59
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 42 deletions.
diff --git a/.github/workflows/PullRequest-IEFPolicies.yml b/.github/workflows/PullRequest-IEFPolicies.yml
@@ -29,13 +29,13 @@ jobs:
           fetch-depth: 0
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v1.1.1
+        uses: gittools/actions/gitversion/setup@v3.0.0
         with:
           versionSpec: '5.x'
-
+  
       - name: Determine Version
         id: version_step # step id used as reference for output values
-        uses: gittools/actions/gitversion/execute@v1.1.1            
+        uses: gittools/actions/gitversion/execute@v3.0.0       
 
       - name: Powershell
         run: |

diff --git a/.github/workflows/PullRequest-Mobile.yml b/.github/workflows/PullRequest-Mobile.yml
@@ -34,13 +34,13 @@ jobs:
           fetch-depth: 0
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v1.1.1
+        uses: gittools/actions/gitversion/setup@v3.0.0
         with:
           versionSpec: '5.x'
-
+  
       - name: Determine Version
         id: version_step # step id used as reference for output values
-        uses: gittools/actions/gitversion/execute@v1.1.1
+        uses: gittools/actions/gitversion/execute@v3.0.0
 
       - name: Set Build Number
         id: set_build_number

diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
@@ -33,13 +33,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
-
+  
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
       uses: actions/setup-dotnet@v4
@@ -72,13 +72,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
-
+  
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
       uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -58,14 +58,14 @@ jobs:
             fetch-depth: 0
 
         - name: Install GitVersion
-          uses: gittools/actions/gitversion/setup@v1.1.1
+          uses: gittools/actions/gitversion/setup@v3.0.0
           with:
             versionSpec: '5.x'
-        
+
         - name: Determine Version
           id: version_step # step id used as reference for output values
-          uses: gittools/actions/gitversion/execute@v1.1.1
-
+          uses: gittools/actions/gitversion/execute@v3.0.0
+  
         - name: Update Build Number
           run: |
             $content = Get-Content TrashMobMobile/TrashMobMobile.csproj -Raw

diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -61,13 +61,13 @@ jobs:
             fetch-depth: 0
 
         - name: Install GitVersion
-          uses: gittools/actions/gitversion/setup@v1.1.1
+          uses: gittools/actions/gitversion/setup@v3.0.0
           with:
             versionSpec: '5.x'
-
+    
         - name: Determine Version
           id: version_step # step id used as reference for output values
-          uses: gittools/actions/gitversion/execute@v1.1.1
+          uses: gittools/actions/gitversion/execute@v3.0.0
 
         - name: Update Build Number
           run: sed -i '' "s|<ApplicationVersion>.*</ApplicationVersion>|<ApplicationVersion>${{ env.semVer }}</ApplicationVersion>|g" TrashMobMobile/TrashMobMobile.csproj

diff --git a/.github/workflows/main_IEFPolicies.yml b/.github/workflows/main_IEFPolicies.yml
@@ -28,13 +28,13 @@ jobs:
           fetch-depth: 0
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v1.1.1
+        uses: gittools/actions/gitversion/setup@v3.0.0
         with:
           versionSpec: '5.x'
-
+  
       - name: Determine Version
         id: version_step # step id used as reference for output values
-        uses: gittools/actions/gitversion/execute@v1.1.1
+        uses: gittools/actions/gitversion/execute@v3.0.0
 
       - name: Powershell
         run: |

diff --git a/.github/workflows/main_as-tm-dev-westus2.yml b/.github/workflows/main_as-tm-dev-westus2.yml
@@ -33,13 +33,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
 
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
       uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/main_fa-tm-dev-westus2.yml b/.github/workflows/main_fa-tm-dev-westus2.yml
@@ -35,13 +35,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
-
+  
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/release_IEFPolicies.yml b/.github/workflows/release_IEFPolicies.yml
@@ -28,14 +28,14 @@ jobs:
           fetch-depth: 0
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v1.1.1
+        uses: gittools/actions/gitversion/setup@v3.0.0
         with:
           versionSpec: '5.x'
-
+  
       - name: Determine Version
         id: version_step # step id used as reference for output values
-        uses: gittools/actions/gitversion/execute@v1.1.1
-
+        uses: gittools/actions/gitversion/execute@v3.0.0
+        
       - name: Powershell
         run: |
           Install-Module -Name IefPolicies -Scope CurrentUser -Force -AllowPrerelease

diff --git a/.github/workflows/release_as-tm-pr-westus2.yml b/.github/workflows/release_as-tm-pr-westus2.yml
@@ -33,13 +33,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
-
+  
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup DotNet ${{ env.DOTNET_VERSION }} Environment
       uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/release_fa-tm-pr-westus2.yml b/.github/workflows/release_fa-tm-pr-westus2.yml
@@ -35,13 +35,13 @@ jobs:
         fetch-depth: 0
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1.1.1
+      uses: gittools/actions/gitversion/setup@v3.0.0
       with:
         versionSpec: '5.x'
-
+  
     - name: Determine Version
       id: version_step # step id used as reference for output values
-      uses: gittools/actions/gitversion/execute@v1.1.1
+      uses: gittools/actions/gitversion/execute@v3.0.0
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,19 +1,21 @@
 assembly-versioning-scheme: MajorMinorPatch
-mode: ContinuousDelivery
-tag-pre-release-weight: 1590664954
+mode: Mainline
+tag-pre-release-weight: 1590665287
 branches:
   main:
     regex: ^main$
     increment: Patch
     is-release-branch: true
-    pre-release-weight: 1590664955
+    pre-release-weight: 1590665287
     source-branches: ['main']
+    tracks-release-branches: false
   release:
     regex: ^release$
     increment: Patch
     is-release-branch: true
-    pre-release-weight: 1590664954
+    pre-release-weight: 1590665287
     source-branches: ['main', 'release']
+    tracks-release-branches: false
 ignore:
   sha: []
 merge-message-formats: {}
diff --git a/TrashMob/tsconfig.json b/TrashMob/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./client-app/tsconfig"
+}
diff --git a/TrashMobMobile/Platforms/iOS/Info.plist b/TrashMobMobile/Platforms/iOS/Info.plist
@@ -57,7 +57,7 @@
     <key>NSPhotoLibraryAddUsageDescription</key>
     <string>TrashMob needs access to the photo gallery for uploading photos and videos of litter.</string>
     <key>NSPhotoLibraryUsageDescription</key>
-    <string>v needs access to photos gallery for  for uploading photos and videos of litter.</string>
+    <string>TrashMob needs access to photos gallery for uploading photos and videos of litter.</string>
     <key>NSLocationAlwaysUsageDescription</key>
     <string>TrashMob needs your location when the app is running in the background when you have turned on route tracking.</string>
     <key>UIBackgroundModes</key>