Skip to content

Sync fork with upstream delegateas/XrmMockup#3

Draft
Copilot wants to merge 594 commits intomasterfrom
copilot/update-fork-and-resolve-conflicts
Draft

Sync fork with upstream delegateas/XrmMockup#3
Copilot wants to merge 594 commits intomasterfrom
copilot/update-fork-and-resolve-conflicts

Conversation

Copy link

Copilot AI commented Dec 8, 2025

Merged 896 commits from upstream delegateas/XrmMockup to bring fork current with latest features, fixes, and architectural changes.

Changes

  • Merged upstream/master - Accepted upstream versions for all 56 conflicting files using unrelated histories merge
  • Fixed solution file - Removed duplicate project declarations, Global sections, and nested project entries from concatenated merge artifacts
  • Fixed .csproj files - Extracted SDK-style format from 4 projects where old MSBuild format was concatenated during merge (XrmMockup365, MetadataGenerator365, TestPluginAssembly365, XrmMockup365Test)
  • Removed legacy AssemblyInfo - Deleted Properties/AssemblyInfo.cs conflicting with SDK-style auto-generation

Verification

Solution restores and builds successfully. Warnings present match upstream codebase.

Original prompt

Mke my fork up to date with the latest of the main repos commits. And resolve all conflicts


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

mlRosenquist and others added 30 commits January 3, 2024 11:07
…e-from-existing

Instantiate new instance based on existing metadata
Modified `DataHelper` to include "fileattachment" in default entities. Updated `Core.cs` with several formatting fixes and conditional compilation directives. Added new request handlers for file block uploads in `XrmMockupShared.projitems` and implemented `CommitFileBlocksUploadRequestHandler`, `InitializeFileBlocksUploadRequestHandler`, and `UploadBlockRequestHandler`.
…s-support

Retrieve and RetrieveMultiple fixes
…ailRequest

Implemented SendEmailRequestHandler
…load_requests

Add file block upload handlers
Lucki2g and others added 19 commits October 8, 2025 12:34
… fixes and override of revisionnumber via Db
…m-messages

Change plugin and workflow handling to use string instead of EventOperation
…erequest

Revise Quote Request (Dynamics Sales)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…owerfx-functions

Add support for Dataverse custom PowerFx functions
…ThanXY

Fix fetch condition olderthan-x-y
…rvice

Added managed identity service support
Copilot AI and others added 3 commits December 8, 2025 20:18
Co-authored-by: aronmek <764151+aronmek@users.noreply.github.com>
Co-authored-by: aronmek <764151+aronmek@users.noreply.github.com>
Copilot AI changed the title [WIP] Update fork with latest commits from main repository Sync fork with upstream delegateas/XrmMockup Dec 8, 2025
Copilot AI requested a review from aronmek December 8, 2025 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.