Azure · qianwens · Feb 2, 2021 · Oct 19, 2020 · Oct 19, 2020 · Oct 19, 2020
diff --git a/npm-debug.log b/npm-debug.log
diff --git a/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-12-01/Marketplace.json b/...ion/marketplace/resource-manager/Microsoft.Marketplace/stable/2020-12-01/Marketplace.json
diff --git a/...ce-manager/Microsoft.Marketplace/stable/2020-12-01/examples/GetOfferApprovalRequests.json b/...ce-manager/Microsoft.Marketplace/stable/2020-12-01/examples/GetOfferApprovalRequests.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "publisherId": "marketplacetestthirdparty",
+    "api-version": "2020-12-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "marketplacetestthirdparty;marketplacetestthirdparty.md-test-third-party-2;20210105_2:18",
+        "publisherId": "marketplacetestthirdparty",
+        "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+        "displayName": "Test offer",
+        "plans": [
+          {
+            "planId": "Test plan",
+            "planDisplayName": "Test plan name",
+            "requesters": [
+              {
+                "user": "e1fae668-f844-45a0-8cc3-2fcd411234567",
+                "date": "2026-01-05T14:18:29.7028583+02:00",
+                "justification": "requested"
+              },
+              {
+                "user": "e1fae668-f844-45a0-8cc3-2fcd411234534",
+                "date": "2019-01-26T15:13:54.4395401+02:00",
+                "justification": "Because I want to..."
+              }
+            ]
+          }
+        ],
+        "messageCode": 0
+      }
+    }
+  }
+}
diff --git a/...anager/Microsoft.Marketplace/stable/2020-12-01/examples/GetPrivateStoreNotifications.json b/...anager/Microsoft.Marketplace/stable/2020-12-01/examples/GetPrivateStoreNotifications.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "api-version": "2020-12-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "stopSellNotifications": [],
+        "newNotifications": [
+          {
+            "offerId": "TestPublisher.TestOffer",
+            "displayName": "Test name",
+            "isFuturePlansEnabled": true,
+            "plans": [
+              {
+                "planDisplayName": "Test plan name",
+                "planId": "TestPlanId"
+              }
+            ],
+            "messageCode": 10001,
+            "icon": "https://store-images.s-microsoft.com/image/testapps.33169.691280b6-4519-4532-a123-c106dc5495cc.98b4450b-a020-4e2f-9e57-c5c5fec0d33f.a331afc8-d85c-4af7-88d8-3565891234567"
+          }
+        ],
+        "approvalRequests": [
+          {
+            "publisherId": "testpublisher",
+            "offerId": "testpublisher.testoffer",
+            "displayName": "test name",
+            "plans": [
+              {
+                "planDisplayName": "test plan name",
+                "planId": "plantest"
+              }
+            ],
+            "icon": "https://store-images.s-microsoft.com/image/testapps.33169.691280b6-4519-4532-a123-c106dc5495cc.98b4450b-a020-4e2f-9e57-c5c5fec0d33f.a331afc8-d85c-4af7-88d8-3565891234567"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/...osoft.Marketplace/stable/2020-12-01/examples/GetPrivateStoreOfferWithRequestApproval.json b/...osoft.Marketplace/stable/2020-12-01/examples/GetPrivateStoreOfferWithRequestApproval.json
@@ -0,0 +1,48 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "api-version": "2020-12-01",
+    "OfferDetailsProperties": {
+      "properties": {
+        "properties": {
+          "publisherId": "testpublisher",
+          "planIds": [
+            "hourly",
+            "byol",
+            "*"
+          ]
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "uniqueOfferId": "marketplacetestthirdparty.md-test-third-party-2",
+        "plansDetails": {
+          "*": {
+            "planId": "*",
+            "status": "None",
+            "requestDate": null,
+            "justification": null
+          },
+          "plantesta": {
+            "planId": "plantesta",
+            "status": "AllowedByAdmin",
+            "requestDate": null,
+            "justification": ""
+          },
+          "planb": {
+            "planId": "p[lanb",
+            "status": "None",
+            "requestDate": null,
+            "justification": "test"
+          }
+        },
+        "etag": null,
+        "messageCode": 0
+      }
+    }
+  }
+}
diff --git a/.../resource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpdateAdminAction.json b/.../resource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpdateAdminAction.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "api-version": "2020-12-01",
+    "AdminActionDetails": {
+      "properties": {
+        "publisherId": "marketplacetestthirdparty",
+        "adminAction": "Approved",
+        "existingRequestedPlans": [
+          "plan1"
+        ],
+        "approvedPlans": [
+          "plan2"
+        ],
+        "comment": "ok",
+        "user": ""
+      }
+    }
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/...rce-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpdateOfferNotification.json b/...rce-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpdateOfferNotification.json
@@ -0,0 +1,21 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "api-version": "2020-12-01",
+    "UpdateNotificationDetails": {
+      "properties": {
+        "RemovePlans": [
+          "md-test-third-party"
+        ],
+        "AddPlans": null,
+        "Acknowledge": false,
+        "Dismiss": false,
+        "RemoveOffer": false
+      }
+    }
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/...ource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpsertApprovalRequest.json b/...ource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/UpsertApprovalRequest.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "api-version": "2020-12-01",
+    "CreateApprovalRequestDetails": {
+      "properties": {
+        "publisherId": "marketplacetestthirdparty",
+        "justification": "Because I want to...",
+        "user": "",
+        "planIds": [
+          "testplan"
+        ]
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/providers/Microsoft.Marketplace/privateStores/9afd3c45-5230-4d58-9469-2cacc00bba68/offers/marketplacetestthirdparty.md-test-third-party-2/requestApprovals",
+        "name": "marketplacetestthirdparty.md-test-third-party-2",
+        "type": "Microsoft.Marketplace/privateStores/offers/requestApprovals",
+        "properties": {
+          "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+          "publisherId": "marketplacetestthirdparty",
+          "offerDisplayName": "marketplacetestthirdparty test name",
+          "plansDetails": [
+            {
+              "planId": "testplan",
+              "planDisplayName": "marketplacetestthirdparty test name - test plans",
+              "requesters": [
+                {
+                  "user": "e1fae668-f844-45a0-8cc3-2fcd411234567",
+                  "date": "2023-01-05T14:18:29.7028583+02:00",
+                  "justification": "Test requested"
+                }
+              ]
+            }
+          ],
+          "createDate": "2023-01-05T14:18:29.7028583+02:00",
+          "modifiedAt": "2023-01-05T14:18:29.7028583+02:00",
+          "isClosed": false,
+          "status": "Pending",
+          "admin": null,
+          "adminActionDate": "0001-01-01T00:00:00",
+          "messageCode": 0
+        }
+      }
+    }
+  }
+}
diff --git a/...ce/resource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/WithdrawRequest.json b/...ce/resource-manager/Microsoft.Marketplace/stable/2020-12-01/examples/WithdrawRequest.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "privateStoreId": "a0e28e55-90c4-41d8-8e34-bb7ef7775406",
+    "offerId": "marketplacetestthirdparty.md-test-third-party-2",
+    "publisherId": "marketplacetestthirdparty",
+    "planId": "testplan",
+    "api-version": "2020-12-01"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/marketplace/resource-manager/readme.azureresourceschema.md b/specification/marketplace/resource-manager/readme.azureresourceschema.md
@@ -6,13 +6,25 @@ These settings apply only when `--azureresourceschema` is specified on the comma
 
 ``` yaml $(azureresourceschema) && $(multiapi)
 batch:
+  - tag: schema-marketplace-2020-12-01
   - tag: schema-marketplace-2020-01-01
   - tag: schema-marketplace-2019-12-01
 
 ```
 
 Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
 
