Skip to content

sync: upstream microsoft/power-platform-skills 2026-06-30 - #5

Open
Hjaf wants to merge 2 commits into
mainfrom
sync/upstream-2026-06-30
Open

sync: upstream microsoft/power-platform-skills 2026-06-30#5
Hjaf wants to merge 2 commits into
mainfrom
sync/upstream-2026-06-30

Conversation

@Hjaf

@Hjaf Hjaf commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Upstream Sync

  • Upstream range: 2923950faaedcb3161c60f5ac6cc577c2ceecaca..0188a8b62da76d545999e5568f345e4c962e3658
  • Sync date: 2026-06-30
  • Affected plugins: canvas-apps, code-apps-preview, mcp-apps, model-apps, power-pages

Merge Strategy

Strategy Paths Notes
Direct copy marketplace.json, plugins/*/.plugin/plugin.json, shared/skills/report-issue/**, plugins/*/skills/report-issue/**, plugins/model-apps/** content updates, plugins/power-pages/skills/add-ai-webapi/**, non-telemetry plugins/power-pages/scripts/**, non-telemetry plugins/power-pages/scripts/tests/**, evals/**, CODEOWNERS, CODE_OF_CONDUCT.md, SUPPORT.md Upstream-owned content copied as-is.
Intelligent merge .claude-plugin/marketplace.json, README.md, AGENTS.md, SECURITY.md, .gitignore, scripts/install.js, plugins/code-apps/README.md, plugins/code-apps/shared/shared-instructions.md, plugins/code-apps/shared/version-check.md, plugins/code-apps/skills/create-code-app/SKILL.md, plugins/code-apps/skills/deploy/SKILL.md, .github/workflows/validate-repository-metadata.yml, plugins/power-pages/hooks/hooks.json Preserved Equinor docs/install flow, EDS guidance, legacy compatibility validation, and removed telemetry hook wiring.
Deferred / not synced shared/telemetry/**, plugins/power-pages/scripts/lib/telemetry/**, plugins/power-pages/hooks/run-skill-pretool-telemetry.js, plugins/power-pages/hooks/run-user-prompt-telemetry.js, plugins/power-pages/skills/telemetry/**, telemetry-only tests Telemetry stack intentionally excluded pending separate governance review.
Preserved current fork behavior plugins/canvas-apps/.mcp.json, plugins/model-apps/.mcp.json, plugins/power-pages/.mcp.json, .github/workflows/github-repo-stats.yml, docs/equinor-alignment/**, .github/**, .devcontainer/**, scripts/validate-plugin-reviews.js Kept Equinor-specific or already-open-plugin-aligned behavior.

Plugin Re-Reviews

  • canvas-apps: review record updated. Open Plugins metadata and bundled report-issue workflow landed; no new scripts or production interaction. Copilot manifest blocker cleared. Status remains defer.
  • code-apps-preview: review record updated. Open Plugins metadata and bundled report-issue workflow landed. Equinor EDS guidance was intentionally preserved instead of taking upstream generic theming/doc changes. Status remains controlled-pilot.
  • mcp-apps: review record updated. Open Plugins metadata and bundled report-issue workflow landed; no runtime behavior change. Status remains defer.
  • model-apps: review record updated. Open Plugins metadata landed with helper root-path fixes; no new production interaction beyond the prior v2.2.0 review. Copilot manifest blocker cleared. Status remains defer.
  • power-pages: review record updated to upstream v2.6.0. Landed AI Web API scaffolding plus non-telemetry ALM/validation updates. Telemetry stack was deliberately excluded. Copilot manifest blocker cleared. Status remains defer.

Validation

  • cd plugins/power-pages/scripts/tests && node --test
  • node /workspaces/power-platform-skills/plugins/power-pages/scripts/lint-skills-alm.js
  • node /workspaces/power-platform-skills/scripts/validate-plugin-names.js
  • node /workspaces/power-platform-skills/scripts/validate-legacy-compatibility.js
  • node /workspaces/power-platform-skills/scripts/validate-skill-descriptions.js
  • node /workspaces/power-platform-skills/scripts/validate-plugin-reviews.js
  • node /workspaces/power-platform-skills/scripts/ensure-skill-version-check.js --check
  • git diff --check

All of the above completed cleanly.

Remaining Decisions / Blockers

  • Telemetry was intentionally left out of this sync. If we want to bring it into the fork, it needs a separate governance and privacy review.
  • The three .mcp.json files were left in the fork's current flat Open Plugins-aligned shape rather than overwritten with the upstream form.

Hjaf added 2 commits June 30, 2026 20:56
Upstream range: 2923950..0188a8b
Affected plugins: canvas-apps, code-apps-preview, mcp-apps, model-apps, power-pages
Merge strategy: direct-copy, intelligent-merge, deferred-telemetry

@Hjaf Hjaf left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

merge with upstream

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.

1 participant