Skip to content

Commit 6b0048f

Browse files
committed
Merge remote-tracking branch 'origin/main' into dkershaw10-updateSamples-0.1.10
2 parents 8124928 + 3877a53 commit 6b0048f

File tree

17 files changed

+185
-106
lines changed

17 files changed

+185
-106
lines changed

generated/microsoftgraph/microsoft.graph/beta/0.1.10-preview/index.json renamed to generated/microsoftgraph/microsoft.graph/beta/0.2.0-preview/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"resourceFunctions": {},
2626
"settings": {
2727
"name": "MicrosoftGraphBeta",
28-
"version": "0.1.10-preview",
28+
"version": "0.2.0-preview",
2929
"isSingleton": false,
3030
"configurationType": {
3131
"$ref": "types.json#/115"
File renamed without changes.

generated/microsoftgraph/microsoft.graph/beta/0.1.10-preview/types.json renamed to generated/microsoftgraph/microsoft.graph/beta/0.2.0-preview/types.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@
13391339
"$ref": "#/0"
13401340
},
13411341
"flags": 0,
1342-
"description": "Specifies the legal age group rule that applies to users of the app. Can be set to one of the following values: ValueDescriptionAllowDefault. Enforces the legal minimum. This means parental consent is required for minors in the European Union and Korea.RequireConsentForPrivacyServicesEnforces the user to specify date of birth to comply with COPPA rules. RequireConsentForMinorsRequires parental consent for ages below 18, regardless of country minor rules.RequireConsentForKidsRequires parental consent for ages below 14, regardless of country minor rules.BlockMinorsBlocks minors from using the app."
1342+
"description": "Specifies the legal age group rule that applies to users of the app. Can be set to one of the following values: ValueDescriptionAllowDefault. Enforces the legal minimum. This means parental consent is required for minors in the European Union and Korea.RequireConsentForPrivacyServicesEnforces the user to specify date of birth to comply with COPPA rules. RequireConsentForMinorsRequires parental consent for ages below 18, regardless of country/region minor rules.RequireConsentForKidsRequires parental consent for ages below 14, regardless of country/region minor rules.BlockMinorsBlocks minors from using the app."
13431343
}
13441344
}
13451345
},
@@ -2066,14 +2066,14 @@
20662066
"$ref": "#/0"
20672067
},
20682068
"flags": 0,
2069-
"description": "Contains the name of the field that a value is associated with."
2069+
"description": "Key."
20702070
},
20712071
"value": {
20722072
"type": {
20732073
"$ref": "#/0"
20742074
},
20752075
"flags": 0,
2076-
"description": "Contains the corresponding value for the specified key."
2076+
"description": "Value."
20772077
}
20782078
}
20792079
},

generated/microsoftgraph/microsoft.graph/beta/0.1.10-preview/types.md renamed to generated/microsoftgraph/microsoft.graph/beta/0.2.0-preview/types.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@
269269

270270
## MicrosoftGraphKeyValue
271271
### Properties
272-
* **key**: string: Contains the name of the field that a value is associated with.
273-
* **value**: string: Contains the corresponding value for the specified key.
272+
* **key**: string: Key.
273+
* **value**: string: Value.
274274

275275
## MicrosoftGraphOnPremisesProvisioningError
276276
### Properties
@@ -295,7 +295,7 @@
295295
## MicrosoftGraphParentalControlSettings
296296
### Properties
297297
* **countriesBlockedForMinors**: string[]: Specifies the two-letter ISO country codes. Access to the application will be blocked for minors from the countries specified in this list.
298-
* **legalAgeGroupRule**: string: Specifies the legal age group rule that applies to users of the app. Can be set to one of the following values: ValueDescriptionAllowDefault. Enforces the legal minimum. This means parental consent is required for minors in the European Union and Korea.RequireConsentForPrivacyServicesEnforces the user to specify date of birth to comply with COPPA rules. RequireConsentForMinorsRequires parental consent for ages below 18, regardless of country minor rules.RequireConsentForKidsRequires parental consent for ages below 14, regardless of country minor rules.BlockMinorsBlocks minors from using the app.
298+
* **legalAgeGroupRule**: string: Specifies the legal age group rule that applies to users of the app. Can be set to one of the following values: ValueDescriptionAllowDefault. Enforces the legal minimum. This means parental consent is required for minors in the European Union and Korea.RequireConsentForPrivacyServicesEnforces the user to specify date of birth to comply with COPPA rules. RequireConsentForMinorsRequires parental consent for ages below 18, regardless of country/region minor rules.RequireConsentForKidsRequires parental consent for ages below 14, regardless of country/region minor rules.BlockMinorsBlocks minors from using the app.
299299

300300
## MicrosoftGraphPasswordCredential
301301
### Properties

generated/microsoftgraph/microsoft.graph/v1.0/0.1.10-preview/index.json renamed to generated/microsoftgraph/microsoft.graph/v1.0/0.2.0-preview/index.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@
44
"$ref": "types.json#/16"
55
},
66
"Microsoft.Graph/[email protected]": {
7-
"$ref": "types.json#/73"
7+
"$ref": "types.json#/74"
88
},
99
"Microsoft.Graph/[email protected]": {
10-
"$ref": "types.json#/91"
10+
"$ref": "types.json#/92"
1111
},
1212
"Microsoft.Graph/applications/[email protected]": {
13-
"$ref": "types.json#/96"
13+
"$ref": "types.json#/97"
1414
},
1515
"Microsoft.Graph/[email protected]": {
16-
"$ref": "types.json#/100"
16+
"$ref": "types.json#/101"
1717
},
1818
"Microsoft.Graph/[email protected]": {
19-
"$ref": "types.json#/104"
19+
"$ref": "types.json#/105"
2020
},
2121
"Microsoft.Graph/[email protected]": {
22-
"$ref": "types.json#/109"
22+
"$ref": "types.json#/110"
2323
}
2424
},
2525
"resourceFunctions": {},
2626
"settings": {
2727
"name": "MicrosoftGraph",
28-
"version": "0.1.10-preview",
28+
"version": "0.2.0-preview",
2929
"isSingleton": false,
3030
"configurationType": {
31-
"$ref": "types.json#/110"
31+
"$ref": "types.json#/111"
3232
}
3333
}
3434
}
File renamed without changes.

0 commit comments

Comments
 (0)