+### Tag: schema-marketplace-2020-12-01 and azureresourceschema
+
+``` yaml $(tag) == 'schema-marketplace-2020-12-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+
+# all the input files in this apiVersion
+input-file:
+  - Microsoft.Marketplace/stable/2020-12-01/Marketplace.json
+
+```
+
 ### Tag: schema-marketplace-2020-01-01 and azureresourceschema
 
 ``` yaml $(tag) == 'schema-marketplace-2020-01-01' && $(azureresourceschema)

diff --git a/specification/marketplace/resource-manager/readme.md b/specification/marketplace/resource-manager/readme.md
@@ -28,7 +28,27 @@ These are the global settings for the Marketplace API.
 openapi-type: arm
 tag: package-2020-01-01
 ```
+### Composite packages
 
+The following packages may be composed from multiple api-versions.
+
+### Tag: package-composite-v1
+
+These settings apply only when `--tag=package-composite-v1` is specified on the command line.
+
+This section contains the "composite-v1" set of APIs, which is composed from a selection of api-versions that will remain backwards compatible with "v1" clients.
+
+APIs must only be added to this section when the API is publicly available in at least 1 production region and at least 1 generated client has been tested end-to-end.
+
+``` yaml $(tag) == 'package-composite-v1'
+input-file:
+- Microsoft.Marketplace/stable/2020-01-01/Marketplace.json
+- Microsoft.Marketplace/stable/2020-12-01/Marketplace.json
+
+# Needed when there is more than one input file
+override-info:
+  title: MarketplaceManagementClient
+```
 
 ### Tag: package-2019-12-01