From 2d3c2fc9c4496604447b4c8c920665eb60a09c15 Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Mon, 17 Aug 2020 15:01:15 +0000
Subject: [PATCH] Generated from 07c55ddfb5d285f0850a5c2465f43293051e132b

Merge remote-tracking branch 'origin/network-july-release' into expressrouteportauthorization-apis
---
 .../Microsoft.Intune.json                     | 869 ++++++++++++++++++
 .../2019-08-01/tenantDeploymentTemplate.json  |  18 +
 2 files changed, 887 insertions(+)
 create mode 100644 schemas/2015-01-14-privatepreview/Microsoft.Intune.json

diff --git a/schemas/2015-01-14-privatepreview/Microsoft.Intune.json b/schemas/2015-01-14-privatepreview/Microsoft.Intune.json
new file mode 100644
index 0000000000..8cf9c7d79f
--- /dev/null
+++ b/schemas/2015-01-14-privatepreview/Microsoft.Intune.json
@@ -0,0 +1,869 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Intune",
+  "description": "Microsoft Intune Resource Types",
+  "resourceDefinitions": {},
+  "tenant_resourceDefinitions": {
+    "locations_androidPolicies": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "name": {
+          "type": "string",
+          "description": "Unique name for the policy"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AndroidMAMPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Intune MAM iOS Policy Properties."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/locations_androidPolicies_apps_childResource"
+              },
+              {
+                "$ref": "#/definitions/locations_androidPolicies_groups_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource Tags"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/androidPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/androidPolicies"
+    },
+    "locations_androidPolicies_apps": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "application unique Name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/androidPolicies/apps"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/androidPolicies/apps"
+    },
+    "locations_androidPolicies_groups": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "group Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/androidPolicies/groups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/androidPolicies/groups"
+    },
+    "locations_iosPolicies": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "name": {
+          "type": "string",
+          "description": "Unique name for the policy"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IOSMAMPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Intune MAM iOS Policy Properties."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/locations_iosPolicies_apps_childResource"
+              },
+              {
+                "$ref": "#/definitions/locations_iosPolicies_groups_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource Tags"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/iosPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/iosPolicies"
+    },
+    "locations_iosPolicies_apps": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "application unique Name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/iosPolicies/apps"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/iosPolicies/apps"
+    },
+    "locations_iosPolicies_groups": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "group Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Intune/locations/iosPolicies/groups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/iosPolicies/groups"
+    }
+  },
+  "definitions": {
+    "AndroidMAMPolicyProperties": {
+      "type": "object",
+      "properties": {
+        "accessRecheckOfflineTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "accessRecheckOnlineTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "appSharingFromLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "none",
+                "policyManagedApps",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "appSharingToLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "none",
+                "policyManagedApps",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "authentication": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "clipboardSharingLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "blocked",
+                "policyManagedApps",
+                "policyManagedAppsWithPasteIn",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "dataBackup": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "allow",
+                "block"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "description": {
+          "type": "string"
+        },
+        "deviceCompliance": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "enable",
+                "disable"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "fileEncryption": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "fileSharingSaveAs": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "allow",
+                "block"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "friendlyName": {
+          "type": "string"
+        },
+        "managedBrowser": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "offlineWipeTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "pin": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "pinNumRetry": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "screenCapture": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "allow",
+                "block"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "friendlyName"
+      ],
+      "description": "Intune MAM iOS Policy Properties."
+    },
+    "IOSMAMPolicyProperties": {
+      "type": "object",
+      "properties": {
+        "accessRecheckOfflineTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "accessRecheckOnlineTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "appSharingFromLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "none",
+                "policyManagedApps",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "appSharingToLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "none",
+                "policyManagedApps",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "authentication": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "clipboardSharingLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "blocked",
+                "policyManagedApps",
+                "policyManagedAppsWithPasteIn",
+                "allApps"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "dataBackup": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "allow",
+                "block"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "description": {
+          "type": "string"
+        },
+        "deviceCompliance": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "enable",
+                "disable"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "fileEncryptionLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "deviceLocked",
+                "deviceLockedExceptFilesOpen",
+                "afterDeviceRestart",
+                "useDeviceSettings"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "fileSharingSaveAs": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "allow",
+                "block"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "friendlyName": {
+          "type": "string"
+        },
+        "managedBrowser": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "offlineWipeTimeout": {
+          "type": "string",
+          "format": "duration"
+        },
+        "pin": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "required",
+                "notRequired"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "pinNumRetry": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "touchId": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "enable",
+                "disable"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "friendlyName"
+      ],
+      "description": "Intune MAM iOS Policy Properties."
+    },
+    "locations_androidPolicies_apps_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "application unique Name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "apps"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/androidPolicies/apps"
+    },
+    "locations_androidPolicies_groups_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "group Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "groups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/androidPolicies/groups"
+    },
+    "locations_iosPolicies_apps_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "application unique Name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "apps"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/iosPolicies/apps"
+    },
+    "locations_iosPolicies_groups_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-01-14-privatepreview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "group Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MAMPolicyAppOrGroupIdProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Android Policy request body for Intune MAM."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "groups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Intune/locations/iosPolicies/groups"
+    },
+    "MAMPolicyAppOrGroupIdProperties": {
+      "type": "object",
+      "properties": {
+        "url": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "url"
+      ],
+      "description": "Android Policy request body for Intune MAM."
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
index 19fd090ac9..d9f9d2fd1c 100644
--- a/schemas/2019-08-01/tenantDeploymentTemplate.json
+++ b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -171,6 +171,24 @@
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2015-01-14-preview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_iosPolicies_groups"
                   },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_androidPolicies"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_androidPolicies_apps"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_androidPolicies_groups"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_iosPolicies"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_iosPolicies_apps"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2015-01-14-privatepreview/Microsoft.Intune.json#/tenant_resourceDefinitions/locations_iosPolicies_groups"
+                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Management.json#/tenant_resourceDefinitions/managementGroups"
                   },