Skip to content

Comments

Resolve syncing conflicts from repo_sync_working_branch to docs#580

Open
learn-build-service-prod[bot] wants to merge 37 commits intodocsfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to docs#580
learn-build-service-prod[bot] wants to merge 37 commits intodocsfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod
Copy link
Contributor

Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to docs.

valexao and others added 9 commits January 6, 2026 11:31
… (#2766)

* Update MPS playstream event references with changes from playfab-docs repo

* rm added file

* delete old files

* update ms author to be microsoft alias
* Updates for 5.6 release

* Addressing Feedback

---------

Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>
…ources team (#2762)

Update CODEOWNERS for playfab-docs directory to add Xbox Learning Resources team

https://github.com/orgs/MicrosoftDocs/teams/xbox-learning-resources/members
* Updating docs to include xbox live title linking.

* Updating index and toc

* Updating list of APIs that accept XBL tokens

* Fixing doc warnings

* Fixing alt text

* Updating doc to reflect new UI changes

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Update quality score from 70 to 80, the minimum Acrolinx topic score
…4] (#2764)

* Update release-notes.md

* Update release-notes.md

* Update release-notes.md

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
…uestions around conflict secnarios (#2768)

* Bug 60687305: PFGameSaves SteamDeck: improve docs based on customer questions around conflict secnarios

* Removed some duplication

---------

Co-authored-by: Andy McCalib <andmcc@microsoft.com>
* Update MPS Playstream event references with changes from playfab-docs (#2766)

* Update MPS playstream event references with changes from playfab-docs repo

* rm added file

* delete old files

* update ms author to be microsoft alias

* Updates for OSS V1 UE5.6 release (#2765)

* Updates for 5.6 release

* Addressing Feedback

---------

Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>

* Update CODEOWNERS for playfab-docs directory to add Xbox Learning Resources team (#2762)

Update CODEOWNERS for playfab-docs directory to add Xbox Learning Resources team

https://github.com/orgs/MicrosoftDocs/teams/xbox-learning-resources/members

* Xbox Title Add-on Update to enabled PC title linking (#2749)

* Updating docs to include xbox live title linking.

* Updating index and toc

* Updating list of APIs that accept XBL tokens

* Fixing doc warnings

* Fixing alt text

* Updating doc to reflect new UI changes

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Increase Acrolinx quality score from 70 to 80 (#2763)

Update quality score from 70 to 80, the minimum Acrolinx topic score

* Update release-notes.md, PlayFab Party Release Notes [1.10.13][1.10.14] (#2764)

* Update release-notes.md

* Update release-notes.md

* Update release-notes.md

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Update master_player_account description in Available built-in entity types page (#2771)

* Bug 60687305: PFGameSaves SteamDeck: improve docs based on customer questions around conflict secnarios (#2768)

* Bug 60687305: PFGameSaves SteamDeck: improve docs based on customer questions around conflict secnarios

* Removed some duplication

---------

Co-authored-by: Andy McCalib <andmcc@microsoft.com>

---------

Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Co-authored-by: Anthony Nguyen <108492711+antnguyen89@users.noreply.github.com>
Co-authored-by: Sebastian Perez-Delgado <46662157+SebastianPD@users.noreply.github.com>
Co-authored-by: Cindy Johnson <88344363+cindyjohnson-msft@users.noreply.github.com>
Co-authored-by: Jason Sandlin <jasonsa@microsoft.com>
Co-authored-by: Andy McCalib <andmcc@microsoft.com>
braulioal and others added 19 commits January 13, 2026 16:04
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
* pf-english-59226148-09-12-2025-01

* pf-english-59226148-09-15-2025-01

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
* pf-english-59213568-09-11-2025-01

* pf-english-59213568-09-15-2025-01

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
* Update account-upgrades.md

- Added new section titled cancel all charges and delete your studio
- replaced incorrect links to log in and fixed typos

* Update what-is-throttling.md for live branch (#2731)

Approved to push to Live

* Adding docs to support Battle.net add-on (#2723)

* Adding docs to support Battle.net add-on

* Updating HTML code

* Fixing links and variable instructions

* Small grammar updates

* PlayFab Unified SDK 2510 Release (#2743) (#2757)

* Add docs for PlayFab Unified SDK Preview 1

* Add docs for PlayFab Unified SDK Preview 1

* Add docs for PlayFab Unified SDK Preview 1

* Remove game save references until it hits preview

* Update Quickstart - Windows

* Update Quickstart - Windows

* Update unified SDK quickstart

* Update unified SDK quickstart

* Update quick start page

* Update quick start page

* Update quick start page

* Update quick start page

* Update quick start page

* Update TOC

* Minor update

* Remove redundant LHC entry

* Remove SDK vcpkg install option for now

* Add Party QS to TOC

* Fix typo, remove unused files

* Use include for common setup steps

* Use include for common setup steps

* Use include for common setup steps

* Make clear the async and debug articles apply to just core and services, not MLP or party

* Update SDK acqusition text

* Fix warnings

* Fix warnings

* Fix warnings

* Fix warnings

* Fix warnings

* Update overview

* Add migration guide

* Update migration guide

* Update quickstart

* Rename quickstart for core

* Restructure quickstarts

* Restructure quickstarts

* Update platform table

* Update platform table

* Add feature readiness table

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* update documentation to have the build alias playstream events

* add remaining documentation for missing mps playstream events

* fix spelling

* fix build alias

* rename mps event pages so that they are aligned with publicly available events, updated index.md and toc

* rename the payloads as well + title, description, and links for consistency

* fix dates

* make keywords uniform, minor fix to index format

* Updates for OSS V1 UE5.6 release (#2765) (#2767)

* Updates for 5.6 release

* Addressing Feedback

---------



(cherry picked from commit 749f39a)

Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>

---------

Co-authored-by: Kevin Asgari <KevinAsgari@users.noreply.github.com>
Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com>
Co-authored-by: kidistadamu <kidistadamu@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>
Co-authored-by: Cindy Johnson <88344363+cindyjohnson-msft@users.noreply.github.com>
Co-authored-by: Anthony Nguyen <108492711+antnguyen89@users.noreply.github.com>
Co-authored-by: kdearnley <kdearnley@microsoft.com>
Co-authored-by: Cody Otterholt <cotterholt@gmail.com>
Co-authored-by: Kirsten Dearnley <91142640+m-kdearnley@users.noreply.github.com>
Co-authored-by: Adam Skewgar <32848262+ajskew@users.noreply.github.com>
Co-authored-by: yuehanlin <99760142+yuehanlin@users.noreply.github.com>
Co-authored-by: Andy McCalib <andmcc@microsoft.com>
Co-authored-by: Jeffrey Shi <jeffshi@microsoft.com>
Co-authored-by: Valexa Orelien <vorelien@microsoft.com>
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Co-authored-by: Valexa O. <46427879+valexao@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
* Merge from main

* pf-trademark-edits-60743178-01-13-2026-01

* pf-trademark-edits-60743178-01-13-2026-02

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
* Update MPS Playstream event references with changes from playfab-docs (#2766)

* Update MPS playstream event references with changes from playfab-docs repo

* rm added file

* delete old files

* update ms author to be microsoft alias

* Updates for OSS V1 UE5.6 release (#2765)

* Updates for 5.6 release

* Addressing Feedback

---------

Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>

* Update CODEOWNERS for playfab-docs directory to add Xbox Learning Resources team (#2762)

Update CODEOWNERS for playfab-docs directory to add Xbox Learning Resources team

https://github.com/orgs/MicrosoftDocs/teams/xbox-learning-resources/members

* Xbox Title Add-on Update to enabled PC title linking (#2749)

* Updating docs to include xbox live title linking.

* Updating index and toc

* Updating list of APIs that accept XBL tokens

* Fixing doc warnings

* Fixing alt text

* Updating doc to reflect new UI changes

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Increase Acrolinx quality score from 70 to 80 (#2763)

Update quality score from 70 to 80, the minimum Acrolinx topic score

* Update release-notes.md, PlayFab Party Release Notes [1.10.13][1.10.14] (#2764)

* Update release-notes.md

* Update release-notes.md

* Update release-notes.md

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Update master_player_account description in Available built-in entity types page (#2771)

* Bug 60687305: PFGameSaves SteamDeck: improve docs based on customer questions around conflict secnarios (#2768)

* Bug 60687305: PFGameSaves SteamDeck: improve docs based on customer questions around conflict secnarios

* Removed some duplication

---------

Co-authored-by: Andy McCalib <andmcc@microsoft.com>

* Adding missing elements to the links on the menu (#2747)

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* PF English edits 59226148 (#2745)

* pf-english-59226148-09-12-2025-01

* pf-english-59226148-09-15-2025-01

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* PF English edits 59213568 (#2744)

* pf-english-59213568-09-11-2025-01

* pf-english-59213568-09-15-2025-01

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Update loginidentityprovider.md (#2730)

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* fix typo in event name (#2725)

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

* Resolve syncing conflicts from repo_sync_working_branch to main (#2774)

* Update account-upgrades.md

- Added new section titled cancel all charges and delete your studio
- replaced incorrect links to log in and fixed typos

* Update what-is-throttling.md for live branch (#2731)

Approved to push to Live

* Adding docs to support Battle.net add-on (#2723)

* Adding docs to support Battle.net add-on

* Updating HTML code

* Fixing links and variable instructions

* Small grammar updates

* PlayFab Unified SDK 2510 Release (#2743) (#2757)

* Add docs for PlayFab Unified SDK Preview 1

* Add docs for PlayFab Unified SDK Preview 1

* Add docs for PlayFab Unified SDK Preview 1

* Remove game save references until it hits preview

* Update Quickstart - Windows

* Update Quickstart - Windows

* Update unified SDK quickstart

* Update unified SDK quickstart

* Update quick start page

* Update quick start page

* Update quick start page

* Update quick start page

* Update quick start page

* Update TOC

* Minor update

* Remove redundant LHC entry

* Remove SDK vcpkg install option for now

* Add Party QS to TOC

* Fix typo, remove unused files

* Use include for common setup steps

* Use include for common setup steps

* Use include for common setup steps

* Make clear the async and debug articles apply to just core and services, not MLP or party

* Update SDK acqusition text

* Fix warnings

* Fix warnings

* Fix warnings

* Fix warnings

* Fix warnings

* Update overview

* Add migration guide

* Update migration guide

* Update quickstart

* Rename quickstart for core

* Restructure quickstarts

* Restructure quickstarts

* Update platform table

* Update platform table

* Add feature readiness table

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* PR feedback

* update documentation to have the build alias playstream events

* add remaining documentation for missing mps playstream events

* fix spelling

* fix build alias

* rename mps event pages so that they are aligned with publicly available events, updated index.md and toc

* rename the payloads as well + title, description, and links for consistency

* fix dates

* make keywords uniform, minor fix to index format

* Updates for OSS V1 UE5.6 release (#2765) (#2767)

* Updates for 5.6 release

* Addressing Feedback

---------



(cherry picked from commit 749f39a)

Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>

---------

Co-authored-by: Kevin Asgari <KevinAsgari@users.noreply.github.com>
Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com>
Co-authored-by: kidistadamu <kidistadamu@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>
Co-authored-by: Cindy Johnson <88344363+cindyjohnson-msft@users.noreply.github.com>
Co-authored-by: Anthony Nguyen <108492711+antnguyen89@users.noreply.github.com>
Co-authored-by: kdearnley <kdearnley@microsoft.com>
Co-authored-by: Cody Otterholt <cotterholt@gmail.com>
Co-authored-by: Kirsten Dearnley <91142640+m-kdearnley@users.noreply.github.com>
Co-authored-by: Adam Skewgar <32848262+ajskew@users.noreply.github.com>
Co-authored-by: yuehanlin <99760142+yuehanlin@users.noreply.github.com>
Co-authored-by: Andy McCalib <andmcc@microsoft.com>
Co-authored-by: Jeffrey Shi <jeffshi@microsoft.com>
Co-authored-by: Valexa Orelien <vorelien@microsoft.com>
Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>
Co-authored-by: Valexa O. <46427879+valexao@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>

* PF trademark edits-60743178 (#2772)

* Merge from main

* pf-trademark-edits-60743178-01-13-2026-01

* pf-trademark-edits-60743178-01-13-2026-02

---------

Co-authored-by: edigonzales-microsoft <edigonzales20@outlook.com>

---------

Co-authored-by: Valexa O. <46427879+valexao@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <108555472+rgomez391@users.noreply.github.com>
Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
Co-authored-by: David Kushmerick <80928711+dkushmerick@users.noreply.github.com>
Co-authored-by: Anthony Nguyen <108492711+antnguyen89@users.noreply.github.com>
Co-authored-by: Sebastian Perez-Delgado <46662157+SebastianPD@users.noreply.github.com>
Co-authored-by: Cindy Johnson <88344363+cindyjohnson-msft@users.noreply.github.com>
Co-authored-by: Jason Sandlin <jasonsa@microsoft.com>
Co-authored-by: Andy McCalib <andmcc@microsoft.com>
Co-authored-by: Braulio Alpízar <152341905+braulioal@users.noreply.github.com>
Co-authored-by: Rick Carr <39857706+rickcarr044@users.noreply.github.com>
Co-authored-by: Yuto Chikazawa <12545287+ychikazawa@users.noreply.github.com>
Co-authored-by: Heather Kemp <heatherkemp7@yahoo.com>
Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com>
Co-authored-by: Kevin Asgari <KevinAsgari@users.noreply.github.com>
Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com>
Co-authored-by: kidistadamu <kidistadamu@microsoft.com>
Co-authored-by: kdearnley <kdearnley@microsoft.com>
Co-authored-by: Cody Otterholt <cotterholt@gmail.com>
Co-authored-by: Kirsten Dearnley <91142640+m-kdearnley@users.noreply.github.com>
Co-authored-by: Adam Skewgar <32848262+ajskew@users.noreply.github.com>
Co-authored-by: yuehanlin <99760142+yuehanlin@users.noreply.github.com>
Co-authored-by: Jeffrey Shi <jeffshi@microsoft.com>
Co-authored-by: Valexa Orelien <vorelien@microsoft.com>
* Update webhook calls documentation with IP allowlisting info

Added note about allowing IP addresses for outbound CloudScript calls.

* update formatting

Added note about allowlisting IP addresses for outbound CloudScript calls.

* update wording
…roperties (#2776)

* add a common properties docfx template and replace common properties section

* create a common properties v1 and v2 + update MPS properties to not be redundant

* update all v2 events with correct payload

* update the rest of the events to use common-properties-eventsv1

* fix links
* update public pfmultiplayer errors

* fix date
The core intent of this PR is to update the Party error doc reference pages to be exactly what is generated by our internal reference doc generator scripts (rather than something hand crafted)

doing so has also opportunistically cleaned up some stale/deprecated errors.
Edited Sony trademark symbols in two files .
* Revise lobby invites documentation

Updated note format and clarified invite restrictions.

* Add RestrictInvitesToLobbyOwner property description

New property added

* Improve note formatting in join-lobbies.md

Updated the note format for clarity and consistency.

* Document client-owned lobby access from server

Added information about client-owned lobby access from a server and related APIs.

* Fix API link for JoinLobbyAsServer

Updated link for JoinLobbyAsServer API to point to the correct documentation.

* Clarify client owned lobby access for game servers

Updated the section on client owned lobby access to clarify the role of 'game_server' entities and added a table summarizing relevant APIs.

* Update REST API table for game server interactions

Added the SDK C++ APIs

* Fix typo in owner requirements and privileges documentation

Corrected a typo in the documentation regarding the APIs for client-owned lobbies.

* Update Player Entity attribute source warning

Clarified the use of Player Entity as an attribute source by adding a warning against using it with external entity types.
Co-authored-by: v-foxval@microsoft.com <v-foxval@microsoft.com>
* Link: 60428657
Context/Status: Added clarification language. Approved by antnguyen.

* Fixed flagged URL.

* Updated name change of community forums to community Discord.

* Updated backticks line 144.

---------

Co-authored-by: v-foxval@microsoft.com <v-foxval@microsoft.com>
* Link: 60428583
Context/Status: Added additional information. Approved by edigonzales.

* Updated language per comment.

---------

Co-authored-by: v-foxval@microsoft.com <v-foxval@microsoft.com>
* Doc updates for 5.7 support

* Minor updates in formatting

* Addressing format feedback

---------

Co-authored-by: Raul Gomez Rodriguez <raulalbertog@microsoft.com>
tomcoMSFT and others added 9 commits February 6, 2026 11:44
…s (#2797)

* Initial plan

* Add GitHub Action workflow for scheduled Main to Live merge

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Fix code review issues: correct comment and quote job.status

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Remove redundant --no-edit flag and use POSIX-compliant comparison

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Add explicit permissions to limit GITHUB_TOKEN scope

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>
* Initial plan

* Update merge-main-to-live workflow to create PR instead of direct merge

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Address code review feedback: improve branch naming and PR body readability

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>
* 60428644_playfab_support_language_update

* Updated link

---------

Co-authored-by: v-foxval@microsoft.com <v-foxval@microsoft.com>
* Initial plan

* Update merge-main-to-live workflow to use direct PR approach

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Fix issue label from merge-conflict to workflow-failure

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

* Align workflow structure with gdk-docs-pr pattern

Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: edigonzales-microsoft <235193640+edigonzales-microsoft@users.noreply.github.com>
… CloudScript (#2800)

* AdPlacement

* Addon docs

* ApiAccessPolicy

* Cloudscript docs

* Rename author
…Telemetry, Title Communications (#2803)

* Extensions

* Functions

* Groups

* Telemetry

* TitleCom
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.