From a4335c54eeb7df1bc78c4b40b2308d3013f6055b Mon Sep 17 00:00:00 2001 From: AbhinavMSFT <100221072+AbhinavMSFT@users.noreply.github.com> Date: Wed, 31 Jul 2024 19:42:57 +0530 Subject: [PATCH 1/5] Update policy-csp-update.md Update Target version CSP section as productVersion is also required for TargetVision policy to work --- windows/client-management/mdm/policy-csp-update.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md index 796984d07cd..84ade66a364 100644 --- a/windows/client-management/mdm/policy-csp-update.md +++ b/windows/client-management/mdm/policy-csp-update.md @@ -1223,7 +1223,9 @@ If you enter an invalid value, you'll remain on your current version until you c Supported value type is a string containing Windows version number. For example, `1809`, `1903`, etc. - +> [!NOTE] +> You need to set up the ProductVersion CSP along with the TargetReleaseVersion CSP for it to work. +> **Description framework properties**: From d49980896566b338119bf5df6afe3e1b90e77ce5 Mon Sep 17 00:00:00 2001 From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:47:46 -0600 Subject: [PATCH 2/5] Remove titleSuffix --- windows/application-management/docfx.json | 1 - windows/client-management/docfx.json | 5 ++--- windows/configuration/docfx.json | 1 - windows/deployment/docfx.json | 5 ++--- windows/hub/docfx.json | 5 ++--- windows/hub/index.yml | 2 +- windows/security/docfx.json | 1 - 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json index 4f5ec979b0d..ddb34848ae9 100644 --- a/windows/application-management/docfx.json +++ b/windows/application-management/docfx.json @@ -51,7 +51,6 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Windows Application Management", "contributors_to_exclude": [ "dstrome2", "rjagiewich", diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json index 07e6f430e86..4f0356dff41 100644 --- a/windows/client-management/docfx.json +++ b/windows/client-management/docfx.json @@ -56,12 +56,11 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Windows Client Management", "contributors_to_exclude": [ "dstrome2", - "rjagiewich", + "rjagiewich", "American-Dipper", - "claydetels19", + "claydetels19", "jborsecnik", "v-stchambers", "shdyas", diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json index 65d0a53b091..5374491680f 100644 --- a/windows/configuration/docfx.json +++ b/windows/configuration/docfx.json @@ -52,7 +52,6 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Configure Windows", "contributors_to_exclude": [ "dstrome2", "rjagiewich", diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json index 0ec95143b64..3b57082428e 100644 --- a/windows/deployment/docfx.json +++ b/windows/deployment/docfx.json @@ -49,12 +49,11 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Windows Deployment", "contributors_to_exclude": [ "dstrome2", - "rjagiewich", + "rjagiewich", "American-Dipper", - "claydetels19", + "claydetels19", "jborsecnik", "v-stchambers", "shdyas", diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json index 5fddd274583..b548f8eed22 100644 --- a/windows/hub/docfx.json +++ b/windows/hub/docfx.json @@ -52,12 +52,11 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Windows for IT Pros", "contributors_to_exclude": [ "dstrome2", - "rjagiewich", + "rjagiewich", "American-Dipper", - "claydetels19", + "claydetels19", "jborsecnik", "v-stchambers", "shdyas", diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 95d49b10a72..cc73d3aebce 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -5,7 +5,7 @@ summary: Learn how to deploy, secure, and manage Windows clients for your organi brand: windows metadata: - title: Windows client documentation + title: Windows client documentation for IT Pros description: Learn how to deploy, secure, and manage Windows clients for your organization. ms.topic: hub-page ms.service: windows-client diff --git a/windows/security/docfx.json b/windows/security/docfx.json index 2e3135282a8..d93c46f45cb 100644 --- a/windows/security/docfx.json +++ b/windows/security/docfx.json @@ -53,7 +53,6 @@ "folder_relative_path_in_docset": "./" } }, - "titleSuffix": "Windows Security", "contributors_to_exclude": [ "alekyaj", "alexbuckgit", From 134b9be4f6c0cf97ec3473ad896210db9378e5e2 Mon Sep 17 00:00:00 2001 From: Aaron Czechowski Date: Thu, 1 Aug 2024 09:54:29 -0700 Subject: [PATCH 3/5] move into editable section --- windows/client-management/mdm/policy-csp-update.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md index 84ade66a364..b9c4783c85a 100644 --- a/windows/client-management/mdm/policy-csp-update.md +++ b/windows/client-management/mdm/policy-csp-update.md @@ -1222,10 +1222,11 @@ If you enter an invalid value, you'll remain on your current version until you c Supported value type is a string containing Windows version number. For example, `1809`, `1903`, etc. - + > [!NOTE] > You need to set up the ProductVersion CSP along with the TargetReleaseVersion CSP for it to work. -> + + **Description framework properties**: From f861a38b7a7cf3e3ca7bd74c6fd6e4d825cc7a95 Mon Sep 17 00:00:00 2001 From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:57:57 -0600 Subject: [PATCH 4/5] Update link --- windows/hub/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index cc73d3aebce..82bfa7955a3 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -91,7 +91,7 @@ productDirectory: text: Diagnostic Data Viewer - url: /windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services text: Manage connections to Microsoft services - - url: /windows/privacy/windows-10-and-privacy-compliance + - url: /windows/privacy/windows-privacy-compliance-guide text: Windows privacy compliance guide - url: /windows/privacy text: Learn more about privacy in Windows > From 57184d53f53b8d35a5123a9663331047d079ee30 Mon Sep 17 00:00:00 2001 From: David Strome <21028455+dstrome@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:22:09 -0700 Subject: [PATCH 5/5] add workflows to repo --- .github/workflows/AutoLabelAssign.yml | 41 +++++++++++++++++++ .../workflows/AutoLabelMsftContributor.yml | 40 ++++++++++++++++++ .github/workflows/BackgroundTasks.yml | 26 ++++++++++++ .github/workflows/LiveMergeCheck.yml | 22 ++++++++++ .github/workflows/PrFileCount.yml | 22 ++++++++++ .github/workflows/ProtectedFiles.yml | 20 +++++++++ 6 files changed, 171 insertions(+) create mode 100644 .github/workflows/AutoLabelAssign.yml create mode 100644 .github/workflows/AutoLabelMsftContributor.yml create mode 100644 .github/workflows/BackgroundTasks.yml create mode 100644 .github/workflows/LiveMergeCheck.yml create mode 100644 .github/workflows/PrFileCount.yml create mode 100644 .github/workflows/ProtectedFiles.yml diff --git a/.github/workflows/AutoLabelAssign.yml b/.github/workflows/AutoLabelAssign.yml new file mode 100644 index 00000000000..8247aa8e9cf --- /dev/null +++ b/.github/workflows/AutoLabelAssign.yml @@ -0,0 +1,41 @@ +name: Assign and label PR + +permissions: + pull-requests: write + contents: read + actions: read + +on: + workflow_run: + workflows: [Background tasks] + types: + - completed + +jobs: + download-payload: + name: Download and extract payload artifact + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod + with: + WorkflowId: ${{ github.event.workflow_run.id }} + OrgRepo: ${{ github.repository }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + label-assign: + name: Run assign and label + needs: [download-payload] + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod + with: + PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }} + AutoAssignUsers: 1 + AutoLabel: 1 + ExcludedUserList: '["user1", "user2"]' + ExcludedBranchList: '["branch1", "branch2"]' + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + + + + + diff --git a/.github/workflows/AutoLabelMsftContributor.yml b/.github/workflows/AutoLabelMsftContributor.yml new file mode 100644 index 00000000000..66992cfeef6 --- /dev/null +++ b/.github/workflows/AutoLabelMsftContributor.yml @@ -0,0 +1,40 @@ +name: Auto label Microsoft contributors + +permissions: + pull-requests: write + contents: read + actions: read + +on: + workflow_run: + workflows: [Background tasks] + types: + - completed + +jobs: + download-payload: + if: github.repository_visibility == 'public' + name: Download and extract payload artifact + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod + with: + WorkflowId: ${{ github.event.workflow_run.id }} + OrgRepo: ${{ github.repository }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + label-msft: + name: Label Microsoft contributors + if: github.repository_visibility == 'public' + needs: [download-payload] + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod + with: + PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }} + + + + + + diff --git a/.github/workflows/BackgroundTasks.yml b/.github/workflows/BackgroundTasks.yml new file mode 100644 index 00000000000..c0389bb252f --- /dev/null +++ b/.github/workflows/BackgroundTasks.yml @@ -0,0 +1,26 @@ +name: Background tasks + +permissions: + pull-requests: write + contents: read + +on: + pull_request_target: + +jobs: + upload: + runs-on: ubuntu-latest + + steps: + - name: Save payload data + env: + PayloadJson: ${{ toJSON(github) }} + AccessToken: ${{ github.token }} + run: | + mkdir -p ./pr + echo $PayloadJson > ./pr/PayloadJson.json + sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json + - uses: actions/upload-artifact@v4 + with: + name: PayloadJson + path: pr/ diff --git a/.github/workflows/LiveMergeCheck.yml b/.github/workflows/LiveMergeCheck.yml new file mode 100644 index 00000000000..faeb2a0ef40 --- /dev/null +++ b/.github/workflows/LiveMergeCheck.yml @@ -0,0 +1,22 @@ +name: PR can merge into branch + +permissions: + pull-requests: write + statuses: write + contents: read + +on: + pull_request_target: + types: [opened, reopened, synchronize, edited] + +jobs: + + live-merge: + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod + with: + PayloadJson: ${{ toJSON(github) }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + + \ No newline at end of file diff --git a/.github/workflows/PrFileCount.yml b/.github/workflows/PrFileCount.yml new file mode 100644 index 00000000000..40f7d616294 --- /dev/null +++ b/.github/workflows/PrFileCount.yml @@ -0,0 +1,22 @@ +name: PR file count less than limit + +permissions: + pull-requests: write + statuses: write + contents: read + +on: + pull_request_target: + types: [opened, reopened, synchronize, labeled, unlabeled, edited] + +jobs: + + file-count: + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod + with: + PayloadJson: ${{ toJSON(github) }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + + diff --git a/.github/workflows/ProtectedFiles.yml b/.github/workflows/ProtectedFiles.yml new file mode 100644 index 00000000000..007f8f04b13 --- /dev/null +++ b/.github/workflows/ProtectedFiles.yml @@ -0,0 +1,20 @@ +name: PR has no protected files + +permissions: + pull-requests: write + statuses: write + contents: read + +on: [pull_request_target] + +jobs: + + protected-files: + uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod + with: + PayloadJson: ${{ toJSON(github) }} + secrets: + AccessToken: ${{ secrets.GITHUB_TOKEN }} + + + \ No newline at end of file