Skip to content

Commit

Permalink
Merge Main to Release (#1740)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
5 people authored Oct 19, 2024
1 parent c481359 commit d6e8d59
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 42 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/PullRequest-IEFPolicies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/PullRequest-Mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/PullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main_IEFPolicies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main_as-tm-dev-westus2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main_fa-tm-dev-westus2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_IEFPolicies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_as-tm-pr-westus2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_fa-tm-pr-westus2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -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: {}
3 changes: 3 additions & 0 deletions TrashMob/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "./client-app/tsconfig"
}
2 changes: 1 addition & 1 deletion TrashMobMobile/Platforms/iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit d6e8d59

Please sign in to comment.