Skip to content

Commit 50871a0

Browse files
AtishayMsftAtishayMsft
committed
Resolve merge conflicts
2 parents 9148157 + 86dd769 commit 50871a0

732 files changed

Lines changed: 21335 additions & 3185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devops/templates/tools.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Install versions of Node and Yarn required by build pipelines.
22
steps:
3-
- task: NodeTool@0
3+
- task: UseNode@1
44
inputs:
5-
versionSpec: '16.18.1'
5+
version: '16.18.1'
66
checkLatest: false
77
displayName: 'Install Node.js'
8+
retryCountOnTaskFailure: 3
89

910
- script: |
1011
npm i -g yarn@1

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#### Change files (no owner)
2828
/change
2929

30+
/.github/ @microsoft/fluentui-react-build
31+
3032
#### Build folders
3133
/.codesandbox @microsoft/fluentui-react-build
3234
/.devcontainer @microsoft/fluentui-react-build
@@ -228,7 +230,7 @@ packages/react-components/react-tree @microsoft/teams-prg
228230
packages/react-components/react-virtualizer @microsoft/xc-uxe @Mitch-At-Work
229231
packages/react-components/react-skeleton @microsoft/cxe-red
230232
packages/tokens @microsoft/teams-prg
231-
packages/react-components/react-tags-preview @microsoft/cxe-red @microsoft/teams-prg
233+
packages/react-components/react-tags @microsoft/cxe-red @microsoft/teams-prg
232234
packages/react-components/react-migration-v0-v9 @microsoft/teams-prg
233235
packages/react-components/react-datepicker-compat @microsoft/cxe-red @sopranopillow @khmakoto
234236
packages/react-components/react-migration-v8-v9 @microsoft/cxe-red @geoffcoxmsft

‎.github/README.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# .github
2+
3+
This document contains docs for specific files/folders within our `.github` that are not standard github things. For common content please consult official github docs.
4+
5+
## `actions/`
6+
7+
custom github actions. https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions?learn=create_actions&learnProduct=actions
8+
9+
## `workflows/`
10+
11+
https://docs.github.com/en/actions/using-workflows/about-workflows
12+
13+
## `policies/`
14+
15+
### botRules.yml
16+
17+
> 💡 NOTE:
18+
>
19+
> Originally this was a json configuration which we converted to yml via this tool https://github.com/1ES-microsoft/GitOps.PullRequestIssueManagement/tree/main/src/Tools/GitOps.PullRequestIssueManagement.JsonToYmlConverter
20+
21+
GitOps bot - docs https://github.com/microsoft/GitOps/blob/main/docs/policies/resource-management.md
22+
23+
## `triage-bot.config.json`
24+
25+
Configuration for our custom triage-bot. See [docs](../scripts//triage-bot//README.md) to learn more.

‎.github/policies/botRules.yml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -553,40 +553,6 @@ configuration:
553553
label: 'Package: styling'
554554
description: Auto label pull requests based on path
555555
triggerOnOwnActions: false
556-
- if:
557-
- payloadType: Pull_Request
558-
then:
559-
- if:
560-
- filesMatchPattern:
561-
pattern: packages/(?:office-ui-fabric-react|react(?:-(?!charting)\w+)?|date-time)/src/components/(?!pickers)([A-Z][a-zA-Z]*)/.*
562-
excludedFiles:
563-
- common/changes
564-
- common/config/rush
565-
- apps/vr-tests/src/stories
566-
- packages/office-ui-fabric-react/src/components/__snapshots__/
567-
- packages/office-ui-fabric-react/etc
568-
- change
569-
- apps/a11y-tests/src/tests/__snapshots__/ComponentExamples.test.tsx.snap
570-
- scripts
571-
- packages/react/src/components/__snapshots__
572-
- packages/react-examples
573-
- packages/react/etc
574-
then:
575-
- addLabel:
576-
label: 'Component: $1'
577-
- if:
578-
- filesMatchPattern:
579-
pattern: packages/(azure-themes|codemods|file-type-icons|fluent-theme|keyboard-key|lists|mdl2-theme|merge-styles|migration|react-hooks|utilities|eslint-plugin)/.*
580-
excludedFiles:
581-
- change
582-
- common/changes
583-
- scripts
584-
- packages/react-examples
585-
then:
586-
- addLabel:
587-
label: 'Package: $1'
588-
description: Auto label pull requests based on path pattern matching
589-
triggerOnOwnActions: false
590556
- if:
591557
- payloadType: Pull_Request
592558
- or:

‎.github/workflows/check-packages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
run: |
2727
echo "yarn.lock changed! Verifying package deduplication ..."
2828
29-
npx yarn-deduplicate --strategy fewer --list --fail
29+
yarn run dedupe --list --fail
3030
3131
if [[ $? -ne 0 ]]; then
3232
echo "Your changes introduced package duplication 🚨"
33-
echo "Run 'npx yarn-deduplicate --strategy fewer' to fix those."
33+
echo "Run 'yarn run dedupe' to fix those."
3434
else
3535
echo "No duplicate packages introduced ✅"
3636
fi

‎apps/public-docsite-v9/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"dependencies": {
2626
"@fluentui/react-breadcrumb-preview": "*",
27-
"@fluentui/react-tags-preview": "*",
2827
"@fluentui/react-datepicker-compat": "*",
28+
"@fluentui/react-message-bar-preview": "*",
2929
"@fluentui/react-migration-v8-v9": "*",
3030
"@fluentui/react-migration-v0-v9": "*",
3131
"@fluentui/react": "*",

0 commit comments

Comments
 (0)