Skip to content
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

Jump to bottom

Merge main into v.next #1318

Merged
merged 13 commits into from
Nov 9, 2023
Merged

Merge main into v.next #1318

merged 13 commits into from
Nov 9, 2023

Conversation

duffh
Copy link
Collaborator

@duffh duffh commented Nov 9, 2023

Description

Merge missing changes into v.next from main.

williambohrmann3 and others added 12 commits August 16, 2023 15:30
@williambohrmann3
Use CPM for build checks (#1289)
6bb33d8
@duffh @andy-weis
@williambohrmann3 @ZackAllen @dotMorten @pMaske @gdestigter
Merge v.next into main for release 200.2.0 (#1286)
af77781 
Co-authored-by: Andy Weis <[email protected]>
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Zack Allen <[email protected]>
Co-authored-by: Morten Nielsen <[email protected]>
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Preeti <[email protected]>
Co-authored-by: Morten Nielsen <[email protected]>
Co-authored-by: Greg De Stigter <[email protected]>
@williambohrmann3
Move CreateAndEditGeometries into Geometry category (#1290)
29832be
@williambohrmann3
Upgrade LocalServices package to 200.1.0 (#1292)
67b223e
@williambohrmann3
ManageFeatures rework (#1294)
389f43b
@williambohrmann3
New sample: Filter features in scene (#1291)
615639d
@williambohrmann3
WMS service catalog data (#1295)
2e6ed0a
@williambohrmann3
DisplayDeviceLocation rework (#1296)
20f1e02
@duffh
Multitarget the WPF project for .NET and .NETFramework (#1301)
f1e3b26
@williambohrmann3
Workflow: Open PR to sync v.next with main (#1303)
f5322a6
@tejabalu
Fix offline file path for the 'Add custom dynamic entity data source'
84da88e
@williambohrmann3
PR automation: cherry-pick from main (#1313)
cf1766c
@williambohrmann3 williambohrmann3 marked this pull request as ready for review November 9, 2023 20:45
williambohrmann3
williambohrmann3 approved these changes Nov 9, 2023
View reviewed changes
Copy link
Collaborator

@williambohrmann3 williambohrmann3 left a comment

Choose a reason for hiding this comment

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

LGTM

@duffh duffh merged commit e400a0b into v.next Nov 9, 2023
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williambohrmann3 williambohrmann3 williambohrmann3 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@duffh @williambohrmann3 @tejabalu